summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKisuka <kisuka@kisuka.com>2013-10-28 00:42:23 -0700
committerKisuka <kisuka@kisuka.com>2013-10-28 00:42:23 -0700
commit124ab2a1cdb344f24170a4d91f7000ebabf39b40 (patch)
treeebc5aeee49da96f88e55358c184d69d90eae9289
parente7efdfe96e1b4c288bca845c03512da6842d6425 (diff)
downloadhercules-124ab2a1cdb344f24170a4d91f7000ebabf39b40.tar.gz
hercules-124ab2a1cdb344f24170a4d91f7000ebabf39b40.tar.bz2
hercules-124ab2a1cdb344f24170a4d91f7000ebabf39b40.tar.xz
hercules-124ab2a1cdb344f24170a4d91f7000ebabf39b40.zip
Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this.
-rw-r--r--db/const.txt5
-rw-r--r--npc/airports/airships.txt60
-rw-r--r--npc/airports/einbroch.txt14
-rw-r--r--npc/airports/hugel.txt2
-rw-r--r--npc/airports/lighthalzen.txt12
-rw-r--r--npc/airports/rachel.txt2
-rw-r--r--npc/airports/yuno.txt20
-rw-r--r--npc/battleground/bg_common.txt46
-rw-r--r--npc/battleground/flavius/flavius01.txt90
-rw-r--r--npc/battleground/flavius/flavius02.txt90
-rw-r--r--npc/battleground/flavius/flavius_enter.txt16
-rw-r--r--npc/battleground/kvm/kvm01.txt40
-rw-r--r--npc/battleground/kvm/kvm02.txt40
-rw-r--r--npc/battleground/kvm/kvm03.txt40
-rw-r--r--npc/battleground/kvm/kvm_enter.txt8
-rw-r--r--npc/battleground/kvm/kvm_item_pay.txt2
-rw-r--r--npc/battleground/tierra/tierra01.txt88
-rw-r--r--npc/battleground/tierra/tierra02.txt88
-rw-r--r--npc/battleground/tierra/tierra_enter.txt16
-rw-r--r--npc/cities/alberta.txt22
-rw-r--r--npc/cities/aldebaran.txt62
-rw-r--r--npc/cities/amatsu.txt24
-rw-r--r--npc/cities/ayothaya.txt14
-rw-r--r--npc/cities/comodo.txt36
-rw-r--r--npc/cities/einbech.txt50
-rw-r--r--npc/cities/einbroch.txt84
-rw-r--r--npc/cities/geffen.txt32
-rw-r--r--npc/cities/gonryun.txt26
-rw-r--r--npc/cities/hugel.txt20
-rw-r--r--npc/cities/izlude.txt4
-rw-r--r--npc/cities/jawaii.txt52
-rw-r--r--npc/cities/lighthalzen.txt282
-rw-r--r--npc/cities/louyang.txt36
-rw-r--r--npc/cities/lutie.txt20
-rw-r--r--npc/cities/manuk.txt62
-rw-r--r--npc/cities/morocc.txt68
-rw-r--r--npc/cities/moscovia.txt14
-rw-r--r--npc/cities/niflheim.txt12
-rw-r--r--npc/cities/payon.txt30
-rw-r--r--npc/cities/prontera.txt48
-rw-r--r--npc/cities/rachel.txt66
-rw-r--r--npc/cities/splendide.txt70
-rw-r--r--npc/cities/umbala.txt32
-rw-r--r--npc/cities/veins.txt92
-rw-r--r--npc/cities/yuno.txt14
-rw-r--r--npc/custom/battleground/bg_common.txt158
-rw-r--r--npc/custom/battleground/bg_flavius_01.txt70
-rw-r--r--npc/custom/battleground/bg_flavius_02.txt70
-rw-r--r--npc/custom/battleground/bg_kvm01.txt24
-rw-r--r--npc/custom/battleground/bg_kvm02.txt24
-rw-r--r--npc/custom/battleground/bg_kvm03.txt24
-rw-r--r--npc/custom/battleground/bg_tierra_01.txt54
-rw-r--r--npc/custom/battleground/bg_tierra_02.txt54
-rw-r--r--npc/custom/bgqueue/flavius.txt82
-rw-r--r--npc/custom/breeder.txt2
-rw-r--r--npc/custom/card_remover.txt2
-rw-r--r--npc/custom/etc/airplane.txt52
-rw-r--r--npc/custom/etc/bank.txt2
-rw-r--r--npc/custom/etc/bank_kafra.txt10
-rw-r--r--npc/custom/etc/blackjack.txt2
-rw-r--r--npc/custom/etc/lottery.txt2
-rw-r--r--npc/custom/etc/marriage.txt6
-rw-r--r--npc/custom/etc/monster_arena.txt26
-rw-r--r--npc/custom/etc/morroc_raceway.txt42
-rw-r--r--npc/custom/etc/mvp_arena.txt76
-rw-r--r--npc/custom/etc/penal_servitude.txt4
-rw-r--r--npc/custom/etc/quest_warper.txt156
-rw-r--r--npc/custom/etc/rpsroulette.txt2
-rw-r--r--npc/custom/etc/shifty_assassin.txt2
-rw-r--r--npc/custom/etc/stock_market.txt2
-rw-r--r--npc/custom/events/cluckers.txt2
-rw-r--r--npc/custom/events/disguise.txt2
-rw-r--r--npc/custom/events/hallow06.txt2
-rw-r--r--npc/custom/events/uneasy_cemetery.txt2
-rw-r--r--npc/custom/events/valentinesdayexp.txt8
-rw-r--r--npc/custom/events/xmas_rings_event.txt6
-rw-r--r--npc/custom/healer.txt72
-rw-r--r--npc/custom/item_signer.txt2
-rw-r--r--npc/custom/itemmall.txt64
-rw-r--r--npc/custom/jobmaster.txt2
-rw-r--r--npc/custom/platinum_skills.txt2
-rw-r--r--npc/custom/quests/bandit_beard.txt8
-rw-r--r--npc/custom/quests/berzebub.txt2
-rw-r--r--npc/custom/quests/dead_branch.txt2
-rw-r--r--npc/custom/quests/elvenear.txt2
-rw-r--r--npc/custom/quests/event_6_new_hats.txt8
-rw-r--r--npc/custom/quests/hunting_missions.txt2
-rw-r--r--npc/custom/quests/jewel_case.txt2
-rw-r--r--npc/custom/quests/kaho_balmung.txt2
-rw-r--r--npc/custom/quests/kahohorn.txt2
-rw-r--r--npc/custom/quests/kings_items.txt4
-rw-r--r--npc/custom/quests/may_hats.txt2
-rw-r--r--npc/custom/quests/quest_shop.txt2
-rw-r--r--npc/custom/quests/questboard.txt2
-rw-r--r--npc/custom/quests/sphinx_mask.txt2
-rw-r--r--npc/custom/quests/sunglasses.txt4
-rw-r--r--npc/custom/quests/tha_statues.txt30
-rw-r--r--npc/custom/quests/thq/THQS_ChatingNPC.txt10
-rw-r--r--npc/custom/quests/thq/THQS_GuildNPC.txt2
-rw-r--r--npc/custom/quests/thq/THQS_QuestNPC.txt2
-rw-r--r--npc/custom/quests/thq/THQS_Quests.txt72
-rw-r--r--npc/custom/quests/thq/THQS_TTShop.txt2
-rw-r--r--npc/custom/quests/umbalian_language.txt8
-rw-r--r--npc/custom/quests/valhallen.txt2
-rw-r--r--npc/custom/resetnpc.txt2
-rw-r--r--npc/custom/stylist.txt2
-rw-r--r--npc/custom/warper.txt88
-rw-r--r--npc/custom/woe_controller.txt2
-rw-r--r--npc/events/MemorialDay_2008.txt6
-rw-r--r--npc/events/RWC_2011.txt2
-rw-r--r--npc/events/RWC_2012.txt4
-rw-r--r--npc/events/StPatrick_2008.txt2
-rw-r--r--npc/events/bossnia.txt12
-rw-r--r--npc/events/children_week.txt2
-rw-r--r--npc/events/christmas_2005.txt60
-rw-r--r--npc/events/christmas_2008.txt16
-rw-r--r--npc/events/dumplingfestival.txt2
-rw-r--r--npc/events/easter_2008.txt42
-rw-r--r--npc/events/easter_2010.txt16
-rw-r--r--npc/events/event_skill_reset.txt2
-rw-r--r--npc/events/gdevent_aru.txt148
-rw-r--r--npc/events/gdevent_sch.txt148
-rw-r--r--npc/events/god_se_festival.txt8
-rw-r--r--npc/events/halloween_2006.txt174
-rw-r--r--npc/events/halloween_2008.txt8
-rw-r--r--npc/events/halloween_2009.txt32
-rw-r--r--npc/events/idul_fitri.txt2
-rw-r--r--npc/events/lunar_2008.txt8
-rw-r--r--npc/events/nguild/nguild_dunsw.txt8
-rw-r--r--npc/events/nguild/nguild_flags.txt86
-rw-r--r--npc/events/nguild/nguild_kafras.txt10
-rw-r--r--npc/events/nguild/nguild_managers.txt8
-rw-r--r--npc/events/nguild/nguild_treas.txt8
-rw-r--r--npc/events/nguild/nguild_warper.txt4
-rw-r--r--npc/events/twintowers.txt16
-rw-r--r--npc/events/valentinesday.txt6
-rw-r--r--npc/events/valentinesday_2009.txt10
-rw-r--r--npc/events/valentinesday_2012.txt4
-rw-r--r--npc/events/whiteday.txt2
-rw-r--r--npc/events/xmas.txt2
-rw-r--r--npc/guild/aldeg_cas01.txt58
-rw-r--r--npc/guild/aldeg_cas02.txt46
-rw-r--r--npc/guild/aldeg_cas03.txt52
-rw-r--r--npc/guild/aldeg_cas04.txt52
-rw-r--r--npc/guild/aldeg_cas05.txt50
-rw-r--r--npc/guild/gefg_cas01.txt34
-rw-r--r--npc/guild/gefg_cas02.txt36
-rw-r--r--npc/guild/gefg_cas03.txt42
-rw-r--r--npc/guild/gefg_cas04.txt34
-rw-r--r--npc/guild/gefg_cas05.txt34
-rw-r--r--npc/guild/payg_cas01.txt36
-rw-r--r--npc/guild/payg_cas02.txt36
-rw-r--r--npc/guild/payg_cas03.txt36
-rw-r--r--npc/guild/payg_cas04.txt36
-rw-r--r--npc/guild/payg_cas05.txt36
-rw-r--r--npc/guild/prtg_cas01.txt42
-rw-r--r--npc/guild/prtg_cas02.txt46
-rw-r--r--npc/guild/prtg_cas03.txt42
-rw-r--r--npc/guild/prtg_cas04.txt42
-rw-r--r--npc/guild/prtg_cas05.txt38
-rw-r--r--npc/guild2/arug_cas01.txt78
-rw-r--r--npc/guild2/arug_cas02.txt74
-rw-r--r--npc/guild2/arug_cas03.txt72
-rw-r--r--npc/guild2/arug_cas04.txt76
-rw-r--r--npc/guild2/arug_cas05.txt76
-rw-r--r--npc/guild2/guild_flags.txt20
-rw-r--r--npc/guild2/schg_cas01.txt72
-rw-r--r--npc/guild2/schg_cas02.txt70
-rw-r--r--npc/guild2/schg_cas03.txt72
-rw-r--r--npc/guild2/schg_cas04.txt72
-rw-r--r--npc/guild2/schg_cas05.txt76
-rw-r--r--npc/instances/EndlessTower.txt272
-rw-r--r--npc/instances/NydhoggsNest.txt38
-rw-r--r--npc/instances/OrcsMemory.txt72
-rw-r--r--npc/instances/SealedShrine.txt102
-rw-r--r--npc/jobs/1-1e/gunslinger.txt4
-rw-r--r--npc/jobs/1-1e/ninja.txt6
-rw-r--r--npc/jobs/1-1e/taekwon.txt2
-rw-r--r--npc/jobs/2-1/assassin.txt34
-rw-r--r--npc/jobs/2-1/blacksmith.txt18
-rw-r--r--npc/jobs/2-1/hunter.txt24
-rw-r--r--npc/jobs/2-1/knight.txt22
-rw-r--r--npc/jobs/2-1/priest.txt20
-rw-r--r--npc/jobs/2-1/wizard.txt22
-rw-r--r--npc/jobs/2-1a/AssassinCross.txt2
-rw-r--r--npc/jobs/2-1a/HighPriest.txt2
-rw-r--r--npc/jobs/2-1a/HighWizard.txt2
-rw-r--r--npc/jobs/2-1a/LordKnight.txt2
-rw-r--r--npc/jobs/2-1a/Sniper.txt2
-rw-r--r--npc/jobs/2-1a/WhiteSmith.txt2
-rw-r--r--npc/jobs/2-1e/StarGladiator.txt10
-rw-r--r--npc/jobs/2-2/alchemist.txt12
-rw-r--r--npc/jobs/2-2/bard.txt2
-rw-r--r--npc/jobs/2-2/crusader.txt16
-rw-r--r--npc/jobs/2-2/dancer.txt20
-rw-r--r--npc/jobs/2-2/monk.txt36
-rw-r--r--npc/jobs/2-2/rogue.txt28
-rw-r--r--npc/jobs/2-2/sage.txt20
-rw-r--r--npc/jobs/2-2a/Champion.txt2
-rw-r--r--npc/jobs/2-2a/Clown.txt2
-rw-r--r--npc/jobs/2-2a/Creator.txt2
-rw-r--r--npc/jobs/2-2a/Gypsy.txt2
-rw-r--r--npc/jobs/2-2a/Paladin.txt2
-rw-r--r--npc/jobs/2-2a/Professor.txt2
-rw-r--r--npc/jobs/2-2a/Stalker.txt2
-rw-r--r--npc/jobs/2-2e/SoulLinker.txt14
-rw-r--r--npc/jobs/novice/supernovice.txt6
-rw-r--r--npc/jobs/valkyrie.txt10
-rw-r--r--npc/kafras/cool_event_corp.txt6
-rw-r--r--npc/kafras/dts_warper.txt36
-rw-r--r--npc/kafras/kafras.txt80
-rw-r--r--npc/merchants/advanced_refiner.txt2
-rw-r--r--npc/merchants/alchemist.txt2
-rw-r--r--npc/merchants/ammo_boxes.txt2
-rw-r--r--npc/merchants/ammo_dealer.txt2
-rw-r--r--npc/merchants/buying_shops.txt4
-rw-r--r--npc/merchants/cash_hair.txt2
-rw-r--r--npc/merchants/cash_trader.txt2
-rw-r--r--npc/merchants/cashheadgear_dye.txt2
-rw-r--r--npc/merchants/clothes_dyer.txt2
-rw-r--r--npc/merchants/coin_exchange.txt4
-rw-r--r--npc/merchants/dye_maker.txt2
-rw-r--r--npc/merchants/elemental_trader.txt2
-rw-r--r--npc/merchants/enchan_arm.txt2
-rw-r--r--npc/merchants/gemstone.txt2
-rw-r--r--npc/merchants/hair_dyer.txt4
-rw-r--r--npc/merchants/hair_style.txt8
-rw-r--r--npc/merchants/hd_refine.txt32
-rw-r--r--npc/merchants/icecream.txt6
-rw-r--r--npc/merchants/inn.txt24
-rw-r--r--npc/merchants/kunai_maker.txt2
-rw-r--r--npc/merchants/milk_trader.txt2
-rw-r--r--npc/merchants/novice_exchange.txt10
-rw-r--r--npc/merchants/old_pharmacist.txt2
-rw-r--r--npc/merchants/quivers.txt2
-rw-r--r--npc/merchants/refine.txt74
-rw-r--r--npc/merchants/renters.txt6
-rw-r--r--npc/merchants/shops.txt356
-rw-r--r--npc/merchants/socket_enchant.txt16
-rw-r--r--npc/merchants/socket_enchant2.txt8
-rw-r--r--npc/merchants/wander_pet_food.txt4
-rw-r--r--npc/other/acolyte_warp.txt4
-rw-r--r--npc/other/arena/arena_aco.txt20
-rw-r--r--npc/other/arena/arena_lvl50.txt28
-rw-r--r--npc/other/arena/arena_lvl60.txt28
-rw-r--r--npc/other/arena/arena_lvl70.txt28
-rw-r--r--npc/other/arena/arena_lvl80.txt28
-rw-r--r--npc/other/arena/arena_party.txt10
-rw-r--r--npc/other/arena/arena_point.txt2
-rw-r--r--npc/other/arena/arena_room.txt38
-rw-r--r--npc/other/auction.txt44
-rw-r--r--npc/other/books.txt16
-rw-r--r--npc/other/bulletin_boards.txt60
-rw-r--r--npc/other/card_trader.txt2
-rw-r--r--npc/other/comodo_gambling.txt8
-rw-r--r--npc/other/divorce.txt2
-rw-r--r--npc/other/fortune.txt6
-rw-r--r--npc/other/guildpvp.txt2
-rw-r--r--npc/other/gympass.txt2
-rw-r--r--npc/other/hugel_bingo.txt300
-rw-r--r--npc/other/mail.txt60
-rw-r--r--npc/other/marriage.txt22
-rw-r--r--npc/other/mercenary_rent.txt8
-rw-r--r--npc/other/monster_museum.txt60
-rw-r--r--npc/other/monster_race.txt54
-rw-r--r--npc/other/msg_boards.txt56
-rw-r--r--npc/other/poring_war.txt34
-rw-r--r--npc/other/powernpc.txt10
-rw-r--r--npc/other/pvp.txt44
-rw-r--r--npc/other/turbo_track.txt1680
-rw-r--r--npc/pre-re/airports/izlude.txt2
-rw-r--r--npc/pre-re/cities/alberta.txt16
-rw-r--r--npc/pre-re/cities/izlude.txt18
-rw-r--r--npc/pre-re/cities/jawaii.txt2
-rw-r--r--npc/pre-re/cities/yuno.txt14
-rw-r--r--npc/pre-re/guides/guides_alberta.txt4
-rw-r--r--npc/pre-re/guides/guides_aldebaran.txt4
-rw-r--r--npc/pre-re/guides/guides_amatsu.txt4
-rw-r--r--npc/pre-re/guides/guides_ayothaya.txt2
-rw-r--r--npc/pre-re/guides/guides_comodo.txt6
-rw-r--r--npc/pre-re/guides/guides_einbroch.txt10
-rw-r--r--npc/pre-re/guides/guides_geffen.txt4
-rw-r--r--npc/pre-re/guides/guides_gonryun.txt2
-rw-r--r--npc/pre-re/guides/guides_hugel.txt2
-rw-r--r--npc/pre-re/guides/guides_izlude.txt2
-rw-r--r--npc/pre-re/guides/guides_juno.txt2
-rw-r--r--npc/pre-re/guides/guides_lighthalzen.txt8
-rw-r--r--npc/pre-re/guides/guides_louyang.txt6
-rw-r--r--npc/pre-re/guides/guides_morroc.txt4
-rw-r--r--npc/pre-re/guides/guides_moscovia.txt2
-rw-r--r--npc/pre-re/guides/guides_niflheim.txt2
-rw-r--r--npc/pre-re/guides/guides_payon.txt4
-rw-r--r--npc/pre-re/guides/guides_prontera.txt10
-rw-r--r--npc/pre-re/guides/guides_rachel.txt2
-rw-r--r--npc/pre-re/guides/guides_umbala.txt2
-rw-r--r--npc/pre-re/guides/guides_veins.txt4
-rw-r--r--npc/pre-re/jobs/1-1/acolyte.txt8
-rw-r--r--npc/pre-re/jobs/1-1/archer.txt2
-rw-r--r--npc/pre-re/jobs/1-1/mage.txt10
-rw-r--r--npc/pre-re/jobs/1-1/merchant.txt12
-rw-r--r--npc/pre-re/jobs/1-1/swordman.txt30
-rw-r--r--npc/pre-re/jobs/1-1/thief.txt6
-rw-r--r--npc/pre-re/jobs/novice/novice.txt56
-rw-r--r--npc/pre-re/kafras/kafras.txt2
-rw-r--r--npc/pre-re/merchants/ammo_boxes.txt2
-rw-r--r--npc/pre-re/merchants/ammo_dealer.txt2
-rw-r--r--npc/pre-re/merchants/shops.txt12
-rw-r--r--npc/pre-re/other/bulletin_boards.txt2
-rw-r--r--npc/pre-re/other/mercenary_rent.txt4
-rw-r--r--npc/pre-re/other/msg_boards.txt4
-rw-r--r--npc/pre-re/other/pvp.txt4
-rw-r--r--npc/pre-re/other/resetskill.txt2
-rw-r--r--npc/pre-re/other/turbo_track.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_alligator.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_caramel.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_coco.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_creamy.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_demonpungus.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_disguiseloliruri.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_dokebi.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_dryad.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_fabre.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_frilldora.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_goat.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_golem.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_hode.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_leafcat.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_mantis.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_pecopeco.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_pupa.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_zhupolong.txt2
-rw-r--r--npc/pre-re/quests/first_class/tu_archer.txt2
-rw-r--r--npc/pre-re/quests/monstertamers.txt2
-rw-r--r--npc/pre-re/quests/mrsmile.txt2
-rw-r--r--npc/pre-re/quests/quests_13_1.txt2
-rw-r--r--npc/pre-re/quests/quests_izlude.txt2
-rw-r--r--npc/pre-re/quests/quests_lighthalzen.txt2
-rw-r--r--npc/pre-re/quests/quests_nameless.txt2
-rw-r--r--npc/pre-re/quests/quests_veins.txt2
-rw-r--r--npc/pre-re/warps/fields/morroc_fild.txt4
-rw-r--r--npc/pre-re/warps/fields/veins_fild.txt2
-rw-r--r--npc/quests/bard_quest.txt22
-rw-r--r--npc/quests/bunnyband.txt2
-rw-r--r--npc/quests/cooking_quest.txt10
-rw-r--r--npc/quests/counteragent_mixture.txt6
-rw-r--r--npc/quests/dandelion_request.txt208
-rw-r--r--npc/quests/doomed_swords.txt10
-rw-r--r--npc/quests/doomed_swords_quest.txt6
-rw-r--r--npc/quests/eye_of_hellion.txt28
-rw-r--r--npc/quests/first_class/tu_acolyte.txt28
-rw-r--r--npc/quests/first_class/tu_archer.txt26
-rw-r--r--npc/quests/first_class/tu_ma_th01.txt32
-rw-r--r--npc/quests/first_class/tu_magician01.txt4
-rw-r--r--npc/quests/first_class/tu_merchant.txt12
-rw-r--r--npc/quests/first_class/tu_sword.txt12
-rw-r--r--npc/quests/first_class/tu_thief01.txt2
-rw-r--r--npc/quests/guildrelay.txt168
-rw-r--r--npc/quests/gunslinger_quests.txt10
-rw-r--r--npc/quests/juice_maker.txt6
-rw-r--r--npc/quests/kiel_hyre_quest.txt210
-rw-r--r--npc/quests/lvl4_weapon_quest.txt20
-rw-r--r--npc/quests/mage_solution.txt4
-rw-r--r--npc/quests/monstertamers.txt6
-rw-r--r--npc/quests/mrsmile.txt14
-rw-r--r--npc/quests/newgears/2004_headgears.txt32
-rw-r--r--npc/quests/newgears/2005_headgears.txt14
-rw-r--r--npc/quests/newgears/2006_headgears.txt10
-rw-r--r--npc/quests/newgears/2008_headgears.txt4
-rw-r--r--npc/quests/ninja_quests.txt10
-rw-r--r--npc/quests/obb_quest.txt8
-rw-r--r--npc/quests/okolnir.txt464
-rw-r--r--npc/quests/partyrelay.txt48
-rw-r--r--npc/quests/quests_13_1.txt324
-rw-r--r--npc/quests/quests_13_2.txt408
-rw-r--r--npc/quests/quests_airship.txt64
-rw-r--r--npc/quests/quests_alberta.txt54
-rw-r--r--npc/quests/quests_aldebaran.txt2
-rw-r--r--npc/quests/quests_amatsu.txt58
-rw-r--r--npc/quests/quests_ayothaya.txt68
-rw-r--r--npc/quests/quests_comodo.txt44
-rw-r--r--npc/quests/quests_ein.txt60
-rw-r--r--npc/quests/quests_geffen.txt6
-rw-r--r--npc/quests/quests_gonryun.txt102
-rw-r--r--npc/quests/quests_hugel.txt162
-rw-r--r--npc/quests/quests_juperos.txt92
-rw-r--r--npc/quests/quests_lighthalzen.txt146
-rw-r--r--npc/quests/quests_louyang.txt82
-rw-r--r--npc/quests/quests_lutie.txt4
-rw-r--r--npc/quests/quests_morocc.txt208
-rw-r--r--npc/quests/quests_moscovia.txt180
-rw-r--r--npc/quests/quests_nameless.txt154
-rw-r--r--npc/quests/quests_niflheim.txt22
-rw-r--r--npc/quests/quests_payon.txt8
-rw-r--r--npc/quests/quests_prontera.txt42
-rw-r--r--npc/quests/quests_rachel.txt108
-rw-r--r--npc/quests/quests_umbala.txt16
-rw-r--r--npc/quests/quests_veins.txt210
-rw-r--r--npc/quests/quests_yuno.txt24
-rw-r--r--npc/quests/seals/brisingamen_seal.txt62
-rw-r--r--npc/quests/seals/god_global.txt2
-rw-r--r--npc/quests/seals/god_weapon_creation.txt20
-rw-r--r--npc/quests/seals/megingard_seal.txt32
-rw-r--r--npc/quests/seals/mjolnir_seal.txt12
-rw-r--r--npc/quests/seals/seal_status.txt2
-rw-r--r--npc/quests/seals/sleipnir_seal.txt36
-rw-r--r--npc/quests/skills/acolyte_skills.txt2
-rw-r--r--npc/quests/skills/alchemist_skills.txt24
-rw-r--r--npc/quests/skills/archer_skills.txt4
-rw-r--r--npc/quests/skills/assassin_skills.txt4
-rw-r--r--npc/quests/skills/bard_skills.txt20
-rw-r--r--npc/quests/skills/blacksmith_skills.txt4
-rw-r--r--npc/quests/skills/crusader_skills.txt6
-rw-r--r--npc/quests/skills/dancer_skills.txt4
-rw-r--r--npc/quests/skills/hunter_skills.txt2
-rw-r--r--npc/quests/skills/knight_skills.txt14
-rw-r--r--npc/quests/skills/mage_skills.txt2
-rw-r--r--npc/quests/skills/merchant_skills.txt4
-rw-r--r--npc/quests/skills/monk_skills.txt4
-rw-r--r--npc/quests/skills/novice_skills.txt6
-rw-r--r--npc/quests/skills/priest_skills.txt2
-rw-r--r--npc/quests/skills/rogue_skills.txt28
-rw-r--r--npc/quests/skills/sage_skills.txt2
-rw-r--r--npc/quests/skills/swordman_skills.txt6
-rw-r--r--npc/quests/skills/thief_skills.txt4
-rw-r--r--npc/quests/skills/wizard_skills.txt4
-rw-r--r--npc/quests/thana_quest.txt80
-rw-r--r--npc/quests/the_sign_quest.txt152
-rw-r--r--npc/re/airports/izlude.txt10
-rw-r--r--npc/re/cities/alberta.txt16
-rw-r--r--npc/re/cities/brasilis.txt16
-rw-r--r--npc/re/cities/dewata.txt100
-rw-r--r--npc/re/cities/dicastes.txt72
-rw-r--r--npc/re/cities/eclage.txt74
-rw-r--r--npc/re/cities/izlude.txt110
-rw-r--r--npc/re/cities/jawaii.txt10
-rw-r--r--npc/re/cities/malangdo.txt42
-rw-r--r--npc/re/cities/malaya.txt64
-rw-r--r--npc/re/cities/mora.txt78
-rw-r--r--npc/re/cities/yuno.txt14
-rw-r--r--npc/re/guides/guides_alberta.txt6
-rw-r--r--npc/re/guides/guides_aldebaran.txt8
-rw-r--r--npc/re/guides/guides_amatsu.txt2
-rw-r--r--npc/re/guides/guides_ayothaya.txt4
-rw-r--r--npc/re/guides/guides_brasilis.txt2
-rw-r--r--npc/re/guides/guides_comodo.txt8
-rw-r--r--npc/re/guides/guides_dewata.txt4
-rw-r--r--npc/re/guides/guides_dicastes.txt2
-rw-r--r--npc/re/guides/guides_eclage.txt2
-rw-r--r--npc/re/guides/guides_einbroch.txt12
-rw-r--r--npc/re/guides/guides_geffen.txt8
-rw-r--r--npc/re/guides/guides_gonryun.txt2
-rw-r--r--npc/re/guides/guides_hugel.txt4
-rw-r--r--npc/re/guides/guides_izlude.txt22
-rw-r--r--npc/re/guides/guides_juno.txt4
-rw-r--r--npc/re/guides/guides_lighthalzen.txt8
-rw-r--r--npc/re/guides/guides_louyang.txt2
-rw-r--r--npc/re/guides/guides_lutie.txt2
-rw-r--r--npc/re/guides/guides_malaya.txt6
-rw-r--r--npc/re/guides/guides_mora.txt8
-rw-r--r--npc/re/guides/guides_morroc.txt14
-rw-r--r--npc/re/guides/guides_moscovia.txt4
-rw-r--r--npc/re/guides/guides_niflheim.txt2
-rw-r--r--npc/re/guides/guides_payon.txt10
-rw-r--r--npc/re/guides/guides_prontera.txt10
-rw-r--r--npc/re/guides/guides_rachel.txt2
-rw-r--r--npc/re/guides/guides_umbala.txt4
-rw-r--r--npc/re/guides/guides_veins.txt4
-rw-r--r--npc/re/guild/invest_main.txt16
-rw-r--r--npc/re/guild/invest_npc.txt70
-rw-r--r--npc/re/instances/BakonawaLake.txt24
-rw-r--r--npc/re/instances/BangungotHospital.txt104
-rw-r--r--npc/re/instances/BuwayaCave.txt42
-rw-r--r--npc/re/instances/HazyForest.txt188
-rw-r--r--npc/re/instances/MalangdoCulvert.txt58
-rw-r--r--npc/re/instances/OctopusCave.txt38
-rw-r--r--npc/re/instances/OldGlastHeim.txt198
-rw-r--r--npc/re/jobs/1-1/acolyte.txt8
-rw-r--r--npc/re/jobs/1-1/archer.txt2
-rw-r--r--npc/re/jobs/1-1/mage.txt2
-rw-r--r--npc/re/jobs/1-1/merchant.txt2
-rw-r--r--npc/re/jobs/1-1/swordman.txt2
-rw-r--r--npc/re/jobs/1-1/thief.txt4
-rw-r--r--npc/re/jobs/3-1/archbishop.txt112
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt128
-rw-r--r--npc/re/jobs/3-1/mechanic.txt20
-rw-r--r--npc/re/jobs/3-1/ranger.txt60
-rw-r--r--npc/re/jobs/3-1/rune_knight.txt66
-rw-r--r--npc/re/jobs/3-1/warlock.txt24
-rw-r--r--npc/re/jobs/3-2/genetic.txt52
-rw-r--r--npc/re/jobs/3-2/minstrel.txt90
-rw-r--r--npc/re/jobs/3-2/royal_guard.txt30
-rw-r--r--npc/re/jobs/3-2/shadow_chaser.txt44
-rw-r--r--npc/re/jobs/3-2/sorcerer.txt12
-rw-r--r--npc/re/jobs/3-2/sura.txt30
-rw-r--r--npc/re/jobs/3-2/wanderer.txt50
-rw-r--r--npc/re/jobs/novice/novice.txt252
-rw-r--r--npc/re/jobs/novice/supernovice_ex.txt4
-rw-r--r--npc/re/jobs/repair.txt48
-rw-r--r--npc/re/kafras/kafras.txt22
-rw-r--r--npc/re/merchants/3rd_trader.txt50
-rw-r--r--npc/re/merchants/advanced_refiner.txt2
-rw-r--r--npc/re/merchants/alchemist.txt2
-rw-r--r--npc/re/merchants/ammo_boxes.txt12
-rw-r--r--npc/re/merchants/ammo_dealer.txt12
-rw-r--r--npc/re/merchants/blessed_refiner.txt12
-rw-r--r--npc/re/merchants/card_separation.txt4
-rw-r--r--npc/re/merchants/catalog.txt2
-rw-r--r--npc/re/merchants/coin_exchange.txt24
-rw-r--r--npc/re/merchants/diamond.txt16
-rw-r--r--npc/re/merchants/enchan_mal.txt2
-rw-r--r--npc/re/merchants/enchan_mora.txt20
-rw-r--r--npc/re/merchants/enchan_upg.txt2
-rw-r--r--npc/re/merchants/flute.txt6
-rw-r--r--npc/re/merchants/hd_refiner.txt32
-rw-r--r--npc/re/merchants/inn.txt2
-rw-r--r--npc/re/merchants/quivers.txt2
-rw-r--r--npc/re/merchants/refine.txt14
-rw-r--r--npc/re/merchants/renters.txt26
-rw-r--r--npc/re/merchants/shops.txt96
-rw-r--r--npc/re/merchants/ticket_refiner.txt2
-rw-r--r--npc/re/other/bulletin_boards.txt10
-rw-r--r--npc/re/other/item_merge.txt2
-rw-r--r--npc/re/other/mail.txt8
-rw-r--r--npc/re/other/mercenary_rent.txt20
-rw-r--r--npc/re/other/pvp.txt14
-rw-r--r--npc/re/other/resetskill.txt10
-rw-r--r--npc/re/other/stone_change.txt2
-rw-r--r--npc/re/other/turbo_track.txt2
-rw-r--r--npc/re/quests/cupet.txt30
-rw-r--r--npc/re/quests/eden/11-25.txt4
-rw-r--r--npc/re/quests/eden/26-40.txt14
-rw-r--r--npc/re/quests/eden/41-55.txt2
-rw-r--r--npc/re/quests/eden/56-70.txt2
-rw-r--r--npc/re/quests/eden/71-85.txt2
-rw-r--r--npc/re/quests/eden/86-90.txt2
-rw-r--r--npc/re/quests/eden/91-99.txt2
-rw-r--r--npc/re/quests/eden/eden_common.txt86
-rw-r--r--npc/re/quests/eden/eden_iro.txt46
-rw-r--r--npc/re/quests/eden/eden_quests.txt42
-rw-r--r--npc/re/quests/eden/eden_service.txt4
-rw-r--r--npc/re/quests/eden/eden_tutorial.txt14
-rw-r--r--npc/re/quests/first_class/tu_archer.txt2
-rw-r--r--npc/re/quests/homun_s.txt18
-rw-r--r--npc/re/quests/magic_books.txt18
-rw-r--r--npc/re/quests/monstertamers.txt2
-rw-r--r--npc/re/quests/mrsmile.txt10
-rw-r--r--npc/re/quests/pile_bunker.txt2
-rw-r--r--npc/re/quests/quests_13_1.txt10
-rw-r--r--npc/re/quests/quests_brasilis.txt86
-rw-r--r--npc/re/quests/quests_dewata.txt106
-rw-r--r--npc/re/quests/quests_dicastes.txt308
-rw-r--r--npc/re/quests/quests_eclage.txt120
-rw-r--r--npc/re/quests/quests_izlude.txt10
-rw-r--r--npc/re/quests/quests_lighthalzen.txt22
-rw-r--r--npc/re/quests/quests_malangdo.txt236
-rw-r--r--npc/re/quests/quests_malaya.txt242
-rw-r--r--npc/re/quests/quests_mora.txt192
-rw-r--r--npc/re/quests/quests_morocc.txt22
-rw-r--r--npc/re/quests/quests_nameless.txt2
-rw-r--r--npc/re/quests/quests_veins.txt2
-rw-r--r--npc/re/warps/cities/dicastes.txt28
-rw-r--r--npc/re/warps/cities/malaya.txt28
-rw-r--r--npc/re/warps/dungeons/iz_dun.txt4
-rw-r--r--npc/re/warps/fields/bif_fild.txt6
-rw-r--r--npc/re/warps/fields/morroc_fild.txt4
-rw-r--r--npc/re/warps/fields/veins_fild.txt2
-rw-r--r--npc/warps/cities/umbala.txt2
-rw-r--r--npc/warps/cities/yuno.txt26
-rw-r--r--npc/warps/dungeons/alde_dun.txt8
-rw-r--r--npc/warps/dungeons/c_tower.txt20
-rw-r--r--npc/warps/dungeons/kh_dun.txt2
-rw-r--r--npc/warps/dungeons/lhz_dun.txt50
-rw-r--r--npc/warps/dungeons/mosk_dun.txt26
-rw-r--r--npc/warps/dungeons/pay_dun.txt2
-rw-r--r--npc/warps/dungeons/prt_maze.txt8
-rw-r--r--npc/warps/dungeons/ra_san.txt2
-rw-r--r--npc/warps/fields/abyss_warper.txt6
-rw-r--r--npc/warps/fields/glastheim.txt2
-rw-r--r--npc/warps/fields/jawaii.txt2
-rw-r--r--npc/warps/guildcastles.txt2
-rw-r--r--npc/warps/other/arena.txt2
-rw-r--r--src/map/npc.c72
-rw-r--r--src/map/npc.h4
583 files changed, 9990 insertions, 9921 deletions
diff --git a/db/const.txt b/db/const.txt
index e5874f52f..3c20abc4a 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -3217,6 +3217,11 @@ THANATOS_KEEP 10009
4_F_REBELLION 10063
4_CHN_SHAOTH 10064
4_SHOAL 10065
+4_F_SARAH 10066
+4_GIGANTES_BIG 10067
+4_GIGANTES 10068
+4_GIGANTES_SMALL 10069
+4_GARGOYLE_STATUE 10070
HAVEQUEST 0
PLAYTIME 1
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 2b708e1ef..bf2a17acf 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -14,7 +14,7 @@
//= -> Juno -> Hugel -> ...
//============================================================
-airplane,243,73,0 script #AirshipWarp-1 45,1,1,{
+airplane,243,73,0 script #AirshipWarp-1 WARPNPC,1,1,{
end;
OnInit:
@@ -37,7 +37,7 @@ OnTouch:
}
}
-airplane,243,29,0 duplicate(#AirshipWarp-1) #AirshipWarp-2 45,1,1
+airplane,243,29,0 duplicate(#AirshipWarp-1) #AirshipWarp-2 WARPNPC,1,1
airplane,1,1,0 script Domestic_Airship -1,{
end;
@@ -167,14 +167,14 @@ OnTimer480000:
initnpctimer;
}
-airplane,240,64,5 script Exit#airplane1a::ExitAirplane 857,{
+airplane,240,64,5 script Exit#airplane1a::ExitAirplane 4_BOARD3,{
end;
}
-airplane,247,64,5 duplicate(ExitAirplane) Exit#airplane1b 857
-airplane,240,40,1 duplicate(ExitAirplane) Exit#airplane2a 857
-airplane,247,40,1 duplicate(ExitAirplane) Exit#airplane2b 857
+airplane,247,64,5 duplicate(ExitAirplane) Exit#airplane1b 4_BOARD3
+airplane,240,40,1 duplicate(ExitAirplane) Exit#airplane2a 4_BOARD3
+airplane,247,40,1 duplicate(ExitAirplane) Exit#airplane2b 4_BOARD3
-airplane,100,69,3 script Airship Crew#ein-1 852,{
+airplane,100,69,3 script Airship Crew#ein-1 4_M_EIN_SOLDIER,{
mes "[Airship Crew]";
mes "If we've landed at";
mes "your destination and";
@@ -185,7 +185,7 @@ airplane,100,69,3 script Airship Crew#ein-1 852,{
close;
}
-airplane,64,94,1 script Umbala Kid#ein_p 787,{
+airplane,64,94,1 script Umbala Kid#ein_p 4_M_UMKID,{
emotion e_swt2;
mes "[Kid]";
if (event_umbala >= 3) {
@@ -203,7 +203,7 @@ airplane,64,94,1 script Umbala Kid#ein_p 787,{
close;
}
-airplane,66,93,3 script Umbala Lady#ein_p 783,{
+airplane,66,93,3 script Umbala Lady#ein_p 4_F_UMWOMAN,{
emotion e_dots;
mes "[Lady]";
if (event_umbala >= 3) {
@@ -222,7 +222,7 @@ airplane,66,93,3 script Umbala Lady#ein_p 783,{
close;
}
-airplane,71,91,7 script Umbala Man#ein_p 789,{
+airplane,71,91,7 script Umbala Man#ein_p 4_M_UMSOLDIER,{
if (event_umbala >= 3) {
mes "[Chrmlim]";
mes "Hey there~";
@@ -265,7 +265,7 @@ airplane,71,91,7 script Umbala Man#ein_p 789,{
close;
}
-airplane,250,58,2 script Airship Staff#airplane 67,{
+airplane,250,58,2 script Airship Staff#airplane 1_F_02,{
// Hugel quest addition
if (hg_ma1 == 3) {
mes "[Airship Staff]";
@@ -329,7 +329,7 @@ airplane,250,58,2 script Airship Staff#airplane 67,{
}
}
-airplane,80,71,2 script Zerta#01airplane 834,{
+airplane,80,71,2 script Zerta#01airplane 4_M_BUDDHIST,{
mes "[Zerta]";
mes "Oh, hello adventurer.";
mes "I am currently on a";
@@ -339,7 +339,7 @@ airplane,80,71,2 script Zerta#01airplane 834,{
close;
}
-airplane,65,63,4 script Maelin#01airplane 714,{
+airplane,65,63,4 script Maelin#01airplane 4_F_06,{
mes "[Maelin]";
mes "Um, this Airship is";
mes "to Lutie, isn't it? I've";
@@ -349,7 +349,7 @@ airplane,65,63,4 script Maelin#01airplane 714,{
close;
}
-airplane,72,34,6 script Aanos#01airplane 702,{
+airplane,72,34,6 script Aanos#01airplane 4_F_GON,{
mes "[Aanos]";
mes "Oh wooow~";
mes "The sky looks";
@@ -358,7 +358,7 @@ airplane,72,34,6 script Aanos#01airplane 702,{
close;
}
-airplane,221,158,2 script Pilot#airplane 852,{
+airplane,221,158,2 script Pilot#airplane 4_M_EIN_SOLDIER,{
// Hugel quest addition
if (hg_ma1 == 3) {
mes "[Pilot]";
@@ -457,7 +457,7 @@ airplane,221,158,2 script Pilot#airplane 852,{
}
}
-airplane,50,66,5 script Apple Merchant#airplane 86,{
+airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{
mes "[Fruitz]";
mes "Welcome to Fruitz's";
mes "Shop where you can";
@@ -648,7 +648,7 @@ airplane,50,66,5 script Apple Merchant#airplane 86,{
//= ... -> Izlude -> Juno -> Rachel -> ...
//============================================================
-airplane_01,243,73,0 script #AirshipWarp-3 45,1,1,{
+airplane_01,243,73,0 script #AirshipWarp-3 WARPNPC,1,1,{
end;
OnTouch:
@@ -675,7 +675,7 @@ OnUnhide:
end;
}
-airplane_01,243,29,0 duplicate(#AirshipWarp-3) #AirshipWarp-4 45,1,1
+airplane_01,243,29,0 duplicate(#AirshipWarp-3) #AirshipWarp-4 WARPNPC,1,1
airplane_01,1,1,0 script International_Airship -1,{
end;
@@ -755,14 +755,14 @@ OnTimer240000:
end;
}
-airplane_01,240,64,5 script Exit#airplane_011a::ExitAirplane01 857,{
+airplane_01,240,64,5 script Exit#airplane_011a::ExitAirplane01 4_BOARD3,{
end;
}
-airplane_01,247,64,5 duplicate(ExitAirplane01) Exit#airplane_011b 857
-airplane_01,240,40,1 duplicate(ExitAirplane01) Exit#airplane_012a 857
-airplane_01,247,40,1 duplicate(ExitAirplane01) Exit#airplane_012b 857
+airplane_01,247,64,5 duplicate(ExitAirplane01) Exit#airplane_011b 4_BOARD3
+airplane_01,240,40,1 duplicate(ExitAirplane01) Exit#airplane_012a 4_BOARD3
+airplane_01,247,40,1 duplicate(ExitAirplane01) Exit#airplane_012b 4_BOARD3
-airplane_01,250,58,2 script Airship Staff#airplane01 67,{
+airplane_01,250,58,2 script Airship Staff#airplane01 1_F_02,{
mes "[Airship Staff]";
mes "Welcome";
mes "to the Airship.";
@@ -813,7 +813,7 @@ airplane_01,250,58,2 script Airship Staff#airplane01 67,{
}
}
-airplane_01,50,66,5 script Apple Merchant#air01 86,{
+airplane_01,50,66,5 script Apple Merchant#air01 4_M_04,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -957,7 +957,7 @@ airplane_01,50,66,5 script Apple Merchant#air01 86,{
}
}
-airplane_01,221,158,2 script Pilot#airplane_01 852,{
+airplane_01,221,158,2 script Pilot#airplane_01 4_M_EIN_SOLDIER,{
switch (rand(1,4)) {
case 1:
mes "[Pilot]";
@@ -1013,7 +1013,7 @@ airplane_01,221,158,2 script Pilot#airplane_01 852,{
}
}
-airplane_01,83,61,2 script Dianne#01airplane_01 72,2,2,{
+airplane_01,83,61,2 script Dianne#01airplane_01 1_F_MARIA,2,2,{
mes "[Dianne]";
mes "It's so weird!";
mes "I went to visit the";
@@ -1028,7 +1028,7 @@ OnTouch:
end;
}
-airplane_01,69,63,2 script Mendel#01airplane_01 55,{
+airplane_01,69,63,2 script Mendel#01airplane_01 1_M_JOBTESTER,{
mes "[Mendel]";
mes "As I expected, the";
mes "in-flight meals are";
@@ -1039,7 +1039,7 @@ airplane_01,69,63,2 script Mendel#01airplane_01 55,{
close;
}
-airplane_01,71,31,2 script Swordsman Shimizu#air_01 106,{
+airplane_01,71,31,2 script Swordsman Shimizu#air_01 1_M_MOC_LORD,{
mes "[Swordsman Shimizu]";
mes "Finally, after five";
mes "years of waiting...";
@@ -1057,7 +1057,7 @@ airplane_01,71,31,2 script Swordsman Shimizu#air_01 106,{
//============================================================
//= Typing Challenge
//============================================================
-airplane_01,32,61,4 script Nils#ein 49,1,1,{
+airplane_01,32,61,4 script Nils#ein 1_M_03,1,1,{
mes "[Nils]";
mes "Welcome to the";
mes "^ff0000RO Typing Challenge^000000.";
@@ -1232,7 +1232,7 @@ airplane_01,32,61,4 script Nils#ein 49,1,1,{
//============================================================
//= Apple Gambling
//============================================================
-airplane_01,33,68,4 script Clarice 74,{
+airplane_01,33,68,4 script Clarice 1_F_MERCHANT_02,{
mes "[Clarice]";
mes "Hi, I'm Clarice~";
mes "How would you like";
diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt
index 4ad8749a7..bd6b72fcc 100644
--- a/npc/airports/einbroch.txt
+++ b/npc/airports/einbroch.txt
@@ -8,7 +8,7 @@
//= Official NPCs.
//============================================================
-airport,143,43,5 script Airport Staff#airport1a::airport1 90,{
+airport,143,43,5 script Airport Staff#airport1a::airport1 4_F_01,{
mes "[Airport Staff]";
mes "Welcome to the";
mes "Einbroch Airport,";
@@ -51,10 +51,10 @@ airport,143,43,5 script Airport Staff#airport1a::airport1 90,{
close;
}
-airport,158,43,5 duplicate(airport1) Airport Staff#airport1b 90
-airport,126,43,5 duplicate(airport1) Airport Staff#airport1c 90
+airport,158,43,5 duplicate(airport1) Airport Staff#airport1b 4_F_01
+airport,126,43,5 duplicate(airport1) Airport Staff#airport1c 4_F_01
-airport,143,49,3 script Arrival Staff#airport2a::airport2 90,{
+airport,143,49,3 script Arrival Staff#airport2a::airport2 4_F_01,{
mes "[Arrival Staff]";
mes "Welcome to Einbroch Airport.";
mes "If you are arriving from your";
@@ -83,10 +83,10 @@ airport,143,49,3 script Arrival Staff#airport2a::airport2 90,{
close;
}
-airport,126,51,3 duplicate(airport2) Arrival Staff#airport2b 90
-airport,158,50,3 duplicate(airport2) Arrival Staff#airport2c 90
+airport,126,51,3 duplicate(airport2) Arrival Staff#airport2b 4_F_01
+airport,158,50,3 duplicate(airport2) Arrival Staff#airport2c 4_F_01
-einbroch,94,267,3 script Airship Staff#ein01 91,{
+einbroch,94,267,3 script Airship Staff#ein01 4_F_02,{
mes "[Airship Staff]";
mes "Welcome to the";
mes "Einbroch Airport.";
diff --git a/npc/airports/hugel.txt b/npc/airports/hugel.txt
index 2d65fdc30..015bf8efd 100644
--- a/npc/airports/hugel.txt
+++ b/npc/airports/hugel.txt
@@ -8,7 +8,7 @@
//= Official NPCs.
//============================================================
-hugel,178,142,0 script toairplane#hugel 45,1,1,{
+hugel,178,142,0 script toairplane#hugel WARPNPC,1,1,{
end;
OnTouch:
mes "To use the airship, you are required to pay 1,200 zeny or a Free Airship Ticket.";
diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt
index 7fbe8ae6d..e2c5f67b4 100644
--- a/npc/airports/lighthalzen.txt
+++ b/npc/airports/lighthalzen.txt
@@ -8,7 +8,7 @@
//= Official NPCs.
//============================================================
-lhz_airport,143,43,5 script Airport Staff#lhz_air1a::lhz_airport1 90,{
+lhz_airport,143,43,5 script Airport Staff#lhz_air1a::lhz_airport1 4_F_01,{
mes "[Airport Staff]";
mes "Welcome to the";
mes "Lighthalzen Airport,";
@@ -47,10 +47,10 @@ lhz_airport,143,43,5 script Airport Staff#lhz_air1a::lhz_airport1 90,{
close;
}
-lhz_airport,158,43,5 duplicate(lhz_airport1) Airship Staff#lhz_air1b 90
-lhz_airport,126,43,5 duplicate(lhz_airport1) Airship Staff#lhz_air1c 90
+lhz_airport,158,43,5 duplicate(lhz_airport1) Airship Staff#lhz_air1b 4_F_01
+lhz_airport,126,43,5 duplicate(lhz_airport1) Airship Staff#lhz_air1c 4_F_01
-lhz_airport,143,49,3 script Arrival Staff#lhz_air2a::lhz_airport2 90,{
+lhz_airport,143,49,3 script Arrival Staff#lhz_air2a::lhz_airport2 4_F_01,{
mes "[Arrival Staff]";
mes "Welcome to Lighthalzen Airport.";
mes "Please let me guide you to the";
@@ -77,5 +77,5 @@ lhz_airport,143,49,3 script Arrival Staff#lhz_air2a::lhz_airport2 90,{
close;
}
-lhz_airport,126,51,3 duplicate(lhz_airport2) Arrival Staff#lhz_air2b 90
-lhz_airport,158,50,3 duplicate(lhz_airport2) Arrival Staff#lhz_air2c 90
+lhz_airport,126,51,3 duplicate(lhz_airport2) Arrival Staff#lhz_air2b 4_F_01
+lhz_airport,158,50,3 duplicate(lhz_airport2) Arrival Staff#lhz_air2c 4_F_01
diff --git a/npc/airports/rachel.txt b/npc/airports/rachel.txt
index 88c48cd16..f157f5f6b 100644
--- a/npc/airports/rachel.txt
+++ b/npc/airports/rachel.txt
@@ -8,7 +8,7 @@
//= Official NPCs.
//============================================================
-ra_fild12,295,208,0 script toairplane#rachel 45,1,1,{
+ra_fild12,295,208,0 script toairplane#rachel WARPNPC,1,1,{
end;
OnTouch:
mes "To use the airship, you are required to pay 1,200 zeny or a Free Airship Ticket.";
diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt
index 0d2ba73a8..4e697918b 100644
--- a/npc/airports/yuno.txt
+++ b/npc/airports/yuno.txt
@@ -8,7 +8,7 @@
//= Official NPCs.
//============================================================
-y_airport,143,43,5 script Airport Staff#y_air1a::y_airport1 90,{
+y_airport,143,43,5 script Airport Staff#y_air1a::y_airport1 4_F_01,{
mes "[Airport Staff]";
mes "Welcome to Juno Airport where we offer domestic flights to Einbroch, Lighthalzen and Hugel,";
mes "and international flights to Izlude and Rachel.";
@@ -45,10 +45,10 @@ y_airport,143,43,5 script Airport Staff#y_air1a::y_airport1 90,{
close;
}
-y_airport,158,43,5 duplicate(y_airport1) Airport Staff#y_air1b 90
-y_airport,126,43,5 duplicate(y_airport1) Airport Staff#y_air1c 90
+y_airport,158,43,5 duplicate(y_airport1) Airport Staff#y_air1b 4_F_01
+y_airport,126,43,5 duplicate(y_airport1) Airport Staff#y_air1c 4_F_01
-y_airport,143,49,3 script Arrival Staff#y_air2a::y_airport2 90,{
+y_airport,143,49,3 script Arrival Staff#y_air2a::y_airport2 4_F_01,{
mes "[Airport Staff]";
mes "Welcome to Juno Airport. If you've just arrived from your";
mes "flight, let me guide you to the main terminal. Otherwise, please";
@@ -74,10 +74,10 @@ y_airport,143,49,3 script Arrival Staff#y_air2a::y_airport2 90,{
close;
}
-y_airport,126,51,3 duplicate(y_airport2) Arrival Staff#y_air2b 90
-y_airport,158,50,3 duplicate(y_airport2) Arrival Staff#y_air2c 90
+y_airport,126,51,3 duplicate(y_airport2) Arrival Staff#y_air2b 4_F_01
+y_airport,158,50,3 duplicate(y_airport2) Arrival Staff#y_air2c 4_F_01
-y_airport,145,63,5 script Domestic Boarding 91,{
+y_airport,145,63,5 script Domestic Boarding 4_F_02,{
mes "[Boarding Staff]";
mes "Would you like to board the";
mes "Airship that flies to Einbroch,";
@@ -97,7 +97,7 @@ y_airport,145,63,5 script Domestic Boarding 91,{
close;
}
-y_airport,140,63,5 script International Boarding 91,{
+y_airport,140,63,5 script International Boarding 4_F_02,{
mes "[Boarding Staff]";
mes "Would you like to board";
mes "the Airship which flies to";
@@ -118,7 +118,7 @@ y_airport,140,63,5 script International Boarding 91,{
close;
}
-yuno,14,262,5 script Airship Staff#yuno01 91,{
+yuno,14,262,5 script Airship Staff#yuno01 4_F_02,{
mes "[Airship Staff]";
mes "Welcome to Juno Airport.";
mes "Please use this door to";
@@ -138,7 +138,7 @@ yuno,14,262,5 script Airship Staff#yuno01 91,{
close;
}
-yuno,88,263,3 script Airship Staff#yuno02 91,{
+yuno,88,263,3 script Airship Staff#yuno02 4_F_02,{
mes "[Airship Staff]";
mes "Welcome to Juno Airport.";
mes "Please use this door to";
diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index 76eed3733..2c286e8f5 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -22,10 +22,10 @@
// Generals
//============================================================
-bat_room,161,158,3 script Gen. Guillaume's Aide#01 419,{ end; }
-bat_room,161,160,3 script Gen. Guillaume's Aide#03 419,{ end; }
+bat_room,161,158,3 script Gen. Guillaume's Aide#01 4_M_KY_HEAD,{ end; }
+bat_room,161,160,3 script Gen. Guillaume's Aide#03 4_M_KY_HEAD,{ end; }
-bat_room,160,141,3 script Prince Croix 416,{
+bat_room,160,141,3 script Prince Croix 4_M_CRU_CRUA,{
cutin "bat_crua1",2;
mes "[Prince Croix]";
mes "Wise adventurer, why don't you lend us your power for victory?";
@@ -89,10 +89,10 @@ bat_room,160,141,3 script Prince Croix 416,{
end;
}
-bat_room,161,140,3 script Prince Croix's Aide#01 415,{ end; }
-bat_room,161,142,3 script Prince Croix's Aide#02 415,{ end; }
+bat_room,161,140,3 script Prince Croix's Aide#01 4_M_CRU_HEAD,{ end; }
+bat_room,161,142,3 script Prince Croix's Aide#02 4_M_CRU_HEAD,{ end; }
-bat_room,160,159,3 script General Guillaume 420,{
+bat_room,160,159,3 script General Guillaume 4_M_KY_KIYOM,{
cutin "bat_kiyom2",2;
mes "[General Guillaume]";
mes "Hot-blooded adventurer, we need your ability to win this battle.";
@@ -172,14 +172,14 @@ bat_room,160,159,3 script General Guillaume 420,{
// Flags
//============================================================
-//bat_room,140,160,3 script Guillaume Base#roomflag1 973,{ end; }
-//bat_room,167,160,3 script Guillaume Base#roomflag2 973,{ end; }
-//bat_room,140,139,3 script Croix Base#roomflag1 974,{ end; }
-//bat_room,167,139,3 script Croix Base#roomflag2 974,{ end; }
+//bat_room,140,160,3 script Guillaume Base#roomflag1 1_FLAG_LION,{ end; }
+//bat_room,167,160,3 script Guillaume Base#roomflag2 1_FLAG_LION,{ end; }
+//bat_room,140,139,3 script Croix Base#roomflag1 1_FLAG_EAGLE,{ end; }
+//bat_room,167,139,3 script Croix Base#roomflag2 1_FLAG_EAGLE,{ end; }
// BattleGround Warper
//============================================================
-bat_room,148,150,5 script Teleporter#Battlefield 124,{
+bat_room,148,150,5 script Teleporter#Battlefield 4_F_TELEPORTER,{
mes "[Teleporter]";
mes "Do you wish to leave the battlefield? Use my services to return to town.";
next;
@@ -229,7 +229,7 @@ bat_room,148,150,5 script Teleporter#Battlefield 124,{
end;
}
-- script Maroll Battle Recruiter::BatRecruit 728,{
+- script Maroll Battle Recruiter::BatRecruit 4_F_JOB_KNIGHT,{
mes "[Maroll Battle Recruiter]";
mes "Good day, adventurer.";
mes "I'm a knight from a far country called Maroll Kingdom.";
@@ -270,13 +270,13 @@ bat_room,148,150,5 script Teleporter#Battlefield 124,{
end;
}
-prontera,123,83,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit1 728
-moc_ruins,75,162,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit2 728
-aldebaran,146,109,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit3 728
-geffen,109,66,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit4 728
-payon,189,105,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit5 728
-lighthalzen,153,86,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit6 728
-rachel,149,138,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit7 728
+prontera,123,83,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit1 4_F_JOB_KNIGHT
+moc_ruins,75,162,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit2 4_F_JOB_KNIGHT
+aldebaran,146,109,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit3 4_F_JOB_KNIGHT
+geffen,109,66,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit4 4_F_JOB_KNIGHT
+payon,189,105,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit5 4_F_JOB_KNIGHT
+lighthalzen,153,86,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit6 4_F_JOB_KNIGHT
+rachel,149,138,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit7 4_F_JOB_KNIGHT
// Additional warps
// Empty
@@ -309,21 +309,21 @@ bat_room,253,211,0 warp bat32 1,1,bat_room,154,149
// Kafra
//============================================================
-bat_room,148,147,4 script Kafra Staff::kaf_bat 861,{
+bat_room,148,147,4 script Kafra Staff::kaf_bat 4_F_KAFRA9,{
cutin "kafra_09",2;
callfunc "F_Kafra",0,2,1,150,0;
}
// Repairman
//============================================================
-bat_room,138,144,4 script Repairman#bg 86,{
+bat_room,138,144,4 script Repairman#bg 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
// GM Management NPC
//============================================================
-bat_room,1,151,3 script Switch#batgnd 81,{
+bat_room,1,151,3 script Switch#batgnd 4_DOG01,{
set .@i, callfunc("F_GM_NPC",1854,0);
if (.@i == -1) {
mes "The command has been cancelled.";
@@ -374,7 +374,7 @@ bat_room,1,151,3 script Switch#batgnd 81,{
// Badges Exchange
//============================================================
-bat_room,160,150,3 script Erundek 109,{
+bat_room,160,150,3 script Erundek 4_M_MANAGER,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt
index 4a5c00a9b..18f153d87 100644
--- a/npc/battleground/flavius/flavius01.txt
+++ b/npc/battleground/flavius/flavius01.txt
@@ -20,7 +20,7 @@
// Waiting Room NPCs
//============================================================
-bat_room,86,227,4 script Lieutenant Ator 418,{
+bat_room,86,227,4 script Lieutenant Ator 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
@@ -30,7 +30,7 @@ OnEnterBG:
end;
}
-bat_room,85,204,0 script Lieutenant Thelokus 414,{
+bat_room,85,204,0 script Lieutenant Thelokus 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
@@ -43,7 +43,7 @@ OnEnterBG:
bat_room,85,220,0 warp back_bgroomb01a 1,1,bat_room,154,150
bat_room,85,211,0 warp back_bgroomb01b 1,1,bat_room,154,150
-bat_room,2,151,3 script #bat_b01_timer 844,{
+bat_room,2,151,3 script #bat_b01_timer CLEAR_NPC,{
end;
OnInit:
@@ -71,7 +71,7 @@ OnTimer1000:
// Flavius Battleground Engine
//============================================================
-bat_b01,15,15,3 script start#bat_b01 844,{
+bat_b01,15,15,3 script start#bat_b01 CLEAR_NPC,{
OnInit:
mapwarp "bat_b01","bat_room",154,150;
end;
@@ -147,7 +147,7 @@ OnTimer10000:
end;
}
-bat_b01,1,1,3 script OBJ#bat_b01_a 844,{
+bat_b01,1,1,3 script OBJ#bat_b01_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id1,"bat_b01",61,150,"Pink Crystal",1915,"OBJ#bat_b01_a::OnMyMobDead";
end;
@@ -180,7 +180,7 @@ OnMyMobDead:
end;
}
-bat_b01,1,2,3 script OBJ#bat_b01_b 844,{
+bat_b01,1,2,3 script OBJ#bat_b01_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id2,"bat_b01",328,150,"Blue Crystal",1914,"OBJ#bat_b01_b::OnMyMobDead";
end;
@@ -213,7 +213,7 @@ OnMyMobDead:
end;
}
-bat_b01,1,3,3 script guardian#bat_b01_a 844,{
+bat_b01,1,3,3 script guardian#bat_b01_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id1,"bat_b01",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
bg_monster $@FlaviusBG1_id1,"bat_b01",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
@@ -231,7 +231,7 @@ OnMyMobDead:
end;
}
-bat_b01,1,3,3 script guardian#bat_b01_b 844,{
+bat_b01,1,3,3 script guardian#bat_b01_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id2,"bat_b01",307,160,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
bg_monster $@FlaviusBG1_id2,"bat_b01",307,138,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
@@ -249,7 +249,7 @@ OnMyMobDead:
end;
}
-bat_b01,1,4,3 script cell#bat_b01_a 844,{
+bat_b01,1,4,3 script cell#bat_b01_a CLEAR_NPC,{
OnRed:
setcell "bat_b01",62,149,60,151,cell_basilica,1;
setcell "bat_b01",62,149,60,151,cell_walkable,0;
@@ -261,7 +261,7 @@ OnGreen:
end;
}
-bat_b01,1,5,3 script cell#bat_b01_b 844,{
+bat_b01,1,5,3 script cell#bat_b01_b CLEAR_NPC,{
OnRed:
setcell "bat_b01",327,151,329,149,cell_basilica,1;
setcell "bat_b01",327,151,329,149,cell_walkable,0;
@@ -273,7 +273,7 @@ OnGreen:
end;
}
-bat_b01,1,6,1 script time#bat_b01 844,{
+bat_b01,1,6,1 script time#bat_b01 CLEAR_NPC,{
OnEnable:
donpcevent "Battle Therapist#b01_a::OnEnable";
donpcevent "Battle Therapist#b01_b::OnEnable";
@@ -285,7 +285,7 @@ OnStop:
end;
}
-bat_b01,10,294,3 script Battle Therapist#b01_a 95,{
+bat_b01,10,294,3 script Battle Therapist#b01_a 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -319,7 +319,7 @@ OnStop:
end;
}
-bat_b01,10,290,0 script bat_b01_rp1_a_warp 45,10,10,{
+bat_b01,10,290,0 script bat_b01_rp1_a_warp WARPNPC,10,10,{
OnInit:
disablenpc "bat_b01_rp1_a_warp";
end;
@@ -330,7 +330,7 @@ OnTouch:
end;
}
-bat_b01,389,14,3 script Battle Therapist#b01_b 95,{
+bat_b01,389,14,3 script Battle Therapist#b01_b 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -364,7 +364,7 @@ OnStop:
end;
}
-bat_b01,389,10,0 script bat_b01_rp1_b_warp 45,9,9,{
+bat_b01,389,10,0 script bat_b01_rp1_b_warp WARPNPC,9,9,{
OnInit:
disablenpc "bat_b01_rp1_a_warp";
end;
@@ -389,7 +389,7 @@ OnTouch:
end;
}
-bat_b01,10,294,3 script Guillaume Vintenar#b01_a 934,{
+bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{
if ($@FlaviusBG1_id1 == getcharid(4)) {
if ($@FlaviusBG1_Victory == 1) {
set .@your_medal,countitem(7829);
@@ -441,7 +441,7 @@ OnInit:
end;
}
-bat_b01,389,14,3 script Croix Vintenar#b01_b 934,{
+bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{
if ($@FlaviusBG1_id2 == getcharid(4)) {
if ($@FlaviusBG1_Victory == 2) {
set .@your_medal,countitem(7829);
@@ -493,7 +493,7 @@ OnInit:
end;
}
-bat_b01,1,5,3 script countdown#bat_b01 844,{
+bat_b01,1,5,3 script countdown#bat_b01 CLEAR_NPC,{
OnInit:
stopnpctimer;
end;
@@ -549,31 +549,31 @@ OnTimer1900000:
end;
}
-bat_b01,81,83,3 script Guillaume Camp#flag21 973,{ end; }
-bat_b01,94,83,3 script Guillaume Camp#flag22 973,{ end; }
-bat_b01,81,66,3 script Guillaume Camp#flag23 973,{ end; }
-bat_b01,94,66,3 script Guillaume Camp#flag24 973,{ end; }
-bat_b01,139,142,3 script Guillaume Camp#flag25 973,{ end; }
-bat_b01,139,158,3 script Guillaume Camp#flag26 973,{ end; }
-bat_b01,110,161,3 script Guillaume Camp#flag27 973,{ end; }
-bat_b01,110,137,3 script Guillaume Camp#flag28 973,{ end; }
-bat_b01,63,135,3 script Guillaume Camp#flag29 973,{ end; }
-bat_b01,63,165,3 script Guillaume Camp#flag30 973,{ end; }
-bat_b01,10,296,3 script Guillaume Camp#flag31 973,{ end; }
-
-bat_b01,306,233,3 script Croix Camp#flag21 974,{ end; }
-bat_b01,317,233,3 script Croix Camp#flag22 974,{ end; }
-bat_b01,306,216,3 script Croix Camp#flag23 974,{ end; }
-bat_b01,317,216,3 script Croix Camp#flag24 974,{ end; }
-bat_b01,257,158,3 script Croix Camp#flag25 974,{ end; }
-bat_b01,257,141,3 script Croix Camp#flag26 974,{ end; }
-bat_b01,297,164,3 script Croix Camp#flag27 974,{ end; }
-bat_b01,297,136,3 script Croix Camp#flag28 974,{ end; }
-bat_b01,336,161,3 script Croix Camp#flag29 974,{ end; }
-bat_b01,336,139,3 script Croix Camp#flag30 974,{ end; }
-bat_b01,389,16,3 script Croix Camp#flag31 974,{ end; }
-
-bat_b01,10,294,3 script Vintenar#bat_b01_aover 419,{
+bat_b01,81,83,3 script Guillaume Camp#flag21 1_FLAG_LION,{ end; }
+bat_b01,94,83,3 script Guillaume Camp#flag22 1_FLAG_LION,{ end; }
+bat_b01,81,66,3 script Guillaume Camp#flag23 1_FLAG_LION,{ end; }
+bat_b01,94,66,3 script Guillaume Camp#flag24 1_FLAG_LION,{ end; }
+bat_b01,139,142,3 script Guillaume Camp#flag25 1_FLAG_LION,{ end; }
+bat_b01,139,158,3 script Guillaume Camp#flag26 1_FLAG_LION,{ end; }
+bat_b01,110,161,3 script Guillaume Camp#flag27 1_FLAG_LION,{ end; }
+bat_b01,110,137,3 script Guillaume Camp#flag28 1_FLAG_LION,{ end; }
+bat_b01,63,135,3 script Guillaume Camp#flag29 1_FLAG_LION,{ end; }
+bat_b01,63,165,3 script Guillaume Camp#flag30 1_FLAG_LION,{ end; }
+bat_b01,10,296,3 script Guillaume Camp#flag31 1_FLAG_LION,{ end; }
+
+bat_b01,306,233,3 script Croix Camp#flag21 1_FLAG_EAGLE,{ end; }
+bat_b01,317,233,3 script Croix Camp#flag22 1_FLAG_EAGLE,{ end; }
+bat_b01,306,216,3 script Croix Camp#flag23 1_FLAG_EAGLE,{ end; }
+bat_b01,317,216,3 script Croix Camp#flag24 1_FLAG_EAGLE,{ end; }
+bat_b01,257,158,3 script Croix Camp#flag25 1_FLAG_EAGLE,{ end; }
+bat_b01,257,141,3 script Croix Camp#flag26 1_FLAG_EAGLE,{ end; }
+bat_b01,297,164,3 script Croix Camp#flag27 1_FLAG_EAGLE,{ end; }
+bat_b01,297,136,3 script Croix Camp#flag28 1_FLAG_EAGLE,{ end; }
+bat_b01,336,161,3 script Croix Camp#flag29 1_FLAG_EAGLE,{ end; }
+bat_b01,336,139,3 script Croix Camp#flag30 1_FLAG_EAGLE,{ end; }
+bat_b01,389,16,3 script Croix Camp#flag31 1_FLAG_EAGLE,{ end; }
+
+bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
if ($@FlaviusBG1_id1 == getcharid(4)) {
if (.@A_B_gap > 0) {
@@ -651,7 +651,7 @@ OnInit:
end;
}
-bat_b01,389,14,3 script Vintenar#bat_b01_bover 415,{
+bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
if ($@FlaviusBG1_id2 == getcharid(4)) {
if (.@A_B_gap > 0) {
@@ -729,7 +729,7 @@ OnInit:
end;
}
-bat_b01,1,10,3 script Release all#b01 81,{
+bat_b01,1,10,3 script Release all#b01 4_DOG01,{
set .@i, callfunc("F_GM_NPC",1854,0);
if (.@i == -1) {
mes "Cancelled.";
diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt
index aebeab4f2..0a88b9919 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -21,7 +21,7 @@
// Waiting Room NPCs
//============================================================
-bat_room,142,227,4 script Lieutenant Huvas 418,{
+bat_room,142,227,4 script Lieutenant Huvas 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
@@ -31,7 +31,7 @@ OnEnterBG:
end;
}
-bat_room,142,204,0 script Lieutenant Yukon 414,{
+bat_room,142,204,0 script Lieutenant Yukon 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
@@ -44,7 +44,7 @@ OnEnterBG:
bat_room,141,220,0 warp back_bgroomb02a 1,1,bat_room,154,150
bat_room,141,211,0 warp back_bgroomb02b 1,1,bat_room,154,150
-bat_room,2,151,3 script #bat_b02_timer 844,{
+bat_room,2,151,3 script #bat_b02_timer CLEAR_NPC,{
end;
OnInit:
@@ -72,7 +72,7 @@ OnTimer1000:
// Flavius Battleground Engine
//============================================================
-bat_b02,15,15,3 script start#bat_b02 844,{
+bat_b02,15,15,3 script start#bat_b02 CLEAR_NPC,{
OnInit:
mapwarp "bat_b02","bat_room",154,150;
end;
@@ -148,7 +148,7 @@ OnTimer10000:
end;
}
-bat_b02,1,1,3 script OBJ#bat_b02_a 844,{
+bat_b02,1,1,3 script OBJ#bat_b02_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG2_id1,"bat_b02",61,150,"Pink Crystal",1915,"OBJ#bat_b02_a::OnMyMobDead";
end;
@@ -181,7 +181,7 @@ OnMyMobDead:
end;
}
-bat_b02,1,2,3 script OBJ#bat_b02_b 844,{
+bat_b02,1,2,3 script OBJ#bat_b02_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG2_id2,"bat_b02",328,150,"Blue Crystal",1914,"OBJ#bat_b02_b::OnMyMobDead";
end;
@@ -214,7 +214,7 @@ OnMyMobDead:
end;
}
-bat_b02,1,3,3 script guardian#bat_b02_a 844,{
+bat_b02,1,3,3 script guardian#bat_b02_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG2_id1,"bat_b02",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b02_a::OnMyMobDead";
bg_monster $@FlaviusBG2_id1,"bat_b02",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b02_a::OnMyMobDead";
@@ -232,7 +232,7 @@ OnMyMobDead:
end;
}
-bat_b02,1,3,3 script guardian#bat_b02_b 844,{
+bat_b02,1,3,3 script guardian#bat_b02_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG2_id2,"bat_b02",307,160,"Croix Camp Guardian",1949,"guardian#bat_b02_b::OnMyMobDead";
bg_monster $@FlaviusBG2_id2,"bat_b02",307,138,"Croix Camp Guardian",1949,"guardian#bat_b02_b::OnMyMobDead";
@@ -250,7 +250,7 @@ OnMyMobDead:
end;
}
-bat_b02,1,4,3 script cell#bat_b02_a 844,{
+bat_b02,1,4,3 script cell#bat_b02_a CLEAR_NPC,{
OnRed:
setcell "bat_b02",62,149,60,151,cell_basilica,1;
setcell "bat_b02",62,149,60,151,cell_walkable,0;
@@ -262,7 +262,7 @@ OnGreen:
end;
}
-bat_b02,1,5,3 script cell#bat_b02_b 844,{
+bat_b02,1,5,3 script cell#bat_b02_b CLEAR_NPC,{
OnRed:
setcell "bat_b02",327,151,329,149,cell_basilica,1;
setcell "bat_b02",327,151,329,149,cell_walkable,0;
@@ -274,7 +274,7 @@ OnGreen:
end;
}
-bat_b02,1,6,1 script time#bat_b02 844,{
+bat_b02,1,6,1 script time#bat_b02 CLEAR_NPC,{
OnEnable:
donpcevent "Battle Therapist#b02_a::OnEnable";
donpcevent "Battle Therapist#b02_b::OnEnable";
@@ -286,7 +286,7 @@ OnStop:
end;
}
-bat_b02,10,294,3 script Battle Therapist#b02_a 95,{
+bat_b02,10,294,3 script Battle Therapist#b02_a 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -320,7 +320,7 @@ OnStop:
end;
}
-bat_b02,10,290,0 script bat_b02_rp1_a_warp 45,10,10,{
+bat_b02,10,290,0 script bat_b02_rp1_a_warp WARPNPC,10,10,{
OnInit:
disablenpc "bat_b02_rp1_a_warp";
end;
@@ -331,7 +331,7 @@ OnTouch:
end;
}
-bat_b02,389,14,3 script Battle Therapist#b02_b 95,{
+bat_b02,389,14,3 script Battle Therapist#b02_b 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -365,7 +365,7 @@ OnStop:
end;
}
-bat_b02,389,10,0 script bat_b02_rp1_b_warp 45,9,9,{
+bat_b02,389,10,0 script bat_b02_rp1_b_warp WARPNPC,9,9,{
OnInit:
disablenpc "bat_b02_rp1_a_warp";
end;
@@ -390,7 +390,7 @@ OnTouch:
end;
}
-bat_b02,10,294,3 script Guillaume Vintenar#b02_a 934,{
+bat_b02,10,294,3 script Guillaume Vintenar#b02_a 4_M_RASWORD,{
if ($@FlaviusBG2_id1 == getcharid(4)) {
if ($@FlaviusBG2_Victory == 1) {
set .@your_medal,countitem(7829);
@@ -442,7 +442,7 @@ OnInit:
end;
}
-bat_b02,389,14,3 script Croix Vintenar#b02_b 934,{
+bat_b02,389,14,3 script Croix Vintenar#b02_b 4_M_RASWORD,{
if ($@FlaviusBG2_id2 == getcharid(4)) {
if ($@FlaviusBG2_Victory == 2) {
set .@your_medal,countitem(7829);
@@ -494,7 +494,7 @@ OnInit:
end;
}
-bat_b02,1,5,3 script countdown#bat_b02 844,{
+bat_b02,1,5,3 script countdown#bat_b02 CLEAR_NPC,{
OnInit:
stopnpctimer;
end;
@@ -550,31 +550,31 @@ OnTimer1900000:
end;
}
-bat_b02,81,83,3 script Guillaume Camp#flag32 973,{ end; }
-bat_b02,94,83,3 script Guillaume Camp#flag33 973,{ end; }
-bat_b02,81,66,3 script Guillaume Camp#flag34 973,{ end; }
-bat_b02,94,66,3 script Guillaume Camp#flag35 973,{ end; }
-bat_b02,139,142,3 script Guillaume Camp#flag36 973,{ end; }
-bat_b02,139,158,3 script Guillaume Camp#flag37 973,{ end; }
-bat_b02,110,161,3 script Guillaume Camp#flag38 973,{ end; }
-bat_b02,110,137,3 script Guillaume Camp#flag39 973,{ end; }
-bat_b02,63,135,3 script Guillaume Camp#flag40 973,{ end; }
-bat_b02,63,165,3 script Guillaume Camp#flag41 973,{ end; }
-bat_b02,10,296,3 script Guillaume Camp#flag42 973,{ end; }
-
-bat_b02,306,233,3 script Croix Camp#flag32 974,{ end; }
-bat_b02,317,233,3 script Croix Camp#flag33 974,{ end; }
-bat_b02,306,216,3 script Croix Camp#flag34 974,{ end; }
-bat_b02,317,216,3 script Croix Camp#flag35 974,{ end; }
-bat_b02,257,158,3 script Croix Camp#flag36 974,{ end; }
-bat_b02,257,141,3 script Croix Camp#flag37 974,{ end; }
-bat_b02,297,164,3 script Croix Camp#flag38 974,{ end; }
-bat_b02,297,136,3 script Croix Camp#flag39 974,{ end; }
-bat_b02,336,161,3 script Croix Camp#flag40 974,{ end; }
-bat_b02,336,139,3 script Croix Camp#flag41 974,{ end; }
-bat_b02,389,16,3 script Croix Camp#flag42 974,{ end; }
-
-bat_b02,10,294,3 script Vintenar#bat_b02_aover 419,{
+bat_b02,81,83,3 script Guillaume Camp#flag32 1_FLAG_LION,{ end; }
+bat_b02,94,83,3 script Guillaume Camp#flag33 1_FLAG_LION,{ end; }
+bat_b02,81,66,3 script Guillaume Camp#flag34 1_FLAG_LION,{ end; }
+bat_b02,94,66,3 script Guillaume Camp#flag35 1_FLAG_LION,{ end; }
+bat_b02,139,142,3 script Guillaume Camp#flag36 1_FLAG_LION,{ end; }
+bat_b02,139,158,3 script Guillaume Camp#flag37 1_FLAG_LION,{ end; }
+bat_b02,110,161,3 script Guillaume Camp#flag38 1_FLAG_LION,{ end; }
+bat_b02,110,137,3 script Guillaume Camp#flag39 1_FLAG_LION,{ end; }
+bat_b02,63,135,3 script Guillaume Camp#flag40 1_FLAG_LION,{ end; }
+bat_b02,63,165,3 script Guillaume Camp#flag41 1_FLAG_LION,{ end; }
+bat_b02,10,296,3 script Guillaume Camp#flag42 1_FLAG_LION,{ end; }
+
+bat_b02,306,233,3 script Croix Camp#flag32 1_FLAG_EAGLE,{ end; }
+bat_b02,317,233,3 script Croix Camp#flag33 1_FLAG_EAGLE,{ end; }
+bat_b02,306,216,3 script Croix Camp#flag34 1_FLAG_EAGLE,{ end; }
+bat_b02,317,216,3 script Croix Camp#flag35 1_FLAG_EAGLE,{ end; }
+bat_b02,257,158,3 script Croix Camp#flag36 1_FLAG_EAGLE,{ end; }
+bat_b02,257,141,3 script Croix Camp#flag37 1_FLAG_EAGLE,{ end; }
+bat_b02,297,164,3 script Croix Camp#flag38 1_FLAG_EAGLE,{ end; }
+bat_b02,297,136,3 script Croix Camp#flag39 1_FLAG_EAGLE,{ end; }
+bat_b02,336,161,3 script Croix Camp#flag40 1_FLAG_EAGLE,{ end; }
+bat_b02,336,139,3 script Croix Camp#flag41 1_FLAG_EAGLE,{ end; }
+bat_b02,389,16,3 script Croix Camp#flag42 1_FLAG_EAGLE,{ end; }
+
+bat_b02,10,294,3 script Vintenar#bat_b02_aover 4_M_KY_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2;
if ($@FlaviusBG2_id1 == getcharid(4)) {
if (.@A_B_gap > 0) {
@@ -652,7 +652,7 @@ OnInit:
end;
}
-bat_b02,389,14,3 script Vintenar#bat_b02_bover 415,{
+bat_b02,389,14,3 script Vintenar#bat_b02_bover 4_M_CRU_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2;
if ($@FlaviusBG2_id2 == getcharid(4)) {
if (.@A_B_gap > 0) {
@@ -730,7 +730,7 @@ OnInit:
end;
}
-bat_b02,1,10,3 script Release all#b02 81,{
+bat_b02,1,10,3 script Release all#b02 4_DOG01,{
set .@i, callfunc("F_GM_NPC",1854,0);
if (.@i == -1) {
mes "Cancelled.";
diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt
index 92dae7b9e..026b4402f 100644
--- a/npc/battleground/flavius/flavius_enter.txt
+++ b/npc/battleground/flavius/flavius_enter.txt
@@ -13,7 +13,7 @@
// Flavius Officer - Guillaume
//============================================================
-bat_room,133,178,5 script Flavius Officer#01a 418,{
+bat_room,133,178,5 script Flavius Officer#01a 4_M_KY_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -80,7 +80,7 @@ bat_room,133,178,5 script Flavius Officer#01a 418,{
close;
}
-bat_room,133,121,1 script Flavius Officer#01b 414,{
+bat_room,133,121,1 script Flavius Officer#01b 4_M_CRU_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -147,7 +147,7 @@ bat_room,133,121,1 script Flavius Officer#01b 414,{
close;
}
-bat_room,135,178,5 script Guillaume Knight#3 417,{
+bat_room,135,178,5 script Guillaume Knight#3 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -169,7 +169,7 @@ bat_room,135,178,5 script Guillaume Knight#3 417,{
close;
}
-bat_room,151,178,5 script Guillaume Knight#4 417,{
+bat_room,151,178,5 script Guillaume Knight#4 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -191,7 +191,7 @@ bat_room,151,178,5 script Guillaume Knight#4 417,{
close;
}
-bat_room,135,121,1 script Croix Knight#3 413,{
+bat_room,135,121,1 script Croix Knight#3 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -213,7 +213,7 @@ bat_room,135,121,1 script Croix Knight#3 413,{
close;
}
-bat_room,151,121,1 script Croix Knight#4 413,{
+bat_room,151,121,1 script Croix Knight#4 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -237,7 +237,7 @@ bat_room,151,121,1 script Croix Knight#4 413,{
// Flavius Officer - Croix
//============================================================
-bat_room,148,178,5 script Flavius Officer#02a 418,{
+bat_room,148,178,5 script Flavius Officer#02a 4_M_KY_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -304,7 +304,7 @@ bat_room,148,178,5 script Flavius Officer#02a 418,{
close;
}
-bat_room,148,121,1 script Flavius Officer#02b 414,{
+bat_room,148,121,1 script Flavius Officer#02b 4_M_CRU_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt
index 01119b97e..4fb84ddc3 100644
--- a/npc/battleground/kvm/kvm01.txt
+++ b/npc/battleground/kvm/kvm01.txt
@@ -19,7 +19,7 @@
// Waiting Room NPCs
//============================================================
-bat_room,169,226,5 script KVM Waiting Room#a::KvM01R_Guillaume 418,{
+bat_room,169,226,5 script KVM Waiting Room#a::KvM01R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
@@ -33,7 +33,7 @@ OnEnterBG:
bat_room,169,220,0 warp #kvm801 2,2,bat_room,154,150
-bat_room,169,205,3 script KVM Waiting Room#b::KvM01R_Croix 414,{
+bat_room,169,205,3 script KVM Waiting Room#b::KvM01R_Croix 4_M_CRU_KNT,{
end;
OnInit:
@@ -61,23 +61,23 @@ OnKvM01Two:
end;
}
-bat_c01,54,124,3 duplicate(CellEffect) #RedcellA1-1 139
-bat_c01,55,124,3 duplicate(CellEffect) #RedcellA2-1 139
-bat_c01,56,124,3 duplicate(CellEffect) #RedcellA3-1 139
-bat_c01,57,124,3 duplicate(CellEffect) #RedcellA4-1 139
-bat_c01,57,125,3 duplicate(CellEffect) #RedcellA5-1 139
-bat_c01,57,126,3 duplicate(CellEffect) #RedcellA6-1 139
-bat_c01,57,127,3 duplicate(CellEffect) #RedcellA7-1 139
+bat_c01,54,124,3 duplicate(CellEffect) #RedcellA1-1 HIDDEN_WARP_NPC
+bat_c01,55,124,3 duplicate(CellEffect) #RedcellA2-1 HIDDEN_WARP_NPC
+bat_c01,56,124,3 duplicate(CellEffect) #RedcellA3-1 HIDDEN_WARP_NPC
+bat_c01,57,124,3 duplicate(CellEffect) #RedcellA4-1 HIDDEN_WARP_NPC
+bat_c01,57,125,3 duplicate(CellEffect) #RedcellA5-1 HIDDEN_WARP_NPC
+bat_c01,57,126,3 duplicate(CellEffect) #RedcellA6-1 HIDDEN_WARP_NPC
+bat_c01,57,127,3 duplicate(CellEffect) #RedcellA7-1 HIDDEN_WARP_NPC
-bat_c01,145,59,3 duplicate(CellEffect) #RedcellB1-1 139
-bat_c01,144,59,3 duplicate(CellEffect) #RedcellB2-1 139
-bat_c01,143,59,3 duplicate(CellEffect) #RedcellB3-1 139
-bat_c01,142,59,3 duplicate(CellEffect) #RedcellB4-1 139
-bat_c01,142,56,3 duplicate(CellEffect) #RedcellB5-1 139
-bat_c01,142,57,3 duplicate(CellEffect) #RedcellB6-1 139
-bat_c01,142,58,3 duplicate(CellEffect) #RedcellB7-1 139
+bat_c01,145,59,3 duplicate(CellEffect) #RedcellB1-1 HIDDEN_WARP_NPC
+bat_c01,144,59,3 duplicate(CellEffect) #RedcellB2-1 HIDDEN_WARP_NPC
+bat_c01,143,59,3 duplicate(CellEffect) #RedcellB3-1 HIDDEN_WARP_NPC
+bat_c01,142,59,3 duplicate(CellEffect) #RedcellB4-1 HIDDEN_WARP_NPC
+bat_c01,142,56,3 duplicate(CellEffect) #RedcellB5-1 HIDDEN_WARP_NPC
+bat_c01,142,57,3 duplicate(CellEffect) #RedcellB6-1 HIDDEN_WARP_NPC
+bat_c01,142,58,3 duplicate(CellEffect) #RedcellB7-1 HIDDEN_WARP_NPC
-bat_c01,54,128,3 script #A_camp_start01 139,4,4,{
+bat_c01,54,128,3 script #A_camp_start01 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -98,7 +98,7 @@ OnTouch:
end;
}
-bat_c01,146,56,3 script #B_camp_start01 139,4,4,{
+bat_c01,146,56,3 script #B_camp_start01 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -369,7 +369,7 @@ OnTimer60000:
// Battleground rewards
//============================================================
-bat_c01,51,130,5 script KVM Officer#KVM01A 419,{
+bat_c01,51,130,5 script KVM Officer#KVM01A 4_M_KY_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM01BG_Victory == Bat_Team )
@@ -398,7 +398,7 @@ bat_c01,51,130,5 script KVM Officer#KVM01A 419,{
end;
}
-bat_c01,148,53,1 script KVM Officer#KVM01B 415,{
+bat_c01,148,53,1 script KVM Officer#KVM01B 4_M_CRU_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM01BG_Victory == Bat_Team )
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index bb5991b1c..33982a2c5 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -21,7 +21,7 @@
// Waiting Room NPCs
//============================================================
-bat_room,197,226,5 script KVM Waiting Room#a2::KvM02R_Guillaume 418,{
+bat_room,197,226,5 script KVM Waiting Room#a2::KvM02R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
@@ -35,7 +35,7 @@ OnEnterBG:
bat_room,197,220,0 warp #kvm601 2,2,bat_room,154,150
-bat_room,197,205,3 script KVM Waiting Room#b2::KvM02R_Croix 414,{
+bat_room,197,205,3 script KVM Waiting Room#b2::KvM02R_Croix 4_M_CRU_KNT,{
end;
OnInit:
@@ -63,23 +63,23 @@ OnKvM02Two:
end;
}
-bat_c02,54,124,3 duplicate(CellEffect2) #RedcellA1-2 139
-bat_c02,55,124,3 duplicate(CellEffect2) #RedcellA2-2 139
-bat_c02,56,124,3 duplicate(CellEffect2) #RedcellA3-2 139
-bat_c02,57,124,3 duplicate(CellEffect2) #RedcellA4-2 139
-bat_c02,57,125,3 duplicate(CellEffect2) #RedcellA5-2 139
-bat_c02,57,126,3 duplicate(CellEffect2) #RedcellA6-2 139
-bat_c02,57,127,3 duplicate(CellEffect2) #RedcellA7-2 139
+bat_c02,54,124,3 duplicate(CellEffect2) #RedcellA1-2 HIDDEN_WARP_NPC
+bat_c02,55,124,3 duplicate(CellEffect2) #RedcellA2-2 HIDDEN_WARP_NPC
+bat_c02,56,124,3 duplicate(CellEffect2) #RedcellA3-2 HIDDEN_WARP_NPC
+bat_c02,57,124,3 duplicate(CellEffect2) #RedcellA4-2 HIDDEN_WARP_NPC
+bat_c02,57,125,3 duplicate(CellEffect2) #RedcellA5-2 HIDDEN_WARP_NPC
+bat_c02,57,126,3 duplicate(CellEffect2) #RedcellA6-2 HIDDEN_WARP_NPC
+bat_c02,57,127,3 duplicate(CellEffect2) #RedcellA7-2 HIDDEN_WARP_NPC
-bat_c02,145,59,3 duplicate(CellEffect2) #RedcellB1-2 139
-bat_c02,144,59,3 duplicate(CellEffect2) #RedcellB2-2 139
-bat_c02,143,59,3 duplicate(CellEffect2) #RedcellB3-2 139
-bat_c02,142,59,3 duplicate(CellEffect2) #RedcellB4-2 139
-bat_c02,142,56,3 duplicate(CellEffect2) #RedcellB5-2 139
-bat_c02,142,57,3 duplicate(CellEffect2) #RedcellB6-2 139
-bat_c02,142,58,3 duplicate(CellEffect2) #RedcellB7-2 139
+bat_c02,145,59,3 duplicate(CellEffect2) #RedcellB1-2 HIDDEN_WARP_NPC
+bat_c02,144,59,3 duplicate(CellEffect2) #RedcellB2-2 HIDDEN_WARP_NPC
+bat_c02,143,59,3 duplicate(CellEffect2) #RedcellB3-2 HIDDEN_WARP_NPC
+bat_c02,142,59,3 duplicate(CellEffect2) #RedcellB4-2 HIDDEN_WARP_NPC
+bat_c02,142,56,3 duplicate(CellEffect2) #RedcellB5-2 HIDDEN_WARP_NPC
+bat_c02,142,57,3 duplicate(CellEffect2) #RedcellB6-2 HIDDEN_WARP_NPC
+bat_c02,142,58,3 duplicate(CellEffect2) #RedcellB7-2 HIDDEN_WARP_NPC
-bat_c02,54,128,3 script #A_camp_start02 139,4,4,{
+bat_c02,54,128,3 script #A_camp_start02 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -100,7 +100,7 @@ OnTouch:
end;
}
-bat_c02,146,56,3 script #B_camp_start02 139,4,4,{
+bat_c02,146,56,3 script #B_camp_start02 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -371,7 +371,7 @@ OnTimer60000:
// Battleground rewards
//============================================================
-bat_c02,51,130,5 script KVM Officer#KVM02A 419,{
+bat_c02,51,130,5 script KVM Officer#KVM02A 4_M_KY_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM02BG_Victory == Bat_Team )
@@ -399,7 +399,7 @@ bat_c02,51,130,5 script KVM Officer#KVM02A 419,{
end;
}
-bat_c02,148,53,1 script KVM Officer#KVM02B 415,{
+bat_c02,148,53,1 script KVM Officer#KVM02B 4_M_CRU_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM02BG_Victory == Bat_Team )
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index 20abbdeb6..6866a7147 100644
--- a/npc/battleground/kvm/kvm03.txt
+++ b/npc/battleground/kvm/kvm03.txt
@@ -20,7 +20,7 @@
// Waiting Room NPCs
//============================================================
-bat_room,225,226,5 script KVM Waiting Room#a3::KvM03R_Guillaume 418,{
+bat_room,225,226,5 script KVM Waiting Room#a3::KvM03R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
@@ -34,7 +34,7 @@ OnEnterBG:
bat_room,225,220,0 warp #kvm701 2,2,bat_room,154,150
-bat_room,225,205,3 script KVM Waiting Room#b3::KvM03R_Croix 414,{
+bat_room,225,205,3 script KVM Waiting Room#b3::KvM03R_Croix 4_M_CRU_KNT,{
end;
OnInit:
@@ -62,23 +62,23 @@ OnKvM03Two:
end;
}
-bat_c03,54,124,3 duplicate(CellEffect3) #RedcellA1-3 139
-bat_c03,55,124,3 duplicate(CellEffect3) #RedcellA2-3 139
-bat_c03,56,124,3 duplicate(CellEffect3) #RedcellA3-3 139
-bat_c03,57,124,3 duplicate(CellEffect3) #RedcellA4-3 139
-bat_c03,57,125,3 duplicate(CellEffect3) #RedcellA5-3 139
-bat_c03,57,126,3 duplicate(CellEffect3) #RedcellA6-3 139
-bat_c03,57,127,3 duplicate(CellEffect3) #RedcellA7-3 139
+bat_c03,54,124,3 duplicate(CellEffect3) #RedcellA1-3 HIDDEN_WARP_NPC
+bat_c03,55,124,3 duplicate(CellEffect3) #RedcellA2-3 HIDDEN_WARP_NPC
+bat_c03,56,124,3 duplicate(CellEffect3) #RedcellA3-3 HIDDEN_WARP_NPC
+bat_c03,57,124,3 duplicate(CellEffect3) #RedcellA4-3 HIDDEN_WARP_NPC
+bat_c03,57,125,3 duplicate(CellEffect3) #RedcellA5-3 HIDDEN_WARP_NPC
+bat_c03,57,126,3 duplicate(CellEffect3) #RedcellA6-3 HIDDEN_WARP_NPC
+bat_c03,57,127,3 duplicate(CellEffect3) #RedcellA7-3 HIDDEN_WARP_NPC
-bat_c03,145,59,3 duplicate(CellEffect3) #RedcellB1-3 139
-bat_c03,144,59,3 duplicate(CellEffect3) #RedcellB2-3 139
-bat_c03,143,59,3 duplicate(CellEffect3) #RedcellB3-3 139
-bat_c03,142,59,3 duplicate(CellEffect3) #RedcellB4-3 139
-bat_c03,142,56,3 duplicate(CellEffect3) #RedcellB5-3 139
-bat_c03,142,57,3 duplicate(CellEffect3) #RedcellB6-3 139
-bat_c03,142,58,3 duplicate(CellEffect3) #RedcellB7-3 139
+bat_c03,145,59,3 duplicate(CellEffect3) #RedcellB1-3 HIDDEN_WARP_NPC
+bat_c03,144,59,3 duplicate(CellEffect3) #RedcellB2-3 HIDDEN_WARP_NPC
+bat_c03,143,59,3 duplicate(CellEffect3) #RedcellB3-3 HIDDEN_WARP_NPC
+bat_c03,142,59,3 duplicate(CellEffect3) #RedcellB4-3 HIDDEN_WARP_NPC
+bat_c03,142,56,3 duplicate(CellEffect3) #RedcellB5-3 HIDDEN_WARP_NPC
+bat_c03,142,57,3 duplicate(CellEffect3) #RedcellB6-3 HIDDEN_WARP_NPC
+bat_c03,142,58,3 duplicate(CellEffect3) #RedcellB7-3 HIDDEN_WARP_NPC
-bat_c03,54,128,3 script #A_camp_start03 139,4,4,{
+bat_c03,54,128,3 script #A_camp_start03 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -99,7 +99,7 @@ OnTouch:
end;
}
-bat_c03,146,56,3 script #B_camp_start03 139,4,4,{
+bat_c03,146,56,3 script #B_camp_start03 HIDDEN_WARP_NPC,4,4,{
end;
OnInit:
@@ -370,7 +370,7 @@ OnTimer60000:
// Battleground rewards
//============================================================
-bat_c03,51,130,5 script KVM Officer#KVM03A 419,{
+bat_c03,51,130,5 script KVM Officer#KVM03A 4_M_KY_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM03BG_Victory == Bat_Team )
@@ -399,7 +399,7 @@ bat_c03,51,130,5 script KVM Officer#KVM03A 419,{
end;
}
-bat_c03,148,53,1 script KVM Officer#KVM03B 415,{
+bat_c03,148,53,1 script KVM Officer#KVM03B 4_M_CRU_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM03BG_Victory == Bat_Team )
diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt
index f1d3128a3..1b5e9062c 100644
--- a/npc/battleground/kvm/kvm_enter.txt
+++ b/npc/battleground/kvm/kvm_enter.txt
@@ -17,7 +17,7 @@
// KvM Officer - Guillaume
//============================================================
-bat_room,164,178,5 script KVM Mercenary Officer#1 418,{
+bat_room,164,178,5 script KVM Mercenary Officer#1 4_M_KY_KNT,{
/*
set .@kvm,checkquest(6026,PLAYTIME);
if ((.@kvm == 0) || (.@kvm == 1)) {
@@ -57,7 +57,7 @@ bat_room,164,178,5 script KVM Mercenary Officer#1 418,{
// Guillaume Knight - KvM
//============================================================
-bat_room,167,178,5 script Guillaume Knight#kvm 417,{
+bat_room,167,178,5 script Guillaume Knight#kvm 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "Hello.";
mes "What do you want to know?";
@@ -117,7 +117,7 @@ bat_room,167,178,5 script Guillaume Knight#kvm 417,{
// KvM Officer - Croix
//============================================================
-bat_room,164,121,1 script KVM Mercenary Officer#2 414,{
+bat_room,164,121,1 script KVM Mercenary Officer#2 4_M_CRU_KNT,{
/*
set .@kvm,checkquest(6025,PLAYTIME);
if ((.@kvm == 0) || (.@kvm == 1)) {
@@ -157,7 +157,7 @@ bat_room,164,121,1 script KVM Mercenary Officer#2 414,{
// Croix Knight - KvM
//============================================================
-bat_room,167,121,1 script Croix Knight#kvm 413,{
+bat_room,167,121,1 script Croix Knight#kvm 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "Hello.";
mes "What do you want to know?";
diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt
index 6ddb5b3f8..92d3032e5 100644
--- a/npc/battleground/kvm/kvm_item_pay.txt
+++ b/npc/battleground/kvm/kvm_item_pay.txt
@@ -16,7 +16,7 @@
//= 1.0 First Version.
//============================================================
-bat_room,151,144,3 script KVM Logistic Officer#a 734,{
+bat_room,151,144,3 script KVM Logistic Officer#a 4_M_JOB_KNIGHT2,{
if (countitem(7773)) {
set .@pointstoadd,countitem(7773);
delitem 7773,.@pointstoadd;
diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index edb2f3c91..5daa6429f 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -20,7 +20,7 @@
// Waiting Room NPCs
//============================================================
-bat_room,57,227,5 script Lieutenant Kalos 418,{
+bat_room,57,227,5 script Lieutenant Kalos 4_M_KY_KNT,{
end;
OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
end;
}
-bat_room,58,204,1 script Lieutenant Eyor 414,{
+bat_room,58,204,1 script Lieutenant Eyor 4_M_CRU_KNT,{
end;
OnInit:
@@ -44,7 +44,7 @@ OnEnterBG:
end;
}
-bat_room,1,151,3 script #bat_a01_timer 844,{
+bat_room,1,151,3 script #bat_a01_timer CLEAR_NPC,{
end;
OnInit:
@@ -92,7 +92,7 @@ bat_room,57,211,0 warp back_bgrooma01b 1,1,bat_room,154,150
// Tierra Gorge Battleground Engine
//============================================================
-bat_a01,15,15,3 script start#bat_a01 844,{
+bat_a01,15,15,3 script start#bat_a01 CLEAR_NPC,{
OnInit:
mapwarp "bat_a01","bat_room",154,150;
end;
@@ -150,7 +150,7 @@ OnTimer10000:
end;
}
-bat_a01,15,16,3 script OBJ#bat_a01_a 844,{
+bat_a01,15,16,3 script OBJ#bat_a01_a CLEAR_NPC,{
OnEnable:
bg_monster $@TierraBG1_id1,"bat_a01",177,345,"Food Storage",1909,"OBJ#bat_a01_a::OnMyMobDead";
end;
@@ -173,7 +173,7 @@ OnMyMobDead:
end;
}
-bat_a01,15,17,3 script OBJ#bat_a01_b 844,{
+bat_a01,15,17,3 script OBJ#bat_a01_b CLEAR_NPC,{
OnEnable:
bg_monster $@TierraBG1_id2,"bat_a01",167,50,"Food Depot",1910,"OBJ#bat_a01_b::OnMyMobDead";
end;
@@ -196,7 +196,7 @@ OnMyMobDead:
end;
}
-bat_a01,15,18,3 script barricade#bat_a01_a 844,{
+bat_a01,15,18,3 script barricade#bat_a01_a CLEAR_NPC,{
OnEnable:
for( set .@i,185; .@i < 202; set .@i,.@i+1 )
bg_monster $@TierraBG1_id1,"bat_a01",.@i,266,"Barricade",1906,"barricade#bat_a01_a::OnMyMobDead";
@@ -218,7 +218,7 @@ OnMyMobDead:
end;
}
-bat_a01,15,19,3 script barricade#bat_a01_b 844,{
+bat_a01,15,19,3 script barricade#bat_a01_b CLEAR_NPC,{
OnEnable:
for( set .@i,169; .@i < 186; set .@i,.@i+1 )
bg_monster $@TierraBG1_id2,"bat_a01",.@i,129,"Barricade",1906,"barricade#bat_a01_b::OnMyMobDead";
@@ -240,7 +240,7 @@ OnMyMobDead:
end;
}
-bat_a01,15,20,3 script OBJ#bat_a01_n 844,{
+bat_a01,15,20,3 script OBJ#bat_a01_n CLEAR_NPC,{
OnEnable:
monster "bat_a01",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a01_n::OnMyMobDead";
end;
@@ -264,7 +264,7 @@ OnMyMobDead:
end;
}
-bat_a01,15,21,3 script NOBJ_mob#bat_a01_a 844,{
+bat_a01,15,21,3 script NOBJ_mob#bat_a01_a CLEAR_NPC,{
OnEnable:
donpcevent "NOBJ_mob#bat_a01_b::OnKill";
bg_monster $@TierraBG1_id1,"bat_a01",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
@@ -280,7 +280,7 @@ OnMyMobDead:
end;
}
-bat_a01,15,22,3 script NOBJ_mob#bat_a01_b 844,{
+bat_a01,15,22,3 script NOBJ_mob#bat_a01_b CLEAR_NPC,{
OnEnable:
donpcevent "NOBJ_mob#bat_a01_a::OnKill";
bg_monster $@TierraBG1_id2,"bat_a01",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a01_a::OnMyMobDead";
@@ -296,7 +296,7 @@ OnMyMobDead:
end;
}
-bat_a01,185,270,1 script Guillaume Blacksmith#a01 851,{
+bat_a01,185,270,1 script Guillaume Blacksmith#a01 4_M_REPAIR,{
if (getcharid(4) == $@TierraBG1_id1) {
mes "[Guillaume Blacksmith]";
mes "We are in urgency! The Barricade has been destroyed!";
@@ -380,7 +380,7 @@ OnInit:
end;
}
-bat_a01,170,121,5 script Croix Blacksmith#bat_a01 851,{
+bat_a01,170,121,5 script Croix Blacksmith#bat_a01 4_M_REPAIR,{
if (getcharid(4) == $@TierraBG1_id2) {
mes "[Croix Blacksmith]";
mes "We are in urgency! The Barricade has been destroyed!";
@@ -464,7 +464,7 @@ OnInit:
end;
}
-bat_a01,53,377,3 script Battle Therapist#a01_a 95,{
+bat_a01,53,377,3 script Battle Therapist#a01_a 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -514,7 +514,7 @@ OnTouch_:
end;
}
-bat_a01,45,19,3 script Battle Therapist#a01_b 95,{
+bat_a01,45,19,3 script Battle Therapist#a01_b 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -564,7 +564,7 @@ OnTouch:
end;
}
-bat_a01,60,216,3 script Valley Ghost#bat_a01_n 950,{
+bat_a01,60,216,3 script Valley Ghost#bat_a01_n 4_GHOSTRING,{
specialeffect2 EF_HEAL;
mes "[Valley Ghost]";
mes "Boo...Boo...";
@@ -648,39 +648,39 @@ OnTouch:
end;
}
-bat_a01,169,227,0 script underladd#bat_a01_1 45,1,1,{
+bat_a01,169,227,0 script underladd#bat_a01_1 WARPNPC,1,1,{
OnTouch_:
warp "bat_a01",178,228;
end;
}
-bat_a01,208,164,0 script underladd#bat_a01_2 45,1,1,{
+bat_a01,208,164,0 script underladd#bat_a01_2 WARPNPC,1,1,{
OnTouch_:
warp "bat_a01",200,171;
end;
}
-bat_a01,171,309,3 script Guillaume Camp#flag1 973,{ end; }
-bat_a01,149,310,3 script Guillaume Camp#flag2 973,{ end; }
-bat_a01,119,336,3 script Guillaume Camp#flag3 973,{ end; }
-bat_a01,118,357,3 script Guillaume Camp#flag4 973,{ end; }
-bat_a01,150,380,3 script Guillaume Camp#flag5 973,{ end; }
-bat_a01,173,380,3 script Guillaume Camp#flag6 973,{ end; }
-bat_a01,210,344,3 script Guillaume Camp#flag7 973,{ end; }
-bat_a01,350,325,3 script Guillaume Camp#flag8 973,{ end; }
-bat_a01,358,325,3 script Guillaume Camp#flag9 973,{ end; }
-
-bat_a01,138,12,3 script Croix Camp#flag1 974,{ end; }
-bat_a01,108,36,3 script Croix Camp#flag2 974,{ end; }
-bat_a01,108,63,3 script Croix Camp#flag3 974,{ end; }
-bat_a01,136,87,3 script Croix Camp#flag4 974,{ end; }
-bat_a01,167,86,3 script Croix Camp#flag5 974,{ end; }
-bat_a01,199,49,3 script Croix Camp#flag6 974,{ end; }
-bat_a01,168,16,3 script Croix Camp#flag7 974,{ end; }
-bat_a01,357,74,3 script Croix Camp#flag8 974,{ end; }
-bat_a01,348,74,3 script Croix Camp#flag9 974,{ end; }
-
-bat_a01,53,377,3 script Guillaume Vintenar#a01_a 419,{
+bat_a01,171,309,3 script Guillaume Camp#flag1 1_FLAG_LION,{ end; }
+bat_a01,149,310,3 script Guillaume Camp#flag2 1_FLAG_LION,{ end; }
+bat_a01,119,336,3 script Guillaume Camp#flag3 1_FLAG_LION,{ end; }
+bat_a01,118,357,3 script Guillaume Camp#flag4 1_FLAG_LION,{ end; }
+bat_a01,150,380,3 script Guillaume Camp#flag5 1_FLAG_LION,{ end; }
+bat_a01,173,380,3 script Guillaume Camp#flag6 1_FLAG_LION,{ end; }
+bat_a01,210,344,3 script Guillaume Camp#flag7 1_FLAG_LION,{ end; }
+bat_a01,350,325,3 script Guillaume Camp#flag8 1_FLAG_LION,{ end; }
+bat_a01,358,325,3 script Guillaume Camp#flag9 1_FLAG_LION,{ end; }
+
+bat_a01,138,12,3 script Croix Camp#flag1 1_FLAG_EAGLE,{ end; }
+bat_a01,108,36,3 script Croix Camp#flag2 1_FLAG_EAGLE,{ end; }
+bat_a01,108,63,3 script Croix Camp#flag3 1_FLAG_EAGLE,{ end; }
+bat_a01,136,87,3 script Croix Camp#flag4 1_FLAG_EAGLE,{ end; }
+bat_a01,167,86,3 script Croix Camp#flag5 1_FLAG_EAGLE,{ end; }
+bat_a01,199,49,3 script Croix Camp#flag6 1_FLAG_EAGLE,{ end; }
+bat_a01,168,16,3 script Croix Camp#flag7 1_FLAG_EAGLE,{ end; }
+bat_a01,357,74,3 script Croix Camp#flag8 1_FLAG_EAGLE,{ end; }
+bat_a01,348,74,3 script Croix Camp#flag9 1_FLAG_EAGLE,{ end; }
+
+bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{
if (getcharid(4) == $@TierraBG1_id1) {
if ($@TierraBG1_Victory == 1) {
set .@your_medal,countitem(7828);
@@ -774,7 +774,7 @@ OnInit:
end;
}
-bat_a01,45,19,3 script Croix Vintenar#a01_b 415,{
+bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{
if (getcharid(4) == $@TierraBG1_id2) {
if ($@TierraBG1_Victory == 2) {
set .@your_medal,countitem(7828);
@@ -868,7 +868,7 @@ OnInit:
end;
}
-bat_a01,1,5,3 script countdown#bat_a01 844,{
+bat_a01,1,5,3 script countdown#bat_a01 CLEAR_NPC,{
OnEnable:
initnpctimer;
end;
@@ -912,18 +912,18 @@ OnTimer1830000:
}
/*
-bat_a01,351,75,3 script Croix Camp Soldier#bat_a01_guide 934,{
+bat_a01,351,75,3 script Croix Camp Soldier#bat_a01_guide 4_M_RASWORD,{
mes "Loading...";
close;
}
-bat_a01,356,326,3 script Guillaume Camp Soldier#bat_a01_guide 934,{
+bat_a01,356,326,3 script Guillaume Camp Soldier#bat_a01_guide 4_M_RASWORD,{
mes "Loading...";
close;
}
*/
-bat_a01,1,1,3 script Release all#a01 81,{
+bat_a01,1,1,3 script Release all#a01 4_DOG01,{
set .@i, callfunc("F_GM_NPC",1854,0);
if (.@i == -1) {
mes "Cancelled.";
diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt
index 008944955..05c6eaa0d 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -19,7 +19,7 @@
// Waiting Room NPCs
//============================================================
-bat_room,114,227,5 script Lieutenant Rundel 418,{
+bat_room,114,227,5 script Lieutenant Rundel 4_M_KY_KNT,{
end;
OnInit:
@@ -31,7 +31,7 @@ OnEnterBG:
end;
}
-bat_room,114,204,1 script Lieutenant Guerrit 414,{
+bat_room,114,204,1 script Lieutenant Guerrit 4_M_CRU_KNT,{
end;
OnInit:
@@ -43,7 +43,7 @@ OnEnterBG:
end;
}
-bat_room,1,151,3 script #bat_a02_timer 844,{
+bat_room,1,151,3 script #bat_a02_timer CLEAR_NPC,{
end;
OnInit:
@@ -91,7 +91,7 @@ bat_room,113,211,0 warp back_bgrooma02b 1,1,bat_room,154,150
// Tierra Gorge Battleground Engine
//============================================================
-bat_a02,15,15,3 script start#bat_a02 844,{
+bat_a02,15,15,3 script start#bat_a02 CLEAR_NPC,{
OnInit:
mapwarp "bat_a02","bat_room",154,150;
end;
@@ -149,7 +149,7 @@ OnTimer10000:
end;
}
-bat_a02,15,16,3 script OBJ#bat_a02_a 844,{
+bat_a02,15,16,3 script OBJ#bat_a02_a CLEAR_NPC,{
OnEnable:
bg_monster $@TierraBG2_id1,"bat_a02",177,345,"Food Storage",1909,"OBJ#bat_a02_a::OnMyMobDead";
end;
@@ -172,7 +172,7 @@ OnMyMobDead:
end;
}
-bat_a02,15,17,3 script OBJ#bat_a02_b 844,{
+bat_a02,15,17,3 script OBJ#bat_a02_b CLEAR_NPC,{
OnEnable:
bg_monster $@TierraBG2_id2,"bat_a02",167,50,"Food Depot",1910,"OBJ#bat_a02_b::OnMyMobDead";
end;
@@ -195,7 +195,7 @@ OnMyMobDead:
end;
}
-bat_a02,15,18,3 script barricade#bat_a02_a 844,{
+bat_a02,15,18,3 script barricade#bat_a02_a CLEAR_NPC,{
OnEnable:
for( set .@i,185; .@i < 202; set .@i,.@i+1 )
bg_monster $@TierraBG2_id1,"bat_a02",.@i,266,"Barricade",1906,"barricade#bat_a02_a::OnMyMobDead";
@@ -217,7 +217,7 @@ OnMyMobDead:
end;
}
-bat_a02,15,19,3 script barricade#bat_a02_b 844,{
+bat_a02,15,19,3 script barricade#bat_a02_b CLEAR_NPC,{
OnEnable:
for( set .@i,169; .@i < 186; set .@i,.@i+1 )
bg_monster $@TierraBG2_id2,"bat_a02",.@i,129,"Barricade",1906,"barricade#bat_a02_b::OnMyMobDead";
@@ -239,7 +239,7 @@ OnMyMobDead:
end;
}
-bat_a02,15,20,3 script OBJ#bat_a02_n 844,{
+bat_a02,15,20,3 script OBJ#bat_a02_n CLEAR_NPC,{
OnEnable:
monster "bat_a02",273,203,"Neutrality Flag",1911,1,"OBJ#bat_a02_n::OnMyMobDead";
end;
@@ -263,7 +263,7 @@ OnMyMobDead:
end;
}
-bat_a02,15,21,3 script NOBJ_mob#bat_a02_a 844,{
+bat_a02,15,21,3 script NOBJ_mob#bat_a02_a CLEAR_NPC,{
OnEnable:
donpcevent "NOBJ_mob#bat_a02_b::OnKill";
bg_monster $@TierraBG2_id1,"bat_a02",272,204,"Guillaume Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
@@ -279,7 +279,7 @@ OnMyMobDead:
end;
}
-bat_a02,15,22,3 script NOBJ_mob#bat_a02_b 844,{
+bat_a02,15,22,3 script NOBJ_mob#bat_a02_b CLEAR_NPC,{
OnEnable:
donpcevent "NOBJ_mob#bat_a02_a::OnKill";
bg_monster $@TierraBG2_id2,"bat_a02",272,204,"Croix Camp Guardian",1949,"NOBJ_mob#bat_a02_a::OnMyMobDead";
@@ -295,7 +295,7 @@ OnMyMobDead:
end;
}
-bat_a02,185,270,1 script Guillaume Blacksmith#a02 851,{
+bat_a02,185,270,1 script Guillaume Blacksmith#a02 4_M_REPAIR,{
if (getcharid(4) == $@TierraBG2_id1) {
mes "[Guillaume Blacksmith]";
mes "We are in urgency! The Barricade has been destroyed!";
@@ -379,7 +379,7 @@ OnInit:
end;
}
-bat_a02,170,121,5 script Croix Blacksmith#bat_a02 851,{
+bat_a02,170,121,5 script Croix Blacksmith#bat_a02 4_M_REPAIR,{
if (getcharid(4) == $@TierraBG2_id2) {
mes "[Croix Blacksmith]";
mes "We are in urgency! The Barricade has been destroyed!";
@@ -463,7 +463,7 @@ OnInit:
end;
}
-bat_a02,53,377,3 script Battle Therapist#a02_a 95,{
+bat_a02,53,377,3 script Battle Therapist#a02_a 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -513,7 +513,7 @@ OnTouch_:
end;
}
-bat_a02,45,19,3 script Battle Therapist#a02_b 95,{
+bat_a02,45,19,3 script Battle Therapist#a02_b 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -563,7 +563,7 @@ OnTouch:
end;
}
-bat_a02,60,216,3 script Valley Ghost#bat_a02_n 950,{
+bat_a02,60,216,3 script Valley Ghost#bat_a02_n 4_GHOSTRING,{
specialeffect2 EF_HEAL;
mes "[Valley Ghost]";
mes "Boo...Boo...";
@@ -647,39 +647,39 @@ OnTouch:
end;
}
-bat_a02,169,227,0 script underladd#bat_a02_1 45,1,1,{
+bat_a02,169,227,0 script underladd#bat_a02_1 WARPNPC,1,1,{
OnTouch_:
warp "bat_a02",178,228;
end;
}
-bat_a02,208,164,0 script underladd#bat_a02_2 45,1,1,{
+bat_a02,208,164,0 script underladd#bat_a02_2 WARPNPC,1,1,{
OnTouch_:
warp "bat_a02",200,171;
end;
}
-bat_a02,171,309,3 script Guillaume Camp#flag11 973,{ end; }
-bat_a02,149,310,3 script Guillaume Camp#flag12 973,{ end; }
-bat_a02,119,336,3 script Guillaume Camp#flag13 973,{ end; }
-bat_a02,118,357,3 script Guillaume Camp#flag14 973,{ end; }
-bat_a02,150,380,3 script Guillaume Camp#flag15 973,{ end; }
-bat_a02,173,380,3 script Guillaume Camp#flag16 973,{ end; }
-bat_a02,210,344,3 script Guillaume Camp#flag17 973,{ end; }
-bat_a02,350,325,3 script Guillaume Camp#flag18 973,{ end; }
-bat_a02,358,325,3 script Guillaume Camp#flag19 973,{ end; }
-
-bat_a02,138,12,3 script Croix Camp#flag11 974,{ end; }
-bat_a02,108,36,3 script Croix Camp#flag12 974,{ end; }
-bat_a02,108,63,3 script Croix Camp#flag13 974,{ end; }
-bat_a02,136,87,3 script Croix Camp#flag14 974,{ end; }
-bat_a02,167,86,3 script Croix Camp#flag15 974,{ end; }
-bat_a02,199,49,3 script Croix Camp#flag16 974,{ end; }
-bat_a02,168,16,3 script Croix Camp#flag17 974,{ end; }
-bat_a02,357,74,3 script Croix Camp#flag18 974,{ end; }
-bat_a02,348,74,3 script Croix Camp#flag19 974,{ end; }
-
-bat_a02,53,377,3 script Guillaume Vintenar#a02_a 419,{
+bat_a02,171,309,3 script Guillaume Camp#flag11 1_FLAG_LION,{ end; }
+bat_a02,149,310,3 script Guillaume Camp#flag12 1_FLAG_LION,{ end; }
+bat_a02,119,336,3 script Guillaume Camp#flag13 1_FLAG_LION,{ end; }
+bat_a02,118,357,3 script Guillaume Camp#flag14 1_FLAG_LION,{ end; }
+bat_a02,150,380,3 script Guillaume Camp#flag15 1_FLAG_LION,{ end; }
+bat_a02,173,380,3 script Guillaume Camp#flag16 1_FLAG_LION,{ end; }
+bat_a02,210,344,3 script Guillaume Camp#flag17 1_FLAG_LION,{ end; }
+bat_a02,350,325,3 script Guillaume Camp#flag18 1_FLAG_LION,{ end; }
+bat_a02,358,325,3 script Guillaume Camp#flag19 1_FLAG_LION,{ end; }
+
+bat_a02,138,12,3 script Croix Camp#flag11 1_FLAG_EAGLE,{ end; }
+bat_a02,108,36,3 script Croix Camp#flag12 1_FLAG_EAGLE,{ end; }
+bat_a02,108,63,3 script Croix Camp#flag13 1_FLAG_EAGLE,{ end; }
+bat_a02,136,87,3 script Croix Camp#flag14 1_FLAG_EAGLE,{ end; }
+bat_a02,167,86,3 script Croix Camp#flag15 1_FLAG_EAGLE,{ end; }
+bat_a02,199,49,3 script Croix Camp#flag16 1_FLAG_EAGLE,{ end; }
+bat_a02,168,16,3 script Croix Camp#flag17 1_FLAG_EAGLE,{ end; }
+bat_a02,357,74,3 script Croix Camp#flag18 1_FLAG_EAGLE,{ end; }
+bat_a02,348,74,3 script Croix Camp#flag19 1_FLAG_EAGLE,{ end; }
+
+bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{
if (getcharid(4) == $@TierraBG2_id1) {
if ($@TierraBG2_Victory == 1) {
set .@your_medal,countitem(7828);
@@ -773,7 +773,7 @@ OnInit:
end;
}
-bat_a02,45,19,3 script Croix Vintenar#a02_b 415,{
+bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{
if (getcharid(4) == $@TierraBG2_id2) {
if ($@TierraBG2_Victory == 2) {
set .@your_medal,countitem(7828);
@@ -867,7 +867,7 @@ OnInit:
end;
}
-bat_a02,1,5,3 script countdown#bat_a02 844,{
+bat_a02,1,5,3 script countdown#bat_a02 CLEAR_NPC,{
OnEnable:
initnpctimer;
end;
@@ -911,18 +911,18 @@ OnTimer1830000:
}
/*
-bat_a02,351,75,3 script Croix Camp Soldier#bat_a02_guide 934,{
+bat_a02,351,75,3 script Croix Camp Soldier#bat_a02_guide 4_M_RASWORD,{
mes "Loading...";
close;
}
-bat_a02,356,326,3 script Guillaume Camp Soldier#bat_a02_guide 934,{
+bat_a02,356,326,3 script Guillaume Camp Soldier#bat_a02_guide 4_M_RASWORD,{
mes "Loading...";
close;
}
*/
-bat_a02,1,1,3 script Release all#a02 81,{
+bat_a02,1,1,3 script Release all#a02 4_DOG01,{
set .@i, callfunc("F_GM_NPC",1854,0);
if (.@i == -1) {
mes "Cancelled.";
diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt
index 0262f9fcd..9089017a0 100644
--- a/npc/battleground/tierra/tierra_enter.txt
+++ b/npc/battleground/tierra/tierra_enter.txt
@@ -14,7 +14,7 @@
// First Tierra Gorge Officers - Guillaume
//============================================================
-bat_room,124,178,5 script Tierra Gorge Officer#01a 418,{
+bat_room,124,178,5 script Tierra Gorge Officer#01a 4_M_KY_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -81,7 +81,7 @@ bat_room,124,178,5 script Tierra Gorge Officer#01a 418,{
close;
}
-bat_room,140,178,5 script Tierra Gorge Officer#02a 418,{
+bat_room,140,178,5 script Tierra Gorge Officer#02a 4_M_KY_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -148,7 +148,7 @@ bat_room,140,178,5 script Tierra Gorge Officer#02a 418,{
close;
}
-bat_room,127,178,5 script Guillaume Knight#1 417,{
+bat_room,127,178,5 script Guillaume Knight#1 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
next;
@@ -172,7 +172,7 @@ bat_room,127,178,5 script Guillaume Knight#1 417,{
close;
}
-bat_room,143,178,5 script Guillaume Knight#2 417,{
+bat_room,143,178,5 script Guillaume Knight#2 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
next;
@@ -196,7 +196,7 @@ bat_room,143,178,5 script Guillaume Knight#2 417,{
close;
}
-bat_room,127,121,1 script Croix Knight#1 413,{
+bat_room,127,121,1 script Croix Knight#1 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
next;
@@ -220,7 +220,7 @@ bat_room,127,121,1 script Croix Knight#1 413,{
close;
}
-bat_room,143,121,1 script Croix Knight#2 413,{
+bat_room,143,121,1 script Croix Knight#2 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "Tierra Gorge consists of two steep sides placed vertically, and has ration depots for the Guillaume and Croix Armies at the 11 and 7 o'clock directions.";
next;
@@ -246,7 +246,7 @@ bat_room,143,121,1 script Croix Knight#2 413,{
// Second Tierra Gorge Officers - Croix
//============================================================
-bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{
+bat_room,125,121,1 script Tierra Gorge Officer#01b 4_M_CRU_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -313,7 +313,7 @@ bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{
close;
}
-bat_room,140,121,1 script Tierra Gorge Officer#02b 414,{
+bat_room,140,121,1 script Tierra Gorge Officer#02b 4_M_CRU_KNT,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index dff5abf61..0fb5ce2f2 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -17,7 +17,7 @@
//= 1.6 Added Izlude RE coordinates. [Euphy]
//============================================================
-alberta,97,51,0 script Fabian 84,{
+alberta,97,51,0 script Fabian 4_M_02,{
mes "[Fabian]";
mes "Man... When you travel all around the world, you'll hear of some crazy things.";
next;
@@ -32,7 +32,7 @@ alberta,97,51,0 script Fabian 84,{
close;
}
-alberta,53,39,0 script Steiner 100,{
+alberta,53,39,0 script Steiner 4W_SAILOR,{
mes "[Steiner]";
mes "Oh...!";
mes "Welcome to Alberta,";
@@ -46,7 +46,7 @@ alberta,53,39,0 script Steiner 100,{
close;
}
-alberta,20,183,0 script Chad 49,{
+alberta,20,183,0 script Chad 1_M_03,{
mes "[Chad]";
mes "People say the legendary weapon Gungnir never misses its target. I wonder if it's possibly true...";
next;
@@ -61,7 +61,7 @@ alberta,20,183,0 script Chad 49,{
close;
}
-alberta,131,139,2 script Drunken Old Man 54,{
+alberta,131,139,2 script Drunken Old Man 1_M_JOBGUIDER,{
mes "[Deagle]";
mes "^666666*Hiccup*^000000";
mes "Wh-what are you";
@@ -108,7 +108,7 @@ alberta,131,139,2 script Drunken Old Man 54,{
}
}
-alberta,58,80,2 script Shakir 99,{
+alberta,58,80,2 script Shakir 4W_M_03,{
mes "[Shakir]";
if (rand(2)) {
mes "We Merchants have our own negotiating skill when we sell goods. This skill can get us more money than when other people sell goods.";
@@ -135,7 +135,7 @@ alberta,58,80,2 script Shakir 99,{
close;
}
-alberta,62,156,2 script Sonya 102,{
+alberta,62,156,2 script Sonya 8_F,{
mes "[Sonya]";
switch(rand(3)){
case 0:
@@ -171,7 +171,7 @@ alberta,62,156,2 script Sonya 102,{
}
}
-alberta,93,174,2 script Grandmother Alma 103,{
+alberta,93,174,2 script Grandmother Alma 8_F_GRANDMOTHER,{
mes "[Grandmother Alma]";
mes "Some time ago,";
mes "a derelict ship";
@@ -192,7 +192,7 @@ alberta,93,174,2 script Grandmother Alma 103,{
close;
}
-alberta,189,151,5 script Fisk 100,{
+alberta,189,151,5 script Fisk 4W_SAILOR,{
mes "[Fisk]";
mes "Ahoy mate,";
mes "where'd ya";
@@ -228,7 +228,7 @@ alberta,189,151,5 script Fisk 100,{
}
}
-alb2trea,39,50,6 script Fisk#a2t 100,{
+alb2trea,39,50,6 script Fisk#a2t 4W_SAILOR,{
mes "[Fisk]";
mes "So you wanna head back to the mainland in Alberta, eh?";
next;
@@ -237,7 +237,7 @@ alb2trea,39,50,6 script Fisk#a2t 100,{
close;
}
-alberta,195,151,2 script Paul 86,{
+alberta,195,151,2 script Paul 4_M_04,{
mes "[Paul]";
mes "Good day~";
mes "Would you like";
@@ -276,7 +276,7 @@ alberta,195,151,2 script Paul 86,{
}
}
-alberta,190,173,4 script Phelix 85,{
+alberta,190,173,4 script Phelix 4_M_03,{
set .@weight,MaxWeight-Weight;
mes "[Phelix]";
if ((.@weight) < 10000) {
diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt
index e60902b74..cbd79a50b 100644
--- a/npc/cities/aldebaran.txt
+++ b/npc/cities/aldebaran.txt
@@ -31,7 +31,7 @@
// Al De Baran
//============================================================
-aldebaran,113,70,4 script Forger Munster#alde 48,{
+aldebaran,113,70,4 script Forger Munster#alde 1_M_02,{
mes "[Munster]";
mes "My family used to live in Geffen. So I guess it was natural that we studied forging and eventually became Blacksmiths. Then, we finally moved to this town,";
mes "Al De Baran.";
@@ -56,7 +56,7 @@ aldebaran,113,70,4 script Forger Munster#alde 48,{
close;
}
-aldebaran,64,104,4 script Smithing Guy#alde 55,{
+aldebaran,64,104,4 script Smithing Guy#alde 1_M_JOBTESTER,{
mes "[Quatro]";
mes "Have you heard that a famous Blacksmith moved here from Geffen?";
next;
@@ -79,7 +79,7 @@ aldebaran,64,104,4 script Smithing Guy#alde 55,{
close;
}
-aldebaran,49,93,4 script Young Man#alde 83,{
+aldebaran,49,93,4 script Young Man#alde 4_M_01,{
mes "[Miller]";
mes "Aren't level 4 weapons cool!";
mes "I can't believe such powerful";
@@ -90,7 +90,7 @@ aldebaran,49,93,4 script Young Man#alde 83,{
close;
}
-aldebaran,81,61,4 script Shell Gathering Lady#ald 101,{
+aldebaran,81,61,4 script Shell Gathering Lady#ald 4W_F_01,{
mes "[Joanne]";
mes "I enjoy gathering shells from the sea. It's really fun and relaxing~";
next;
@@ -120,7 +120,7 @@ aldebaran,81,61,4 script Shell Gathering Lady#ald 101,{
close;
}
-aldebaran,46,129,4 script Canal Guy#alde 97,{
+aldebaran,46,129,4 script Canal Guy#alde 4W_M_01,{
mes "[Panama]";
mes "Al De Baran is known world wide as the City of Canals. The waterways really add a sophisticated, romantic touch to our fair city.";
next;
@@ -142,7 +142,7 @@ aldebaran,46,129,4 script Canal Guy#alde 97,{
}
}
-aldebaran,67,154,4 script Forest Guy#alde 98,{
+aldebaran,67,154,4 script Forest Guy#alde 4W_M_02,{
mes "[Isenberg]";
mes "Mt. Mjolnir and Payon Forest.";
mes "Both of those places are tough";
@@ -181,7 +181,7 @@ aldebaran,67,154,4 script Forest Guy#alde 98,{
}
}
-aldebaran,90,170,4 script Slot Guy#alde 47,{
+aldebaran,90,170,4 script Slot Guy#alde 1_M_01,{
mes "[Epthiel]";
mes "Some weapons or armor have Slots where you can insert Cards obtained from monsters.";
next;
@@ -213,7 +213,7 @@ aldebaran,90,170,4 script Slot Guy#alde 47,{
}
}
-aldebaran,117,181,4 script Phracon Guy#alde 48,{
+aldebaran,117,181,4 script Phracon Guy#alde 1_M_02,{
mes "[Joy]";
mes "Level 1 weapons, which are the lowest grade, need a metal named ^3355FFPhracon^000000 in order to be upgraded.";
next;
@@ -242,7 +242,7 @@ aldebaran,117,181,4 script Phracon Guy#alde 48,{
}
}
-aldebaran,121,231,4 script Alchemy Guy#alde 49,{
+aldebaran,121,231,4 script Alchemy Guy#alde 1_M_03,{
mes "[Chemirre]";
mes "Alchemists, one of the 2nd Jobs, are able to create items out of several materials using knowledge from the ancient age of Al De Baran.";
next;
@@ -313,7 +313,7 @@ aldebaran,121,231,4 script Alchemy Guy#alde 49,{
}
}
-aldebaran,86,228,4 script Little Kid#alde 62,{
+aldebaran,86,228,4 script Little Kid#alde 1_M_SIZ,{
mes "[Bebe]";
mes "A while ago I went out for a walk toward Mt. Mjolnir with my pet Savage Bebe. His name is NukNuk!";
mes "We got attacked, but luckily we weren't hurt.";
@@ -347,7 +347,7 @@ aldebaran,86,228,4 script Little Kid#alde 62,{
}
}
-aldebaran,159,242,4 script Insect Guy#alde 119,{
+aldebaran,159,242,4 script Insect Guy#alde 2_M_SWORDMASTER,{
mes "[Stromme]";
mes "Even to a strong Swordman, the Insects or Mt. Mjolnir pose a considerable threat. You've got to know your enemy before engaging it in battle!";
next;
@@ -376,7 +376,7 @@ aldebaran,159,242,4 script Insect Guy#alde 119,{
close;
}
-aldebaran,60,70,4 script Sylvia#alde 69,{
+aldebaran,60,70,4 script Sylvia#alde 1_F_04,{
mes "[Sylvia]";
mes "I came all the way here from Prontera because I heard the Kafra Main Office was somewhere here in Al De Baran.";
next;
@@ -406,7 +406,7 @@ aldebaran,60,70,4 script Sylvia#alde 69,{
close;
}
-aldebaran,93,80,4 script Issei#alde 48,{
+aldebaran,93,80,4 script Issei#alde 1_M_02,{
mes "[Issei]";
mes "Al De Baran is such a wonderful place with its romantic canals and classic architecture. I love nothing more than to stroll through this city with my beautiful girlfriend.";
next;
@@ -432,7 +432,7 @@ aldebaran,93,80,4 script Issei#alde 48,{
close;
}
-aldebaran,180,46,4 script Joo Jahk#alde 88,{
+aldebaran,180,46,4 script Joo Jahk#alde 4_M_ORIENT01,{
mes "[Joo Jahk]";
mes "I'm a tourist";
mes "from Payon,";
@@ -457,7 +457,7 @@ aldebaran,180,46,4 script Joo Jahk#alde 88,{
close;
}
-aldebaran,212,122,4 script Citizen#alde 97,{
+aldebaran,212,122,4 script Citizen#alde 4W_M_01,{
mes "[Gavin]";
mes "Welcome!";
mes "The town of";
@@ -489,7 +489,7 @@ aldebaran,212,122,4 script Citizen#alde 97,{
close;
}
-aldebaran,146,124,4 script Town Girl#alde 101,{
+aldebaran,146,124,4 script Town Girl#alde 4W_F_01,{
mes "[Nastasia]";
mes "Somewhere in the world there is an ^3355FFAssassin Guild^000000, where they teach people the subtle art of assassination.";
next;
@@ -512,7 +512,7 @@ aldebaran,146,124,4 script Town Girl#alde 101,{
close;
}
-aldebaran,143,136,4 script Bell Keeper#A 89,{
+aldebaran,143,136,4 script Bell Keeper#A 4_M_ORIENT02,{
mes "[Bell Keeper]";
mes "I have been charged by the Committee of 'Heaven on Earth' to guard this entrance of the Clock Tower.";
next;
@@ -537,7 +537,7 @@ aldebaran,143,136,4 script Bell Keeper#A 89,{
// Inside Al De Baran
//============================================================
-aldeba_in,232,241,4 script RS125#alde 48,{
+aldeba_in,232,241,4 script RS125#alde 1_M_02,{
mes "[RS125]";
mes "I may sound unhuman rather robotic";
mes "however, I hope you will not be afraid of me. I am as humane as you are.";
@@ -580,7 +580,7 @@ aldeba_in,232,241,4 script RS125#alde 48,{
close;
}
-aldeba_in,223,121,4 script Threatening-Looking Man 63,{
+aldeba_in,223,121,4 script Threatening-Looking Man 1_M_SMITH,{
mes "[Threatening-Looking Man]";
mes "Hey, you don't come inside someone else's house without permission.";
mes "This is ridiculous!";
@@ -626,7 +626,7 @@ aldeba_in,223,121,4 script Threatening-Looking Man 63,{
close;
}
-aldeba_in,219,61,4 script Friendly-Looking Man#ald 109,{
+aldeba_in,219,61,4 script Friendly-Looking Man#ald 4_M_MANAGER,{
mes "[Friendly-Looking Man]";
mes "You don't have to listen to a guy right next to my room.";
mes "Two years ago, he was in a mercenary training center and fell off from a tree";
@@ -638,7 +638,7 @@ aldeba_in,219,61,4 script Friendly-Looking Man#ald 109,{
close;
}
-aldeba_in,152,47,4 script Fussy Man#alde 97,{
+aldeba_in,152,47,4 script Fussy Man#alde 4W_M_01,{
mes "[Fussy Man]";
mes "Aaaaarrrggghhh...I AM IN TROUBLE!";
mes "My little chicken has left me!";
@@ -670,7 +670,7 @@ aldeba_in,152,47,4 script Fussy Man#alde 97,{
close;
}
-aldeba_in,156,179,4 script Master#alde 61,{
+aldeba_in,156,179,4 script Master#alde 1_M_PUBMASTER,{
mes "[Master]";
mes "The Kafra Corporation Headquarters is located here in Al De Baran.";
mes "Do you know";
@@ -759,7 +759,7 @@ aldeba_in,156,179,4 script Master#alde 61,{
close;
}
-aldeba_in,84,166,4 script Kafra Service#alde 117,{
+aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{
cutin "kafra_01",2;
mes "[Kafra Pavianne]";
mes "Welcome! I'm Pavianne,";
@@ -817,7 +817,7 @@ aldeba_in,84,166,4 script Kafra Service#alde 117,{
end;
}
-aldeba_in,83,245,4 script Kafra Service#2alde 116,{
+aldeba_in,83,245,4 script Kafra Service#2alde 4_F_KAFRA2,{
cutin "kafra_02",2;
mes "[Kafra Blossom]";
mes "Welcome to the";
@@ -883,7 +883,7 @@ aldeba_in,83,245,4 script Kafra Service#2alde 116,{
end;
}
-aldeba_in,24,245,4 script Kafra Jasmine#alde 115,{
+aldeba_in,24,245,4 script Kafra Jasmine#alde 4_F_KAFRA3,{
cutin "kafra_03",2;
mes "[Kafra Jasmine]";
mes "Welcome!";
@@ -943,7 +943,7 @@ aldeba_in,24,245,4 script Kafra Jasmine#alde 115,{
end;
}
-aldeba_in,142,238,4 script Kafra Service#3alde 114,{
+aldeba_in,142,238,4 script Kafra Service#3alde 4_F_KAFRA4,{
cutin "kafra_04",2;
mes "[Kafra Roxie]";
mes "Welcome~!";
@@ -1019,7 +1019,7 @@ aldeba_in,142,238,4 script Kafra Service#3alde 114,{
end;
}
-aldeba_in,91,244,4 script Kafra Service#4alde 112,{
+aldeba_in,91,244,4 script Kafra Service#4alde 4_F_KAFRA6,{
cutin "kafra_06",2;
mes "[Kafra Curly Sue]";
mes "Hello, hello!!";
@@ -1048,7 +1048,7 @@ aldeba_in,91,244,4 script Kafra Service#4alde 112,{
// Kafra Special Reserve Point NPCs
//============================================================
// Special Reserve ----------------------------------------------
-aldeba_in,79,161,6 script Kafra#04 115,{
+aldeba_in,79,161,6 script Kafra#04 4_F_KAFRA3,{
cutin "kafra_03",2;
mes "[Kafra]";
mes "Welcome, ^6666FF" + strcharinfo(0) + "^000000. This is where you can trade in your special reserve points for useful items and cool prizes.";
@@ -1235,7 +1235,7 @@ M_Menu:
}
// Special Reserve 2 ----------------------------------------------
-aldeba_in,88,161,3 script Kafra#05 115,{
+aldeba_in,88,161,3 script Kafra#05 4_F_KAFRA3,{
cutin "kafra_03",2;
mes "[Kafra]";
mes "Welcome ^5577FF"+strcharinfo(0)+"^000000. We are currently having a special event for our customers.";
@@ -1377,12 +1377,12 @@ sF_Spin:
// Inside Clock Tower
//============================================================
-c_tower3,10,249,4 script Gatekeeper#ct 84,{
+c_tower3,10,249,4 script Gatekeeper#ct 4_M_02,{
//Key_Of_Clock_Tower
callfunc "F_ClockTowerGate","4th",7026,"c_tower4",185,44;
}
-alde_dun03,264,16,4 script Gatekeeper#ct1 101,{
+alde_dun03,264,16,4 script Gatekeeper#ct1 4W_F_01,{
//Underground_Key
callfunc "F_ClockTowerGate","B4th",7027,"alde_dun04",79,267;
}
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 1c5ca242b..6d5e9e197 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -122,7 +122,7 @@
}
}
-amatsu,194,79,5 script Sea Captain#ama2 709,{
+amatsu,194,79,5 script Sea Captain#ama2 4_M_SEAMAN,{
mes "[Walter Moers]";
mes "You came... Did you enjoy";
mes "your trip to Amatsu...?";
@@ -150,7 +150,7 @@ amatsu,194,79,5 script Sea Captain#ama2 709,{
// Generic Amatsu NPCs
//============================================================
-amatsu,230,160,3 script Well-side Maiden#ama 757,{
+amatsu,230,160,3 script Well-side Maiden#ama 4_F_JPN2,{
mes "[Yuuko]";
mes "I usually come to this well to";
mes "draw water, but never when it's";
@@ -166,7 +166,7 @@ amatsu,230,160,3 script Well-side Maiden#ama 757,{
close;
}
-amatsu,179,107,4 script John#ama 86,{
+amatsu,179,107,4 script John#ama 4_M_04,{
mes "[John]";
mes "Yo~";
mes "You're not from around here.";
@@ -223,7 +223,7 @@ amatsu,179,107,4 script John#ama 86,{
close;
}
-amatsu,205,163,3 script Mimi#ama 759,{
+amatsu,205,163,3 script Mimi#ama 4_F_JPNCHIBI,{
mes "[Mimi]";
mes "Puhuhu~!";
mes "Did you see Miss Amatsu near";
@@ -241,7 +241,7 @@ amatsu,205,163,3 script Mimi#ama 759,{
close;
}
-amatsu,185,115,3 script Drunken Man#ama 765,{
+amatsu,185,115,3 script Drunken Man#ama 4_M_JPNOJI2,{
mes "[Kosake]";
mes "*Hiccup*...My wife is just like,";
mes "...like a man...*Hiccup*...";
@@ -281,7 +281,7 @@ amatsu,185,115,3 script Drunken Man#ama 765,{
close;
}
-amatsu,217,179,1 script Grandma#ama 760,{
+amatsu,217,179,1 script Grandma#ama 4_F_JPNOBA2,{
mes "[Hatsue]";
mes "I'm worried about my husband.";
mes "He lost a lot of money in some distant town today.";
@@ -293,7 +293,7 @@ amatsu,217,179,1 script Grandma#ama 760,{
close;
}
-amatsu,287,266,3 script Jyaburo#ama 766,{
+amatsu,287,266,3 script Jyaburo#ama 4_M_JPNOJI,{
mes "[Jyaburo]";
mes "This place is special to me.";
mes "It's filled with memories of my wife.";
@@ -338,7 +338,7 @@ amatsu,287,266,3 script Jyaburo#ama 766,{
// Legendary Tree
//============================================================
-amatsu,269,221,1 script Propose Girl#ama 758,{
+amatsu,269,221,1 script Propose Girl#ama 4_F_JPN,{
set jap_tree,1;
mes "[Hutari Shioko]";
mes "It is a pleasure to meet you.";
@@ -373,7 +373,7 @@ amatsu,269,221,1 script Propose Girl#ama 758,{
close;
}
-amatsu,243,202,3 script Drama Teacher#ama 760,{
+amatsu,243,202,3 script Drama Teacher#ama 4_F_JPNOBA2,{
set jap_tree,2;
mes "[Garakame sensei]";
mes "This is a beautiful place";
@@ -422,7 +422,7 @@ amatsu,283,203,1 script Bonubonu#ama1 1323,{
end;
}
-amatsu,283,203,1 script Bonubonu#ama2 111,{
+amatsu,283,203,1 script Bonubonu#ama2 HIDDEN_NPC,{
set jap_tree,3;
emotion e_swt2;
mes "[Bonubonu]";
@@ -452,7 +452,7 @@ amatsu,283,203,1 script Bonubonu#ama2 111,{
close;
}
-amatsu,274,178,7 script Veterinarian#ama 735,{
+amatsu,274,178,7 script Veterinarian#ama 4_M_JOB_WIZARD,{
set jap_tree,4;
mes "[Sakura Seiichi]";
mes "Ah... I'm not a weirdo so";
@@ -505,7 +505,7 @@ amatsu,274,178,7 script Veterinarian#ama 735,{
close;
}
-amatsu,262,197,1 script Legendary Tree 111,{
+amatsu,262,197,1 script Legendary Tree HIDDEN_NPC,{
if (jap_tree == 1) {
mes "^3355FFAs she mentioned, this tree";
mes "seems to be a famous place";
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index 2a4480aa2..e04a00ee1 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -82,7 +82,7 @@
}
}
-ayothaya,152,68,1 script Aibakthing#ayo2 843,{
+ayothaya,152,68,1 script Aibakthing#ayo2 4_M_THAIONGBAK,{
mes "[Aibakthing]";
mes "Hoo! Hah! Hmm! Hah!";
mes "So, how did you like Ayotaya? Did you get a chance to try Tom Yum Goong? When you're ready, I shall take you back home.";
@@ -105,7 +105,7 @@ ayothaya,152,68,1 script Aibakthing#ayo2 843,{
// Generic Ayothaya NPCs
//============================================================
-ayothaya,189,120,3 script Young Man#Thang 843,{
+ayothaya,189,120,3 script Young Man#Thang 4_M_THAIONGBAK,{
mes "[Thang]";
mes "There's an ancient,";
mes "dreadful building in";
@@ -121,7 +121,7 @@ ayothaya,189,120,3 script Young Man#Thang 843,{
close;
}
-ayothaya,171,152,5 script Girl#Lalitha 838,{
+ayothaya,171,152,5 script Girl#Lalitha 4_F_THAIAYO,{
set .@sit,rand(1,5);
if (.@sit > 0 && .@sit < 3) {
mes "[Lalitha]";
@@ -192,7 +192,7 @@ ayothaya,171,152,5 script Girl#Lalitha 838,{
close;
}
-ayothaya,143,102,5 script Old Man#ayothaya 842,{
+ayothaya,143,102,5 script Old Man#ayothaya 4_M_THAIOLD,{
mes "[Villager]";
mes "Ummm.";
mes "Hmmmmm...";
@@ -237,7 +237,7 @@ ayothaya,143,102,5 script Old Man#ayothaya 842,{
close;
}
-ayothaya,197,189,5 script Young Man#1ayothaya 841,{
+ayothaya,197,189,5 script Young Man#1ayothaya 4_M_THAIAYO,{
mes "[Kwan]";
mes "Phew, isn't it";
mes "soooo hot today?";
@@ -263,7 +263,7 @@ ayothaya,197,189,5 script Young Man#1ayothaya 841,{
close;
}
-ayothaya,214,142,5 script Young Man#5ayothaya 843,{
+ayothaya,214,142,5 script Young Man#5ayothaya 4_M_THAIONGBAK,{
mes "[Detzi]";
mes "In Ayotaya, we have our own traditional martial arts. We, the young men of the village, practice our traditional martial arts in order to become strong.";
next;
@@ -272,7 +272,7 @@ ayothaya,214,142,5 script Young Man#5ayothaya 843,{
close;
}
-ayothaya,241,264,5 script Young Man#5ayothaya2 843,{
+ayothaya,241,264,5 script Young Man#5ayothaya2 4_M_THAIONGBAK,{
mes "[Eik]";
mes "Hey...";
mes "You look pretty strong";
diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index 6f2f2a6c8..cb36c38c1 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -24,7 +24,7 @@
// Inside Comodo
//============================================================
-cmd_in02,73,81,4 script Martine#cmd 48,{
+cmd_in02,73,81,4 script Martine#cmd 1_M_02,{
mes "[Martine]";
mes "Gambling...? The games";
mes "provided here in the Comodo";
@@ -49,7 +49,7 @@ cmd_in02,73,81,4 script Martine#cmd 48,{
close;
}
-cmd_in02,48,55,4 script Scoursege#cmd 51,{
+cmd_in02,48,55,4 script Scoursege#cmd 1_M_BARD,{
mes "[Scoursege]";
mes "Damn it! Where did that";
mes "guy go? He promised me that";
@@ -65,7 +65,7 @@ cmd_in02,48,55,4 script Scoursege#cmd 51,{
close;
}
-cmd_in02,64,43,4 script Roberto#cmd 709,{
+cmd_in02,64,43,4 script Roberto#cmd 4_M_SEAMAN,{
mes "[Roberto]";
mes "Heh heh heh...";
mes "Whaaaat a gullible";
@@ -76,7 +76,7 @@ cmd_in02,64,43,4 script Roberto#cmd 709,{
close;
}
-cmd_in02,89,72,4 script Deniroz#cmd 89,{
+cmd_in02,89,72,4 script Deniroz#cmd 4_M_ORIENT02,{
mes "[Deniroz]";
mes "All I need is for this";
mes "little steel bead to fall";
@@ -94,7 +94,7 @@ cmd_in02,89,72,4 script Deniroz#cmd 89,{
close;
}
-cmd_in02,178,92,4 script Shalone#cmd 101,{
+cmd_in02,178,92,4 script Shalone#cmd 4W_F_01,{
mes "[Shalone]";
mes "Oh, I'm sorry, sir,";
mes "but it looks like you";
@@ -105,7 +105,7 @@ cmd_in02,178,92,4 script Shalone#cmd 101,{
close;
}
-cmd_in02,178,86,4 script Stonae#cmd 98,{
+cmd_in02,178,86,4 script Stonae#cmd 4W_M_02,{
mes "[Stonae]";
mes "N-no...";
mes "I lost again?!";
@@ -116,7 +116,7 @@ cmd_in02,178,86,4 script Stonae#cmd 98,{
close;
}
-cmd_in02,172,105,4 script G . J#cmd 86,{
+cmd_in02,172,105,4 script G . J#cmd 4_M_04,{
mes "[G . J]";
mes "The more I think about it,";
mes "it seems easier to become";
@@ -141,7 +141,7 @@ cmd_in02,172,105,4 script G . J#cmd 86,{
close;
}
-cmd_in02,174,126,4 script Loyar#cmd 83,{
+cmd_in02,174,126,4 script Loyar#cmd 4_M_01,{
mes "[Loyar]";
mes "Comodo Casino's interior";
mes "design is so pleasing to the";
@@ -197,7 +197,7 @@ cmd_in02,174,126,4 script Loyar#cmd 83,{
}
}
-cmd_in02,57,62,4 script Moo#cmd 109,{
+cmd_in02,57,62,4 script Moo#cmd 4_M_MANAGER,{
set mooz,rand(1,10);
if (mooz == 1) {
mes "[Moo]";
@@ -236,7 +236,7 @@ cmd_in02,57,62,4 script Moo#cmd 109,{
// Comodo Field
//============================================================
-cmd_fild04,188,74,4 script Zyosegirl#cmd 93,{
+cmd_fild04,188,74,4 script Zyosegirl#cmd 4_F_04,{
mes "[Zyosegirl]";
mes "People call me the";
mes "Sea Lady because I'm";
@@ -254,7 +254,7 @@ cmd_fild04,188,74,4 script Zyosegirl#cmd 93,{
close;
}
-cmd_fild04,248,86,4 script Ziyaol#cmd 709,{
+cmd_fild04,248,86,4 script Ziyaol#cmd 4_M_SEAMAN,{
mes "[Ziyaol]";
mes "Ahhh, it's nice being";
mes "a fisherman. You just";
@@ -281,7 +281,7 @@ cmd_fild04,248,86,4 script Ziyaol#cmd 709,{
close;
}
-cmd_fild04,267,137,4 script Daeguro#cmd 703,{
+cmd_fild04,267,137,4 script Daeguro#cmd 4_F_KID2,{
mes "[Daeguro]";
mes "I love playing in";
mes "the sand-- it's so soft";
@@ -292,7 +292,7 @@ cmd_fild04,267,137,4 script Daeguro#cmd 703,{
close;
}
-cmd_fild07,192,58,4 script Rahasu#cmd 100,{
+cmd_fild07,192,58,4 script Rahasu#cmd 4W_SAILOR,{
mes "[Rahasu]";
mes "Hey, I'm Rahasu.";
mes "If you want to learn";
@@ -326,7 +326,7 @@ cmd_fild07,192,58,4 script Rahasu#cmd 100,{
close;
}
-cmd_fild07,52,280,4 script Hallosu#cmd 100,{
+cmd_fild07,52,280,4 script Hallosu#cmd 4W_SAILOR,{
mes "[Hallosu]";
mes "Hello, this is one of the";
mes "lighthouses that make up";
@@ -337,7 +337,7 @@ cmd_fild07,52,280,4 script Hallosu#cmd 100,{
close;
}
-cmd_fild07,299,83,4 script Zain#cmd 100,{
+cmd_fild07,299,83,4 script Zain#cmd 4W_SAILOR,{
set .@n$,"["+strnpcinfo(1)+"]";
mes .@n$;
mes "Would you like to";
@@ -375,9 +375,9 @@ cmd_fild07,299,83,4 script Zain#cmd 100,{
mes "zeny for the boarding fare.";
close;
}
-cmd_fild07,94,134,4 duplicate(Zain#cmd) Sarumane#cmd 100
+cmd_fild07,94,134,4 duplicate(Zain#cmd) Sarumane#cmd 4W_SAILOR
-cmd_in02,146,180,4 script Kafra Employee::kaf_comodo2 721,{
+cmd_in02,146,180,4 script Kafra Employee::kaf_comodo2 4_F_KAFRA7,{
cutin "kafra_07",2;
mes "[Kafra Misty]";
mes "Welcome to the";
@@ -400,7 +400,7 @@ cmd_in02,146,180,4 script Kafra Employee::kaf_comodo2 721,{
// Morroc Field
//============================================================
-moc_fild12,35,303,4 script Serutero#cmd 59,{
+moc_fild12,35,303,4 script Serutero#cmd 1_M_ORIENT01,{
mes "[Serutero]";
mes "Hello, I'm Serutero,";
mes "guardian of the roads that";
diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index 285221ab8..e1395e701 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -24,7 +24,7 @@
//= 1.6 Replaced occurances of PcName. [L0ne_W0lf]
//============================================================
-einbech,172,113,4 script Nemuk#ein 855,{
+einbech,172,113,4 script Nemuk#ein 4_M_EINMAN,{
mes "[Nemuk]";
mes "You seem to be an";
mes "outsider, so let me";
@@ -79,7 +79,7 @@ einbech,172,113,4 script Nemuk#ein 855,{
}
}
-einbech,197,139,4 script Young Man#air2 855,{
+einbech,197,139,4 script Young Man#air2 4_M_EINMAN,{
mes "[Heinz]";
mes "Wow...";
mes "An adventurer from";
@@ -114,7 +114,7 @@ einbech,197,139,4 script Young Man#air2 855,{
close;
}
-einbech,128,238,5 script Mogan#ein 848,{
+einbech,128,238,5 script Mogan#ein 4_M_EINMINER,{
mes "[Mogan]";
mes "Recently, there were a few";
mes "cave-ins where many miners";
@@ -139,7 +139,7 @@ einbech,128,238,5 script Mogan#ein 848,{
close;
}
-einbech,129,234,5 script Hander#ein 848,{
+einbech,129,234,5 script Hander#ein 4_M_EINMINER,{
mes "[Hander]";
mes "Those Einbroch bastards!";
mes "Living off the resources we";
@@ -163,7 +163,7 @@ einbech,129,234,5 script Hander#ein 848,{
close;
}
-einbech,105,218,5 script Gushenmu#ein 848,{
+einbech,105,218,5 script Gushenmu#ein 4_M_EINMINER,{
mes "[Gushenmu]";
mes "I've lived here a long time";
mes "and, believe it or not, things";
@@ -195,7 +195,7 @@ einbech,105,218,5 script Gushenmu#ein 848,{
close;
}
-einbech,39,215,5 script Train Station Staff#ein3 852,{
+einbech,39,215,5 script Train Station Staff#ein3 4_M_EIN_SOLDIER,{
mes "[Staff]";
mes "Welcome to";
mes "the Train Station.";
@@ -233,7 +233,7 @@ einbech,39,215,5 script Train Station Staff#ein3 852,{
}
}
-einbech,157,215,3 script Train Station Manager#ei 852,{
+einbech,157,215,3 script Train Station Manager#ei 4_M_EIN_SOLDIER,{
mes "[Train Station Manager]";
mes "This train station";
mes "is strictly for trains";
@@ -243,7 +243,7 @@ einbech,157,215,3 script Train Station Manager#ei 852,{
close;
}
-einbech,151,168,3 script Tollaf#ein 855,{
+einbech,151,168,3 script Tollaf#ein 4_M_EINMAN,{
mes "[Tollaf]";
mes "Ah...!";
mes "This is killing me!";
@@ -260,7 +260,7 @@ einbech,151,168,3 script Tollaf#ein 855,{
close;
}
-einbech,93,139,5 script Raust#ein 847,{
+einbech,93,139,5 script Raust#ein 4_M_EINOLD,{
mes "[Raust]";
mes "I don't get it!";
mes "Einbroch gets bigger";
@@ -288,7 +288,7 @@ einbech,93,139,5 script Raust#ein 847,{
close;
}
-einbech,149,154,3 script Mjunia#ein 850,{
+einbech,149,154,3 script Mjunia#ein 4_F_EINWOMAN,{
mes "[Mjunia]";
mes "It's hard being a woman";
mes "in this town. By being born";
@@ -327,7 +327,7 @@ einbech,149,154,3 script Mjunia#ein 850,{
close;
}
-einbech,130,253,1 script Ekuri#ein 848,{
+einbech,130,253,1 script Ekuri#ein 4_M_EINMINER,{
mes "[Ekuri]";
mes "Yo-heave-ho!";
mes "Yo-heave-ho~!";
@@ -356,42 +356,42 @@ einbech,130,253,1 script Ekuri#ein 848,{
close;
}
-einbech,135,250,5 script Bulletin Board#einbech11 858,{
+einbech,135,250,5 script Bulletin Board#einbech11 4_BULLETIN_BOARD2,{
mes " ";
mes " Mine Dungeon Entrance ";
mes " ";
close;
}
-einbech,90,214,5 script Bulletin Board#einbech22 858,{
+einbech,90,214,5 script Bulletin Board#einbech22 4_BULLETIN_BOARD2,{
mes " ";
mes " Train Station ";
mes " ";
close;
}
-einbech,158,189,4 script Bulletin Board#einbech33 858,{
+einbech,158,189,4 script Bulletin Board#einbech33 4_BULLETIN_BOARD2,{
mes " ";
mes " Freight Train Station ";
mes " ";
close;
}
-einbech,180,136,5 script Bulletin Board#einbech44 858,{
+einbech,180,136,5 script Bulletin Board#einbech44 4_BULLETIN_BOARD2,{
mes " ";
mes " Tool Shop ";
mes " ";
close;
}
-einbech,133,114,5 script Bulletin Board#einbech55 858,{
+einbech,133,114,5 script Bulletin Board#einbech55 4_BULLETIN_BOARD2,{
mes " ";
mes " Tavern ";
mes " ";
close;
}
-einbech,77,105,5 script Bulletin Board#einbech01 858,{
+einbech,77,105,5 script Bulletin Board#einbech01 4_BULLETIN_BOARD2,{
mes "Welcome to 'Einbech'.";
next;
mes "East - Tavern, Tool Shop";
@@ -399,14 +399,14 @@ einbech,77,105,5 script Bulletin Board#einbech01 858,{
close;
}
-einbech,181,127,5 script Bulletin Board#einbech03 858,{
+einbech,181,127,5 script Bulletin Board#einbech03 4_BULLETIN_BOARD2,{
mes "Northwest - Train Station";
mes "South - Tavern";
mes "North - Tool Shop, Mine Dungeon";
close;
}
-ein_in01,279,92,3 script Tavern Lady#ein 854,{
+ein_in01,279,92,3 script Tavern Lady#ein 4_M_EINMAN2,{
mes "[Tavern Lady]";
mes "Most Einbech men are";
mes "crude and primitive male";
@@ -430,7 +430,7 @@ ein_in01,279,92,3 script Tavern Lady#ein 854,{
close;
}
-ein_in01,277,95,7 script Ryan Danger#air#einbech 855,{
+ein_in01,277,95,7 script Ryan Danger#air#einbech 4_M_EINMAN,{
mes "[R.D. Kim]";
mes "Oooh...";
next;
@@ -482,7 +482,7 @@ ein_in01,277,95,7 script Ryan Danger#air#einbech 855,{
close;
}
-ein_in01,281,85,3 script Drunken Man#einbech 849,{
+ein_in01,281,85,3 script Drunken Man#einbech 4_M_DIEMAN,{
mes "[Drunken Man]";
mes "...^333333*Hiccup*^000000...";
mes "^333333*Hiccup*^000000...";
@@ -493,7 +493,7 @@ ein_in01,281,85,3 script Drunken Man#einbech 849,{
close;
}
-einbech,46,107,6 script Shena#ein::EinMonsters 846,{
+einbech,46,107,6 script Shena#ein::EinMonsters 4_F_EINOLD,{
mes "[Shena]";
mes "I think it's weird!";
mes "How do you youngsters";
@@ -741,9 +741,9 @@ einbech,46,107,6 script Shena#ein::EinMonsters 846,{
}
}
-einbech,48,107,4 duplicate(EinMonsters) Luda#ein 850,{
+einbech,48,107,4 duplicate(EinMonsters) Luda#ein 4_F_EINWOMAN,{
-einbech,148,242,5 script Jung#ein 855,{
+einbech,148,242,5 script Jung#ein 4_M_EINMAN,{
mes "[Jung]";
mes "I'm one of the few";
mes "people who's lived";
@@ -878,7 +878,7 @@ einbech,148,242,5 script Jung#ein 855,{
}
}
-einbech,148,246,5 script Franz#ein 851,{
+einbech,148,246,5 script Franz#ein 4_M_REPAIR,{
mes "[Franz]";
mes "So bored...";
mes "Starving for...";
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index fa6698b73..9d1c1dcad 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -30,12 +30,12 @@
//= 1.8 Fixed Occurances of PcName. [L0ne_W0lf]
//============================================================
-einbroch,218,198,5 script Mark#ein 855,{
+einbroch,218,198,5 script Mark#ein 4_M_EINMAN,{
callfunc "EinTower","Mark";
end;
}
-einbroch,175,196,5 script Morei#ein 854,{
+einbroch,175,196,5 script Morei#ein 4_M_EINMAN2,{
mes "[Morei]";
mes "Greetings,";
mes "I am Morei,";
@@ -79,11 +79,11 @@ einbroch,175,196,5 script Morei#ein 854,{
}
}
-einbroch,173,229,5 script Oberu#ein 855,{
+einbroch,173,229,5 script Oberu#ein 4_M_EINMAN,{
callfunc "EinTower","Oberu";
end;
}
-einbroch,176,172,5 script Khemko#ein 855,{
+einbroch,176,172,5 script Khemko#ein 4_M_EINMAN,{
callfunc "EinTower","Khemko";
end;
}
@@ -179,7 +179,7 @@ function script EinTower {
}
}
-einbroch,232,272,3 script Train Station Staff#ein1::EinbrochTrain 852,{
+einbroch,232,272,3 script Train Station Staff#ein1::EinbrochTrain 4_M_EIN_SOLDIER,{
mes "[Staff]";
mes "Welcome to";
mes "the Train Station.";
@@ -238,9 +238,9 @@ einbroch,232,272,3 script Train Station Staff#ein1::EinbrochTrain 852,{
}
}
-einbroch,252,301,3 duplicate(EinbrochTrain) Train Station Staff#ein2 852
+einbroch,252,301,3 duplicate(EinbrochTrain) Train Station Staff#ein2 4_M_EIN_SOLDIER
-einbroch,259,326,3 script Leslie#ein_1 846,{
+einbroch,259,326,3 script Leslie#ein_1 4_F_EINOLD,{
mes "[Leslie]";
mes "^666666*Cough cough!*^000000";
mes "Laaaand sakes!";
@@ -262,7 +262,7 @@ einbroch,259,326,3 script Leslie#ein_1 846,{
close;
}
-einbroch,236,191,3 script Tan#ein 855,{
+einbroch,236,191,3 script Tan#ein 4_M_EINMAN,{
mes "[Tan]";
mes "All the factories";
mes "here in Einbroch are";
@@ -286,7 +286,7 @@ einbroch,236,191,3 script Tan#ein 855,{
close;
}
-einbroch,228,121,5 script Little Toby#ein-1 855,{
+einbroch,228,121,5 script Little Toby#ein-1 4_M_EINMAN,{
mes "[Little Toby]";
mes "Excuse me...";
mes "But I'm lost!";
@@ -309,7 +309,7 @@ einbroch,228,121,5 script Little Toby#ein-1 855,{
close;
}
-einbroch,40,116,1 script Airship Engineer#ein-1 855,{
+einbroch,40,116,1 script Airship Engineer#ein-1 4_M_EINMAN,{
mes "[Airship Engineer]";
mes "H-hey! Don't";
mes "touch my precious";
@@ -373,7 +373,7 @@ einbroch,40,116,1 script Airship Engineer#ein-1 855,{
}
}
-einbroch,294,312,3 script Centzu#ein 854,{
+einbroch,294,312,3 script Centzu#ein 4_M_EINMAN2,{
mes "[Centzu]";
mes "I've lived here for";
mes "a long time and I see";
@@ -398,7 +398,7 @@ einbroch,294,312,3 script Centzu#ein 854,{
close;
}
-einbroch,232,255,5 script Khowropher#ein 847,{
+einbroch,232,255,5 script Khowropher#ein 4_M_EINOLD,{
mes "[Khowropher]";
mes "^666666*Cough cough*^000000";
mes "Jiminy! The air here";
@@ -423,7 +423,7 @@ einbroch,232,255,5 script Khowropher#ein 847,{
close;
}
-einbroch,143,109,5 script Khetine#ein 855,{
+einbroch,143,109,5 script Khetine#ein 4_M_EINMAN,{
mes "[Khetine]";
mes "Lately, there's been";
mes "talk about this empty";
@@ -441,7 +441,7 @@ einbroch,143,109,5 script Khetine#ein 855,{
close;
}
-einbroch,229,149,3 script Sleik#ein 854,{
+einbroch,229,149,3 script Sleik#ein 4_M_EINMAN2,{
mes "[Sleik]";
mes "Surprisingly, we have";
mes "a Train Station that everyone";
@@ -459,7 +459,7 @@ einbroch,229,149,3 script Sleik#ein 854,{
close;
}
-airport,174,41,6 script Young Man#air 99,{
+airport,174,41,6 script Young Man#air 4W_M_03,{
mes "[Runnan]";
mes "...And that's why";
mes "I travel around the";
@@ -478,7 +478,7 @@ airport,174,41,6 script Young Man#air 99,{
close;
}
-airport,176,41,4 script Old Man#air 88,{
+airport,176,41,4 script Old Man#air 4_M_ORIENT01,{
mes "[Zhen Lan]";
mes "Now, I hear that the";
mes "monsters around here";
@@ -508,7 +508,7 @@ airport,176,41,4 script Old Man#air 88,{
close;
}
-ein_in01,113,211,3 script Teinz#ein 851,{
+ein_in01,113,211,3 script Teinz#ein 4_M_REPAIR,{
mes "[Teinz]";
mes "If you just pay me money,";
mes "I'll be your slave! There's";
@@ -525,7 +525,7 @@ ein_in01,113,211,3 script Teinz#ein 851,{
close;
}
-ein_in01,48,220,5 script Lowe#ein 851,{
+ein_in01,48,220,5 script Lowe#ein 4_M_REPAIR,{
mes "[Lowe]";
mes "...";
mes "......";
@@ -552,7 +552,7 @@ ein_in01,48,220,5 script Lowe#ein 851,{
close;
}
-ein_in01,87,237,5 script Dinje#ein 850,{
+ein_in01,87,237,5 script Dinje#ein 4_F_EINWOMAN,{
mes "[Dinje]";
mes "Do you know why a woman";
mes "like me has to work in this";
@@ -580,7 +580,7 @@ ein_in01,87,237,5 script Dinje#ein 850,{
close;
}
-ein_in01,84,218,3 script Tsuen#ein 851,{
+ein_in01,84,218,3 script Tsuen#ein 4_M_REPAIR,{
mes "[Tsuen]";
mes "There was a time";
mes "when I dreamed of";
@@ -613,7 +613,7 @@ ein_in01,84,218,3 script Tsuen#ein 851,{
close;
}
-ein_in01,103,239,1 script Gesin#ein 849,{
+ein_in01,103,239,1 script Gesin#ein 4_M_DIEMAN,{
mes "[Gesin]";
mes "Arrrgh!";
mes "This is killing me!";
@@ -644,7 +644,7 @@ ein_in01,103,239,1 script Gesin#ein 849,{
close;
}
-ein_in01,33,275,1 script Pevtatin#ein 848,{
+ein_in01,33,275,1 script Pevtatin#ein 4_M_EINMINER,{
mes "[Pevtatin]";
mes "Good god!";
mes "I'm so stressed!";
@@ -666,7 +666,7 @@ ein_in01,33,275,1 script Pevtatin#ein 848,{
close;
}
-ein_in01,36,204,3 script Rombell#ein 851,{
+ein_in01,36,204,3 script Rombell#ein 4_M_REPAIR,{
mes "[Rombell]";
mes "It's great that the";
mes "factory is making good";
@@ -692,7 +692,7 @@ ein_in01,36,204,3 script Rombell#ein 851,{
close;
}
-ein_in01,64,271,3 script Vonstein#ein 855,{
+ein_in01,64,271,3 script Vonstein#ein 4_M_EINMAN,{
mes "[Vonstein]";
mes "Staring at this";
mes "bubbling hot liquid";
@@ -709,7 +709,7 @@ ein_in01,64,271,3 script Vonstein#ein 855,{
close;
}
-ein_in01,49,202,3 script Dorf#ein 851,{
+ein_in01,49,202,3 script Dorf#ein 4_M_REPAIR,{
mes "[Dorf]";
mes "Machines are sooo";
mes "convenient. Just look";
@@ -732,7 +732,7 @@ ein_in01,49,202,3 script Dorf#ein 851,{
close;
}
-ein_in01,68,209,5 script Khashurantze#ein 852,{
+ein_in01,68,209,5 script Khashurantze#ein 4_M_EIN_SOLDIER,{
mes "[Khashurantze]";
mes "I'm sorry, but you need";
mes "special authority in order";
@@ -743,7 +743,7 @@ ein_in01,68,209,5 script Khashurantze#ein 852,{
end;
}
-ein_in01,85,261,3 script Zherin#ein 851,{
+ein_in01,85,261,3 script Zherin#ein 4_M_REPAIR,{
mes "[Zherin]";
mes "I'm in charge of this";
mes "blast furnace which";
@@ -767,7 +767,7 @@ ein_in01,85,261,3 script Zherin#ein 851,{
close;
}
-ein_in01,43,252,3 script Canphotii#ein 852,{
+ein_in01,43,252,3 script Canphotii#ein 4_M_EIN_SOLDIER,{
mes "[Canphotii]";
mes "Hustle, hustle!";
mes "Pick up the pace!";
@@ -791,7 +791,7 @@ ein_in01,43,252,3 script Canphotii#ein 852,{
close;
}
-ein_in01,206,224,3 script Hotel Employee#ein 855,{
+ein_in01,206,224,3 script Hotel Employee#ein 4_M_EINMAN,{
mes "[Hotel Employee]";
mes "Good day, welcome to the";
mes "Einbroch Hotel. The staff is";
@@ -860,56 +860,56 @@ ein_in01,206,224,3 script Hotel Employee#ein 855,{
close;
}
-einbroch,244,255,5 script Bulletin Board#ein1 858,{
+einbroch,244,255,5 script Bulletin Board#ein1 4_BULLETIN_BOARD2,{
mes " ";
mes " Train Station ";
mes " ";
close;
}
-einbroch,253,203,5 script Bulletin Board#ein2 858,{
+einbroch,253,203,5 script Bulletin Board#ein2 4_BULLETIN_BOARD2,{
mes " ";
mes " Hotel ";
mes " ";
close;
}
-einbroch,68,206,5 script Bulletin Board#ein3 858,{
+einbroch,68,206,5 script Bulletin Board#ein3 4_BULLETIN_BOARD2,{
mes " ";
mes " Airship Airport ";
mes " ";
close;
}
-einbroch,90,84,5 script Bulletin Board#ein4 858,{
+einbroch,90,84,5 script Bulletin Board#ein4 4_BULLETIN_BOARD2,{
mes " ";
mes " Laboratory ";
mes " ";
close;
}
-einbroch,101,106,5 script Bulletin Board#ein5 858,{
+einbroch,101,106,5 script Bulletin Board#ein5 4_BULLETIN_BOARD2,{
mes " ";
mes " Airship Repair Shop ";
mes " ";
close;
}
-einbroch,220,208,5 script Bulletin Board#ein6 858,{
+einbroch,220,208,5 script Bulletin Board#ein6 4_BULLETIN_BOARD2,{
mes " ";
mes " Weapon Shop ";
mes " ";
close;
}
-einbroch,132,76,5 script Bulletin Board#ein7 858,{
+einbroch,132,76,5 script Bulletin Board#ein7 4_BULLETIN_BOARD2,{
mes " ";
mes " Factory ";
mes " ";
close;
}
-einbroch,152,46,5 script Bulletin Board#ein11 858,{
+einbroch,152,46,5 script Bulletin Board#ein11 4_BULLETIN_BOARD2,{
mes "West - Laboratory, Airship Repair Shop";
mes "South - Einbroch Front Gate";
mes "North - Airport";
@@ -917,14 +917,14 @@ einbroch,152,46,5 script Bulletin Board#ein11 858,{
close;
}
-einbroch,235,141,5 script Bulletin Board#ein22 858,{
+einbroch,235,141,5 script Bulletin Board#ein22 4_BULLETIN_BOARD2,{
mes "Southwest - Airship Repair Shop, Laboratory";
mes "Northwest - Airport";
mes "North - Weapon Shop, Hotel, Train Station";
close;
}
-einbroch,162,256,5 script Bulletin Board#ein33 858,{
+einbroch,162,256,5 script Bulletin Board#ein33 4_BULLETIN_BOARD2,{
mes "East - Train Station";
mes "Southeast - Hotel";
mes "South - Weapon Shop,Factory";
@@ -932,7 +932,7 @@ einbroch,162,256,5 script Bulletin Board#ein33 858,{
close;
}
-einbroch,183,174,5 script Bulletin Board#ein44 858,{
+einbroch,183,174,5 script Bulletin Board#ein44 4_BULLETIN_BOARD2,{
mes "East - Weapon Shop, Hotel";
mes "South - Factory";
mes "Southwest - Airship Repair Shop, Laboratory";
@@ -940,14 +940,14 @@ einbroch,183,174,5 script Bulletin Board#ein44 858,{
close;
}
-einbroch,104,202,5 script Bulletin Board#ein55 858,{
+einbroch,104,202,5 script Bulletin Board#ein55 4_BULLETIN_BOARD2,{
mes "Northeast - Train Station";
mes "East - Weapon Shop,Hotel";
mes "South - Airship Repair Shop, Laboratory";
close;
}
-ein_in01,31,217,3 script Cendadt#ein 851,{
+ein_in01,31,217,3 script Cendadt#ein 4_M_REPAIR,{
mes "[Cendadt]";
mes "This factory has a lot";
mes "of things that need fixing,";
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index 85595bd66..d755af8b6 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -23,7 +23,7 @@
//= 2.0 Bug fixes (bugreport:7928) [DeadlySilence]
//============================================================
-geffen,59,143,0 script Meera 91,{
+geffen,59,143,0 script Meera 4_F_02,{
mes "[Meera]";
mes "Welcome to Geffen,";
mes "the City of Magic!";
@@ -46,7 +46,7 @@ geffen,59,143,0 script Meera 91,{
close;
}
-geffen,156,190,0 script Orwalk 82,{
+geffen,156,190,0 script Orwalk 4_KID01,{
mes "[Orwalk]";
mes "...Interesting.";
mes "Most intriguing.";
@@ -64,7 +64,7 @@ geffen,156,190,0 script Orwalk 82,{
close;
}
-geffen_in,164,109,0 script Wizard Stanza 64,{
+geffen_in,164,109,0 script Wizard Stanza 1_M_WIZARD,{
mes "[Stanza]";
mes "I sense the presence of a mighty spirit. Can it be you...?";
next;
@@ -92,7 +92,7 @@ geffen_in,164,109,0 script Wizard Stanza 64,{
close;
}
-geffen,147,26,0 script Ralphie 97,{
+geffen,147,26,0 script Ralphie 4W_M_01,{
mes "[Ralphie]";
mes "Somewhere in this world, there is a rare Staff which can transform psychic energy into physical force, endowing its owner with ^990000destructive power^000000...";
next;
@@ -122,7 +122,7 @@ geffen,147,26,0 script Ralphie 97,{
close;
}
-geffen,111,48,0 script Stacey 101,{
+geffen,111,48,0 script Stacey 4W_F_01,{
if (getequipid(1) == 2299) {
mes "[Stacey]";
mes "Oh...!";
@@ -182,7 +182,7 @@ geffen,111,48,0 script Stacey 101,{
}
}
-geffen_in,34,170,0 script Theodore 47,{
+geffen_in,34,170,0 script Theodore 1_M_01,{
mes "[Theodore]";
mes "Hello!";
mes "Isn't it a";
@@ -214,7 +214,7 @@ geffen_in,34,170,0 script Theodore 47,{
close;
}
-geffen,146,148,4 script Suspicious Guy 99,6,6,{
+geffen,146,148,4 script Suspicious Guy 4W_M_03,6,6,{
end;
OnTouch:
@@ -423,7 +423,7 @@ OnTouch:
close;
}
-geffen_in,22,125,1 script Crumpler 52,{
+geffen_in,22,125,1 script Crumpler 1_M_HOF,{
mes "[Crumpler]";
mes "Ooooh~!";
mes "You sure are dressed pretty,";
@@ -521,7 +521,7 @@ geffen_in,22,125,1 script Crumpler 52,{
}
}
-geffen_in,59,61,1 script Skyler 61,{
+geffen_in,59,61,1 script Skyler 1_M_PUBMASTER,{
mes "[Skyler]";
mes "Hello hello.";
mes "You're not looking";
@@ -546,7 +546,7 @@ geffen_in,59,61,1 script Skyler 61,{
close;
}
-geffen_in,27,134,5 script Waitress#elen 91,{
+geffen_in,27,134,5 script Waitress#elen 4_F_02,{
mes "[Elenore]";
mes "This place...";
mes "Certainly has";
@@ -685,7 +685,7 @@ geffen_in,27,134,5 script Waitress#elen 91,{
close;
}
-geffen_in,70,67,3 script Waitress#elise 90,{
+geffen_in,70,67,3 script Waitress#elise 4_F_01,{
mes "[Elisa]";
mes "Hello there~";
mes "Can I help you";
@@ -806,7 +806,7 @@ geffen_in,70,67,3 script Waitress#elise 90,{
close;
}
-geffen_in,79,76,2 script Merchant Daven 120,{
+geffen_in,79,76,2 script Merchant Daven 2_M_PHARMACIST,{
mes "[Merchant Daven]";
mes "I remember Geffen";
mes "back when it was boring. ";
@@ -873,7 +873,7 @@ geffen_in,79,76,2 script Merchant Daven 120,{
close;
}
-geffen_in,114,73,5 script Hadenheim 709,{
+geffen_in,114,73,5 script Hadenheim 4_M_SEAMAN,{
mes "[Hans Hadenheim]";
mes "Man, the Rune-Midgard continent sure is big! How's it going, youngster?";
next;
@@ -919,7 +919,7 @@ geffen_in,114,73,5 script Hadenheim 709,{
close;
}
-geffen_in,39,127,2 script Psychic Advisor 704,{
+geffen_in,39,127,2 script Psychic Advisor 4_M_BIBI,{
mes "[Psychic Advisor]";
mes "Ah...";
mes "Don't tell me! You've come to have your fortune told, yes? I know,";
@@ -1336,7 +1336,7 @@ geffen_in,39,127,2 script Psychic Advisor 704,{
}
}
-geffen_in,109,72,2 script Monster Scholar 90,{
+geffen_in,109,72,2 script Monster Scholar 4_F_01,{
mes "[Estheres]";
mes "Hello, I'm the resident expert of Monsterology here in Geffen. Is there anything in particular that you're curious about?";
next;
@@ -1404,7 +1404,7 @@ geffen_in,109,72,2 script Monster Scholar 90,{
// Lvl 4 weapon quest related NPC ------------------------------------------------------
-geffen,203,146,5 script Citizen 97,{
+geffen,203,146,5 script Citizen 4W_M_01,{
mes "[Citizen]";
mes "There was a skillful weaponsmith";
mes "in Al De Baran who had 4 sons.";
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index d58242e2f..7aa0f5e70 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -128,7 +128,7 @@
}
}
-gon_fild01,255,79,7 script Kunlun Envoy#gon2 776,{
+gon_fild01,255,79,7 script Kunlun Envoy#gon2 4_M_TWMIDMAN,{
mes "[Wa Bai Hu]";
mes "So, did you enjoy your trip?";
mes "I guess it's the time for you to";
@@ -155,7 +155,7 @@ gon_fild01,255,79,7 script Kunlun Envoy#gon2 776,{
close;
}
-gon_fild01,187,239,7 script Kunlun Envoy#gon3 776,{
+gon_fild01,187,239,7 script Kunlun Envoy#gon3 4_M_TWMIDMAN,{
mes "[Zhang Quing Long]";
mes "Please head north to enter Kunlun.";
mes "I hope you will have a great time";
@@ -163,7 +163,7 @@ gon_fild01,187,239,7 script Kunlun Envoy#gon3 776,{
close;
}
-gonryun,153,64,7 script Kunlun Envoy#gon4 776,{
+gonryun,153,64,7 script Kunlun Envoy#gon4 4_M_TWMIDMAN,{
mes "[Zhang Quing Long]";
mes "Please make yourself comfortable.";
mes "If you want to go back, I will";
@@ -188,7 +188,7 @@ gonryun,153,64,7 script Kunlun Envoy#gon4 776,{
// Generic Kunlun NPCs
//============================================================
-gonryun,200,82,3 script Jian Chung Xun#gon 774,{
+gonryun,200,82,3 script Jian Chung Xun#gon 4_M_TWBOY,{
mes "[Jian Chung Xun]";
mes "I simply adore festivals.";
mes "That's why I love this town.";
@@ -197,7 +197,7 @@ gonryun,200,82,3 script Jian Chung Xun#gon 774,{
close;
}
-gonryun,268,88,3 script Liang Zhun Bu#gon 776,{
+gonryun,268,88,3 script Liang Zhun Bu#gon 4_M_TWMIDMAN,{
mes "[Liang Zhun Bu]";
mes "We are proud to be an independent";
mes "nation, and have been fighting";
@@ -213,7 +213,7 @@ gonryun,268,88,3 script Liang Zhun Bu#gon 776,{
close;
}
-gonryun,118,111,5 script Qian Yuen Shuang#gon 89,{
+gonryun,118,111,5 script Qian Yuen Shuang#gon 4_M_ORIENT02,{
mes "[Qian Yuen Shuang]";
mes "The chief of this town is a man";
mes "who opens his heart to others.";
@@ -228,7 +228,7 @@ gonryun,118,111,5 script Qian Yuen Shuang#gon 89,{
close;
}
-gonryun,181,161,3 script Jing Wen Zhen#gon 773,{
+gonryun,181,161,3 script Jing Wen Zhen#gon 4_F_TWMIDWOMAN,{
mes "[Jing Wen Zhen]";
mes "The men in our town, Kunlun, are";
mes "all brave and courageous.";
@@ -244,7 +244,7 @@ gonryun,181,161,3 script Jing Wen Zhen#gon 773,{
close;
}
-gonryun,113,135,6 script Gatekeeper#gon 780,{
+gonryun,113,135,6 script Gatekeeper#gon 8_M_TWSOLDIER,{
mes "[Kunlun Guard]";
mes "Welcome.";
mes "This is the residence of Shi Yan Wen, the chief of Kunlun.";
@@ -261,7 +261,7 @@ gonryun,113,135,6 script Gatekeeper#gon 780,{
close;
}
-gonryun,113,127,6 script Gatekeeper#gon2 780,{
+gonryun,113,127,6 script Gatekeeper#gon2 8_M_TWSOLDIER,{
mes "[Kunlun Guard]";
mes "Welcome.";
mes "This is the residence of Shi Yan Wen, the chief of Kunlun.";
@@ -278,7 +278,7 @@ gonryun,113,127,6 script Gatekeeper#gon2 780,{
close;
}
-gon_in,73,82,5 script Ji Chung Zhe#gon 778,{
+gon_in,73,82,5 script Ji Chung Zhe#gon 4_M_TWTEAMAN,{
if (nakha >= 0 && nakha <= 2) {
mes "[Ji Chung Zhe]";
mes "............";
@@ -311,7 +311,7 @@ gon_in,73,82,5 script Ji Chung Zhe#gon 778,{
}
}
-gon_in,173,27,3 script Yu Jiu Xia#gon 774,{
+gon_in,173,27,3 script Yu Jiu Xia#gon 4_M_TWBOY,{
mes "[Yu Jiu Xia]";
mes "Geez, just as I thought.";
mes "They won't sell alcohol to me.";
@@ -327,7 +327,7 @@ gon_in,173,27,3 script Yu Jiu Xia#gon 774,{
close;
}
-gonryun,166,196,3 script Soldier#gon 780,{
+gonryun,166,196,3 script Soldier#gon 8_M_TWSOLDIER,{
if (b_sword < 7) {
mes "[Wa Qiu Wu]";
mes "Let me tell you something";
@@ -388,7 +388,7 @@ gonryun,166,196,3 script Soldier#gon 780,{
close;
}
-gonryun,169,71,3 script Guidev#gon 770,{
+gonryun,169,71,3 script Guidev#gon 4_F_TWGIRL,{
mes "[Li Xi Jiao]";
mes "Welcome to Kunlun!";
mes "Did you enjoy all the incredible";
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index 6c8e8bb55..eb000b1ed 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -29,7 +29,7 @@
// Hugel
//============================================================
-hugel,189,143,5 script Young Man 898,{
+hugel,189,143,5 script Young Man 4_M_HUMAN_01,{
mes "[Young Man]";
mes "Huh. So that giant";
mes "air pouch can make";
@@ -39,7 +39,7 @@ hugel,189,143,5 script Young Man 898,{
close;
}
-hugel,126,151,3 script Emily 90,{
+hugel,126,151,3 script Emily 4_F_01,{
mes "[Emily]";
mes "I feel so blessed to";
mes "live in this quant, little";
@@ -56,7 +56,7 @@ hugel,126,151,3 script Emily 90,{
close;
}
-hugel,86,165,5 script Kayplas 896,{
+hugel,86,165,5 script Kayplas 4_M_HUBOY,{
mes "[Kayplas]";
mes "Ooh, I really want to";
mes "have that red bottle.";
@@ -66,7 +66,7 @@ hugel,86,165,5 script Kayplas 896,{
close;
}
-hugel,71,197,3 script Lisa 90,{
+hugel,71,197,3 script Lisa 4_F_01,{
mes "[Lisa]";
mes "Hugel is a pretty";
mes "small, homely village.";
@@ -83,7 +83,7 @@ hugel,71,197,3 script Lisa 90,{
close;
}
-hugel,169,112,5 script Old Nikki 892,{
+hugel,169,112,5 script Old Nikki 4_F_HUGRANMA,{
mes "[Old Nikki]";
mes "You must not be from";
mes "around here. Ah, you're";
@@ -100,7 +100,7 @@ hugel,169,112,5 script Old Nikki 892,{
close;
}
-hugel,175,115,5 script Marius 897,{
+hugel,175,115,5 script Marius 4_M_HUGRANFA,{
mes "[Marius]";
mes "Yes, I'm an old man, but";
mes "I can lick a whippersnapper";
@@ -120,7 +120,7 @@ hugel,175,115,5 script Marius 897,{
// Inside Hugel
//============================================================
-hu_in01,111,386,4 script Chris 86,{
+hu_in01,111,386,4 script Chris 4_M_04,{
mes "[Chris]";
mes "You know, the people don't";
mes "fight harmful monsters, they";
@@ -136,7 +136,7 @@ hu_in01,111,386,4 script Chris 86,{
close;
}
-hu_in01,23,311,4 script Party Supplies Shop 898,{
+hu_in01,23,311,4 script Party Supplies Shop 4_M_HUMAN_01,{
mes "[Shopkeeper]";
mes "Welcome to the party supplies";
mes "shop!";
@@ -167,7 +167,7 @@ hu_in01,23,311,4 script Party Supplies Shop 898,{
}
}
-hu_in01,18,94,0 script A Part-Timer#1 49,{
+hu_in01,18,94,0 script A Part-Timer#1 1_M_03,{
mes "[Luda]";
mes "Welcome to the";
mes "Shrine Expedition Office.";
@@ -194,7 +194,7 @@ hu_in01,18,94,0 script A Part-Timer#1 49,{
close;
}
-hu_in01,26,77,4 script A Part-Timer#2 50,{
+hu_in01,26,77,4 script A Part-Timer#2 1_M_04,{
mes "^3355FFThis part-timer is";
mes "completely engrossed";
mes "in his task of organizing";
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index 3c330a46e..7355205a0 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -458,7 +458,7 @@
// Inside Izlude
//============================================================
-izlude_in,125,164,2 script Aaron#izlude 65,{
+izlude_in,125,164,2 script Aaron#izlude 1_M_YOUNGKNIGHT,{
mes "[Aaron]";
mes "Don't you think Strong VIT and training in a unique breathing method which enables quick HP recovery are the greatest advantages for a Swordman?";
next;
@@ -500,7 +500,7 @@ izlude_in,125,164,2 script Aaron#izlude 65,{
// Izlude Dungeon
//============================================================
-izlu2dun,108,27,0 script Sailor#2izlude 100,{
+izlu2dun,108,27,0 script Sailor#2izlude 4W_SAILOR,{
mes "[Sailor]";
mes "Wanna";
mes "head back?";
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 140681af0..e9139dacd 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -38,7 +38,7 @@
// Jawaii Transportation
//============================================================
-jawaii,239,112,7 script Mariner#toizu 100,{
+jawaii,239,112,7 script Mariner#toizu 4W_SAILOR,{
mes "[Mariner]";
mes "This ship";
mes "is heading";
@@ -73,7 +73,7 @@ jawaii,239,112,7 script Mariner#toizu 100,{
close;
}
-jawaii,122,263,5 script Mariner#toalbe 100,{
+jawaii,122,263,5 script Mariner#toalbe 4W_SAILOR,{
mes "[Mariner]";
mes "This ship";
mes "is headed back";
@@ -107,7 +107,7 @@ jawaii,122,263,5 script Mariner#toalbe 100,{
// Generic Jawaii NPCs
//============================================================
-jawaii,188,218,7 script Tavern Lady#Jawaii 80,{
+jawaii,188,218,7 script Tavern Lady#Jawaii 1_F_PUBGIRL,{
mes "[Lady]";
mes "Oh, dear!";
mes "You're not going";
@@ -140,7 +140,7 @@ jawaii,188,218,7 script Tavern Lady#Jawaii 80,{
close;
}
-jawaii,220,235,3 script Jawaii Resident#heart 724,{
+jawaii,220,235,3 script Jawaii Resident#heart 4_F_07,{
mes "[Jawa Jawa]";
mes "You know what's";
mes "the most beautiful";
@@ -162,7 +162,7 @@ jawaii,220,235,3 script Jawaii Resident#heart 724,{
close;
}
-jawaii,240,146,5 script Jawaii Resident#desc1 724,{
+jawaii,240,146,5 script Jawaii Resident#desc1 4_F_07,{
mes "[Waii Waii]";
mes "Welcome to Jawaii!";
next;
@@ -175,7 +175,7 @@ jawaii,240,146,5 script Jawaii Resident#desc1 724,{
close;
}
-jawaii,168,247,5 script Jawaii Resident#desc2 724,{
+jawaii,168,247,5 script Jawaii Resident#desc2 4_F_07,{
mes "[Waja Waja]";
mes "Ah, you must be a tourist.";
mes "If you're lost, just head West. Accomodations for newlyweds";
@@ -191,7 +191,7 @@ jawaii,168,247,5 script Jawaii Resident#desc2 724,{
close;
}
-jawaii,165,121,1 script Jawaii Resident#desc3 724,{
+jawaii,165,121,1 script Jawaii Resident#desc3 4_F_07,{
mes "[Iwa Iwa]";
mes "Jawaii~";
mes "Jawa~ii~";
@@ -216,7 +216,7 @@ jawaii,165,121,1 script Jawaii Resident#desc3 724,{
close;
}
-jawaii,141,200,3 script Employee#sroom 798,{
+jawaii,141,200,3 script Employee#sroom 4_M_NFMAN,{
mes "[Alowa]";
mes "W-Welcome...?";
mes "This is o-o-our";
@@ -262,7 +262,7 @@ jawaii,141,200,3 script Employee#sroom 798,{
close;
}
-jawaii,108,199,5 script Employee#antroom 74,{
+jawaii,108,199,5 script Employee#antroom 1_F_MERCHANT_02,{
mes "[Pine Oran]";
mes "Welcome to";
mes "the Antique room.";
@@ -310,7 +310,7 @@ jawaii,108,199,5 script Employee#antroom 74,{
close;
}
-jawaii,107,189,5 script Employee#horoom 93,{
+jawaii,107,189,5 script Employee#horoom 4_F_04,{
mes "[Sharkie Rania]";
mes "I'll take you";
mes "to the Honey Room.";
@@ -341,7 +341,7 @@ jawaii,107,189,5 script Employee#horoom 93,{
close;
}
-jawaii,112,173,7 script Employee#villroom 93,{
+jawaii,112,173,7 script Employee#villroom 4_F_04,{
mes "[Larks Rania]";
mes "Hello dear,";
mes "how are you?";
@@ -386,7 +386,7 @@ jawaii,112,173,7 script Employee#villroom 93,{
close;
}
-jawaii,214,168,5 script Honeymoon Helper#Jawaii 71,{
+jawaii,214,168,5 script Honeymoon Helper#Jawaii 1_F_LIBRARYGIRL,{
mes "[Helper]";
mes "There is no place";
mes "better for having your";
@@ -433,7 +433,7 @@ jawaii,214,168,5 script Honeymoon Helper#Jawaii 71,{
// Inside Jawaii
//============================================================
-jawaii_in,25,94,0 script Employee#jaw1 724,{
+jawaii_in,25,94,0 script Employee#jaw1 4_F_07,{
mes "[Employee Tryteh]";
mes "Welcome to Jawaii Tavern~";
if (getpartnerid()) {
@@ -462,7 +462,7 @@ OnSolo:
end;
}
-jawaii_in,25,96,0 script Employee#jaw2 724,{
+jawaii_in,25,96,0 script Employee#jaw2 4_F_07,{
mes "[Employee Fey]";
mes "Welcome to Jawaii Tavern~";
if (getpartnerid()) {
@@ -492,7 +492,7 @@ OnSolo:
end;
}
-jawaii_in,25,98,0 script Employee#jaw3 724,{
+jawaii_in,25,98,0 script Employee#jaw3 4_F_07,{
mes "[Employee Buffy]";
mes "Welcome to Jawaii Tavern~";
if (getpartnerid()) {
@@ -536,7 +536,7 @@ OnSolo:
end;
}
-jawaii_in,25,100,0 script Employee#jaw4 724,{
+jawaii_in,25,100,0 script Employee#jaw4 4_F_07,{
mes "[Employee Itere]";
mes "Welcome to";
mes "Jawaii Tavern~";
@@ -575,7 +575,7 @@ OnSolo:
end;
}
-jawaii_in,30,94,4 script Employee#jaw5 724,{
+jawaii_in,30,94,4 script Employee#jaw5 4_F_07,{
mes "[Employee Tonia]";
mes "Welcome to Jawaii Tavern~";
if (getpartnerid()) {
@@ -608,7 +608,7 @@ OnSolo:
end;
}
-jawaii_in,30,96,4 script Employee#jaw6 724,{
+jawaii_in,30,96,4 script Employee#jaw6 4_F_07,{
mes "[Employee Kay]";
mes "Welcome to Jawaii Tavern~";
if (getpartnerid()) {
@@ -633,7 +633,7 @@ OnSolo:
end;
}
-jawaii_in,30,98,4 script Employee#jaw7 724,{
+jawaii_in,30,98,4 script Employee#jaw7 4_F_07,{
mes "[Employee Amy]";
mes "Welcome to Jawaii Tavern~";
if (getpartnerid()) {
@@ -667,7 +667,7 @@ OnSolo:
end;
}
-jawaii_in,30,100,4 script Employee#jaw8 724,{
+jawaii_in,30,100,4 script Employee#jaw8 4_F_07,{
mes "[Employee Yasmine]";
mes "Welcome to Jawaii Tavern~";
if (getpartnerid()) {
@@ -715,7 +715,7 @@ OnTouch:
end;
}
-jawaii_in,15,104,0 script Waitress#jawaii 80,{
+jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{
if (checkweight(1201,1) == 0) {
mes "^3355FF * Wait a minute! *";
mes "You're carrying too many items with you right now. Please store some of your things into Kafra Storage and try again.^000000";
@@ -829,7 +829,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 80,{
close;
}
-jawaii_in,28,124,0 script Bartender#jaw 46,{
+jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{
mes "[Bartender]";
mes "Welcome to the";
mes "Jawaii Tavern bar.";
@@ -1114,7 +1114,7 @@ S_KillChar:
return;
}
-jawaii_in,43,115,0 script Customer#jaw_1 97,{
+jawaii_in,43,115,0 script Customer#jaw_1 4W_M_01,{
if (!getpartnerid()) {
if (Zeny > 99) {
mes "[Buchi]";
@@ -1166,7 +1166,7 @@ jawaii_in,43,115,0 script Customer#jaw_1 97,{
close;
}
-jawaii_in,41,106,3 script Customer#Cage 98,{
+jawaii_in,41,106,3 script Customer#Cage 4W_M_02,{
mes "[Cage]";
if (getpartnerid()) {
mes "....Bah!";
@@ -1215,7 +1215,7 @@ jawaii_in,41,106,3 script Customer#Cage 98,{
// Inside Prontera
//============================================================
-prt_in,173,13,4 script Customer#SoloHan 86,{
+prt_in,173,13,4 script Customer#SoloHan 4_M_04,{
mes "[SoloHan]";
if (!getpartnerid()) {
mes "Oh man...";
@@ -1389,7 +1389,7 @@ prt_in,173,13,4 script Customer#SoloHan 86,{
close;
}
-prt_in,170,14,0 script Customer#Bachewcca 89,{
+prt_in,170,14,0 script Customer#Bachewcca 4_M_ORIENT02,{
mes "[Bachewcca]";
mes "..............";
mes "^666666*Gulp....gulp...*^000000";
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt
index 197ef2c68..d4e66a334 100644
--- a/npc/cities/lighthalzen.txt
+++ b/npc/cities/lighthalzen.txt
@@ -12,7 +12,7 @@
//= 2.2 Added missing NPC found in AEGIS files. [L0ne_W0lf]
//=============================================================
-lighthalzen,198,285,5 script Jiwon#zen5 862,{
+lighthalzen,198,285,5 script Jiwon#zen5 4_F_LGTGIRL,{
mes "[Jiwon]";
mes "I think we're really";
mes "fortunate to be able to";
@@ -29,7 +29,7 @@ lighthalzen,198,285,5 script Jiwon#zen5 862,{
close;
}
-lighthalzen,220,244,3 script Samnang#zen2 863,{
+lighthalzen,220,244,3 script Samnang#zen2 4_F_LGTGRAND,{
mes "[Samnang]";
mes "^333333*Sigh...*^000000";
mes "It gets harder for me";
@@ -55,7 +55,7 @@ lighthalzen,220,244,3 script Samnang#zen2 863,{
close;
}
-lighthalzen,261,112,3 script Ruth#zen4 862,{
+lighthalzen,261,112,3 script Ruth#zen4 4_F_LGTGIRL,{
mes "[Ruth]";
mes "Sweety, isn't it";
mes "nice to be together";
@@ -78,7 +78,7 @@ lighthalzen,261,112,3 script Ruth#zen4 862,{
close;
}
-lighthalzen,259,108,7 script Oyoung#zen14 869,{
+lighthalzen,259,108,7 script Oyoung#zen14 4_M_LGTMAN,{
mes "[Oyoung]";
mes "Girl, you look like";
mes "you're comin' down with";
@@ -104,7 +104,7 @@ lighthalzen,259,108,7 script Oyoung#zen14 869,{
close;
}
-lighthalzen,233,121,3 script Kariya#li_01 72,{
+lighthalzen,233,121,3 script Kariya#li_01 1_F_MARIA,{
mes "[Kariya]";
mes "I think ''Lighthalzen'' is";
mes "supposed to mean ''crest of";
@@ -122,7 +122,7 @@ lighthalzen,233,121,3 script Kariya#li_01 72,{
}
-lighthalzen,233,82,5 script Sung#A 716,{
+lighthalzen,233,82,5 script Sung#A 4_M_KID2,{
mes "[Sung]";
mes "When I grow up, I want";
mes "to become such a great";
@@ -147,7 +147,7 @@ lighthalzen,233,82,5 script Sung#A 716,{
close;
}
-lighthalzen,89,73,3 script Sameer#zen15 854,{
+lighthalzen,89,73,3 script Sameer#zen15 4_M_EINMAN2,{
mes "[Sameer]";
mes "There are too many";
mes "loving couples in this city.";
@@ -181,7 +181,7 @@ lighthalzen,89,73,3 script Sameer#zen15 854,{
close;
}
-lighthalzen,45,59,7 script Janice#zen03 863,{
+lighthalzen,45,59,7 script Janice#zen03 4_F_LGTGRAND,{
mes "[Janice]";
mes "Oh no, I think I got";
mes "lost again. The roads";
@@ -192,7 +192,7 @@ lighthalzen,45,59,7 script Janice#zen03 863,{
close;
}
-lighthalzen,66,94,3 script Elmer Keays#li_03 866,{
+lighthalzen,66,94,3 script Elmer Keays#li_03 4_M_LGTGRAND,{
mes "[Elmer Keays]";
mes "Walking side by side";
mes "with you like this reminds";
@@ -211,7 +211,7 @@ lighthalzen,66,94,3 script Elmer Keays#li_03 866,{
close;
}
-lighthalzen,65,94,5 script Margie Keays#li_02 863,{
+lighthalzen,65,94,5 script Margie Keays#li_02 4_F_LGTGRAND,{
mes "[Margie Keays]";
mes "Oh darling, the";
mes "weather is so nice";
@@ -222,7 +222,7 @@ lighthalzen,65,94,5 script Margie Keays#li_02 863,{
close;
}
-lighthalzen,78,120,3 script Maivi#zen1 862,{
+lighthalzen,78,120,3 script Maivi#zen1 4_F_LGTGIRL,{
mes "[Maivi]";
mes "...";
next;
@@ -249,7 +249,7 @@ lighthalzen,78,120,3 script Maivi#zen1 862,{
}
/*
-lighthalzen,226,210,3 script Nannan 86,{
+lighthalzen,226,210,3 script Nannan 4_M_04,{
mes "[Nannan]";
mes "You know, I always thought";
mes "that all Alchemists were bookish,";
@@ -277,7 +277,7 @@ lighthalzen,226,210,3 script Nannan 86,{
}
*/
-lighthalzen,230,182,4 script Klaubis#zen3 866,{
+lighthalzen,230,182,4 script Klaubis#zen3 4_M_LGTGRAND,{
mes "[Klaubis]";
mes "Excuse me, but are you";
mes "a tourist? Well, welcome";
@@ -324,7 +324,7 @@ lighthalzen,230,182,4 script Klaubis#zen3 866,{
}
}
-lighthalzen,232,156,3 script Sigmund#zen3 869,{
+lighthalzen,232,156,3 script Sigmund#zen3 4_M_LGTMAN,{
mes "[Sigmund Ting]";
mes "You know what I noticed?";
mes "The guards at the border";
@@ -342,7 +342,7 @@ lighthalzen,232,156,3 script Sigmund#zen3 869,{
close;
}
-lighthalzen,190,134,5 script Joyce#zen 862,{
+lighthalzen,190,134,5 script Joyce#zen 4_F_LGTGIRL,{
mes "[Joyce]";
mes "I can sense your";
mes "longing look within";
@@ -352,7 +352,7 @@ lighthalzen,190,134,5 script Joyce#zen 862,{
close;
}
-lighthalzen,191,134,3 script Dan Song#zen2 869,{
+lighthalzen,191,134,3 script Dan Song#zen2 4_M_LGTMAN,{
mes "[Dan Song]";
mes "Those eyes of yours...";
mes "So pure and so deep,";
@@ -361,7 +361,7 @@ lighthalzen,191,134,3 script Dan Song#zen2 869,{
close;
}
-lighthalzen,115,159,3 script Collins#zen1 866,{
+lighthalzen,115,159,3 script Collins#zen1 4_M_LGTGRAND,{
mes "[Collins]";
mes "I really wish that my";
mes "son will be able to join";
@@ -379,7 +379,7 @@ lighthalzen,115,159,3 script Collins#zen1 866,{
close;
}
-lighthalzen,77,157,5 script Villagomez#li_01 866,{
+lighthalzen,77,157,5 script Villagomez#li_01 4_M_LGTGRAND,{
mes "[Villagomez]";
mes "I just step out to get";
mes "a haircut and now I'm";
@@ -389,7 +389,7 @@ lighthalzen,77,157,5 script Villagomez#li_01 866,{
close;
}
-lighthalzen,125,68,5 script Kemp#zen13 97,{
+lighthalzen,125,68,5 script Kemp#zen13 4W_M_01,{
mes "[Kemp]";
mes "Have you ever seen the";
mes "people who work in that big";
@@ -405,7 +405,7 @@ lighthalzen,125,68,5 script Kemp#zen13 97,{
close;
}
-lighthalzen,138,50,7 script Mauro#zen3 847,{
+lighthalzen,138,50,7 script Mauro#zen3 4_M_EINOLD,{
mes "[Mauro]";
mes "The youth in this city";
mes "have no appreciation for";
@@ -424,7 +424,7 @@ lighthalzen,138,50,7 script Mauro#zen3 847,{
close;
}
-lighthalzen,132,103,5 script Sefith#li_01 734,{
+lighthalzen,132,103,5 script Sefith#li_01 4_M_JOB_KNIGHT2,{
mes "[Sefith]";
mes "Good looks. Intelligence.";
mes "Excellent manners. A strong,";
@@ -441,7 +441,7 @@ lighthalzen,132,103,5 script Sefith#li_01 734,{
close;
}
-lighthalzen,239,64,5 script Jade#zen2 862,{
+lighthalzen,239,64,5 script Jade#zen2 4_F_LGTGIRL,{
mes "[Jade]";
mes "I've heard that there's a";
mes "strange kingdom out there";
@@ -467,7 +467,7 @@ lighthalzen,239,64,5 script Jade#zen2 862,{
close;
}
-lighthalzen,205,208,4 script Greedy Looking Man#li_01 853,{
+lighthalzen,205,208,4 script Greedy Looking Man#li_01 4_M_YURI,{
mes "[Khramptd]";
mes "The land around here";
mes "is some pretty expensive";
@@ -478,7 +478,7 @@ lighthalzen,205,208,4 script Greedy Looking Man#li_01 853,{
close;
}
-lhz_in02,34,212,4 script Maggie#05 91,{
+lhz_in02,34,212,4 script Maggie#05 4_F_02,{
mes "[Maggie]";
mes "Sure, I sell a lot";
mes "of flowers here, but";
@@ -496,7 +496,7 @@ lhz_in02,34,212,4 script Maggie#05 91,{
close;
}
-lighthalzen,202,94,5 script Wallace#zen2 847,{
+lighthalzen,202,94,5 script Wallace#zen2 4_M_EINOLD,{
mes "[Wallace]";
mes "......";
mes "That lady, working";
@@ -513,7 +513,7 @@ lighthalzen,202,94,5 script Wallace#zen2 847,{
close;
}
-lighthalzen,182,102,3 script Lucius#zen5 866,{
+lighthalzen,182,102,3 script Lucius#zen5 4_M_LGTGRAND,{
if (Zeny < 90000) {
mes "[Lucius]";
mes "Hello youngster~";
@@ -610,7 +610,7 @@ lighthalzen,182,102,3 script Lucius#zen5 866,{
close;
}
-lighthalzen,147,105,3 script Laqumet#li_02 869,{
+lighthalzen,147,105,3 script Laqumet#li_02 4_M_LGTMAN,{
mes "[Laqumet]";
mes "Sure, manliness is quite";
mes "attractive, but I think women";
@@ -628,7 +628,7 @@ lighthalzen,147,105,3 script Laqumet#li_02 869,{
close;
}
-lhz_in02,242,172,1 script Hotel Employee#zen3 868,{
+lhz_in02,242,172,1 script Hotel Employee#zen3 4_M_LGTGUARD,{
mes "[Hotel Employee]";
mes "If you are experiencing";
mes "any sort of inconvenience,";
@@ -645,7 +645,7 @@ lhz_in02,242,172,1 script Hotel Employee#zen3 868,{
close;
}
-lhz_in02,210,189,3 script Christopher Michael#zen 849,{
+lhz_in02,210,189,3 script Christopher Michael#zen 4_M_DIEMAN,{
mes "[Christopher Michael]";
mes "OoooOoh~";
mes "Soooo comfortable.";
@@ -655,7 +655,7 @@ lhz_in02,210,189,3 script Christopher Michael#zen 849,{
close;
}
-lhz_in02,201,181,7 script Safwat Fahmy 853,{
+lhz_in02,201,181,7 script Safwat Fahmy 4_M_YURI,{
mes "[Safwat Fahmy]";
mes "This hotel is nice";
mes "and comfortable, but";
@@ -681,7 +681,7 @@ lhz_in02,201,181,7 script Safwat Fahmy 853,{
close;
}
-lhz_in02,251,212,3 script Hotel Employee#zen2 868,{
+lhz_in02,251,212,3 script Hotel Employee#zen2 4_M_LGTGUARD,{
mes "[Hotel Employee]";
mes "This is the Couple Suite.";
mes "A single can also check";
@@ -691,7 +691,7 @@ lhz_in02,251,212,3 script Hotel Employee#zen2 868,{
close;
}
-lhz_in02,229,217,3 script Tanoue#zen04 863,{
+lhz_in02,229,217,3 script Tanoue#zen04 4_F_LGTGRAND,{
mes "[Tanoue]";
mes "This chair looks";
mes "very nice, but it really";
@@ -707,7 +707,7 @@ lhz_in02,229,217,3 script Tanoue#zen04 863,{
close;
}
-lhz_in02,209,277,5 script Ben Allen#zen11 84,{
+lhz_in02,209,277,5 script Ben Allen#zen11 4_M_02,{
mes "[Ben Allen]";
mes "Aaahhh Oooooh~";
mes "It's sooooo comfy~";
@@ -724,7 +724,7 @@ lhz_in02,209,277,5 script Ben Allen#zen11 84,{
close;
}
-lhz_in02,221,276,1 script Harp#zen8 869,{
+lhz_in02,221,276,1 script Harp#zen8 4_M_LGTMAN,{
mes "[Harp]";
mes "Oh sweet jiminy...";
mes "That Kafra Lady is so hot.";
@@ -741,7 +741,7 @@ lhz_in02,221,276,1 script Harp#zen8 869,{
close;
}
-lhz_in02,238,275,5 script Hotel Employee#zen1 869,{
+lhz_in02,238,275,5 script Hotel Employee#zen1 4_M_LGTMAN,{
mes "[Hotel Employee]";
mes "''Hospitality with a smile";
mes "and total devotion to your";
@@ -752,7 +752,7 @@ lhz_in02,238,275,5 script Hotel Employee#zen1 869,{
close;
}
-lhz_in02,247,275,1 script Hotel Employee#zen4 868,{
+lhz_in02,247,275,1 script Hotel Employee#zen4 4_M_LGTGUARD,{
mes "[Hotel Employee]";
mes "Welcome to the";
mes "Royal Dragon Hotel Bar.";
@@ -769,7 +769,7 @@ lhz_in02,247,275,1 script Hotel Employee#zen4 868,{
close;
}
-lhz_in02,271,281,2 script Citizen#amano09 47,{
+lhz_in02,271,281,2 script Citizen#amano09 1_M_01,{
mes "[Hachi]";
mes "Oh yeah. I love-love-love";
mes "bars. If I don't come here";
@@ -786,7 +786,7 @@ lhz_in02,271,281,2 script Citizen#amano09 47,{
close;
}
-lhz_in02,277,285,4 script Bartender#amano07 61,{
+lhz_in02,277,285,4 script Bartender#amano07 1_M_PUBMASTER,{
mes "[Duff]";
mes "Hey, you're from";
mes "Rune-Midgarts, right?";
@@ -797,7 +797,7 @@ lhz_in02,277,285,4 script Bartender#amano07 61,{
close;
}
-lhz_in02,281,280,6 script Customer#amano13 816,{
+lhz_in02,281,280,6 script Customer#amano13 4_F_CHNDRESS2,{
mes "[Rona]";
mes "I hate it when guys";
mes "just sidle up and sort";
@@ -814,7 +814,7 @@ lhz_in02,281,280,6 script Customer#amano13 816,{
close;
}
-lhz_in02,287,282,4 script Customer#amano10 853,{
+lhz_in02,287,282,4 script Customer#amano10 4_M_YURI,{
mes "[Greenfield]";
mes "I don't believe it...";
mes "This unlucky streak";
@@ -833,7 +833,7 @@ lhz_in02,287,282,4 script Customer#amano10 853,{
close;
}
-lhz_in02,287,273,3 script Customer#amano11 50,{
+lhz_in02,287,273,3 script Customer#amano11 1_M_04,{
mes "[Terry]";
mes "I'm not big on drinking,";
mes "but the atmosphere in this";
@@ -850,7 +850,7 @@ lhz_in02,287,273,3 script Customer#amano11 50,{
close;
}
-lhz_in02,283,276,4 script Customer#amano12 815,{
+lhz_in02,283,276,4 script Customer#amano12 4_F_CHNDRESS1,{
mes "[Sei]";
mes "You see that guy?";
mes "That guy over there is";
@@ -876,7 +876,7 @@ lhz_in02,283,276,4 script Customer#amano12 815,{
close;
}
-lighthalzen,123,212,4 script Merpi#zen2 700,{
+lighthalzen,123,212,4 script Merpi#zen2 8_F_GIRL,{
mes "[Merpi]";
mes "Isn't the weather nice";
mes "today? All this sunlight";
@@ -920,7 +920,7 @@ lighthalzen,123,212,4 script Merpi#zen2 700,{
}
}
-lighthalzen,296,239,3 script Berru#lhz_01 706,{
+lighthalzen,296,239,3 script Berru#lhz_01 4_M_KID1,{
switch(rand(1,3)) {
case 1:
mes "[Berru]";
@@ -994,9 +994,9 @@ lighthalzen,296,239,3 script Berru#lhz_01 706,{
}
}
-lighthalzen,297,239,3 duplicate(Berru#lhz_01) Pilia#lhz_01 818
+lighthalzen,297,239,3 duplicate(Berru#lhz_01) Pilia#lhz_01 4_F_CHNWOMAN
-lighthalzen,312,233,3 script Beggar#lhz_02 777,3,1,{
+lighthalzen,312,233,3 script Beggar#lhz_02 4_M_TWOLDMAN,3,1,{
end;
OnTouch:
@@ -1203,7 +1203,7 @@ OnTouch:
close;
}
-lighthalzen,311,194,3 script Reuben#lhz_02 870,{
+lighthalzen,311,194,3 script Reuben#lhz_02 4_M_LGTPOOR,{
if (rand(1,2)) {
mes "[Reuben]";
mes "Someday...";
@@ -1231,7 +1231,7 @@ lighthalzen,311,194,3 script Reuben#lhz_02 870,{
close;
}
-lighthalzen,306,324,3 script Shengwen#zen7 870,{
+lighthalzen,306,324,3 script Shengwen#zen7 4_M_LGTPOOR,{
mes "[Shengwen]";
mes "Am I just getting";
mes "paranoid? I really";
@@ -1250,7 +1250,7 @@ lighthalzen,306,324,3 script Shengwen#zen7 870,{
close;
}
-lhz_in03,26,167,5 script Shayna#li 850,{
+lhz_in03,26,167,5 script Shayna#li 4_F_EINWOMAN,{
mes "[Shayna]";
mes "^333333*Sigh...*^000000";
mes "Oh, you poor";
@@ -1258,7 +1258,7 @@ lhz_in03,26,167,5 script Shayna#li 850,{
close;
}
-lhz_in01,134,45,3 script Cenku Dekdam#delic 869,{
+lhz_in01,134,45,3 script Cenku Dekdam#delic 4_M_LGTMAN,{
mes "[Cenku Dekdam]";
mes "Man, if you were";
mes "gonna take this whole";
@@ -1275,7 +1275,7 @@ lhz_in01,134,45,3 script Cenku Dekdam#delic 869,{
close;
}
-lighthalzen,330,276,3 script Nun#light 79,{
+lighthalzen,330,276,3 script Nun#light 1_F_PRIEST,{
mes "[Angela]";
mes "Greetings, adventurer.";
mes "I'm Angela, a social";
@@ -1299,7 +1299,7 @@ lighthalzen,330,276,3 script Nun#light 79,{
close;
}
-lighthalzen,337,296,3 script Employee 867,{
+lighthalzen,337,296,3 script Employee 4_M_LGTGUARD2,{
if (hg_tre > 54) {
mes "[Rekenber Employee]";
mes "Greetings. As part of our";
@@ -1321,7 +1321,7 @@ lighthalzen,337,296,3 script Employee 867,{
end;
}
-lhz_in01,134,38,3 script Bankri Kun#kagun 798,{
+lhz_in01,134,38,3 script Bankri Kun#kagun 4_M_NFMAN,{
mes "[Bankri Kun]";
mes "Must work...";
mes "Must focus...";
@@ -1347,7 +1347,7 @@ lhz_in01,134,38,3 script Bankri Kun#kagun 798,{
close;
}
-lhz_in01,139,40,7 script Enoz#oz 53,{
+lhz_in01,139,40,7 script Enoz#oz 1_M_INNKEEPER,{
mes "[Enoz]";
mes "So, the novel I ordered from";
mes "the Rune-Midgarts Kingdom";
@@ -1365,7 +1365,7 @@ lhz_in01,139,40,7 script Enoz#oz 53,{
close;
}
-lhz_in01,124,28,3 script Ellette#tre 66,{
+lhz_in01,124,28,3 script Ellette#tre 1_F_01,{
mes "[Ellette]";
mes "...";
next;
@@ -1402,7 +1402,7 @@ lhz_in01,124,28,3 script Ellette#tre 66,{
close;
}
-lhz_in01,125,40,3 script Dowbow Ryuei#ryusei 843,{
+lhz_in01,125,40,3 script Dowbow Ryuei#ryusei 4_M_THAIONGBAK,{
mes "[Dowbow Ryuei]";
mes "Just out of, oh I dunno,";
mes "curiosity, which word do";
@@ -1427,7 +1427,7 @@ lhz_in01,125,40,3 script Dowbow Ryuei#ryusei 843,{
close;
}
-lhz_in01,125,46,3 script Leekal#lackee 849,{
+lhz_in01,125,46,3 script Leekal#lackee 4_M_DIEMAN,{
mes "[Leekal]";
mes "So... Very broke.";
mes "Why did I spend so much";
@@ -1445,7 +1445,7 @@ lhz_in01,125,46,3 script Leekal#lackee 849,{
close;
}
-lhz_in01,116,53,7 script Ninjose#nina 841,{
+lhz_in01,116,53,7 script Ninjose#nina 4_M_THAIAYO,{
mes "[Ninjose]";
mes "At long last, I've finally";
mes "bought my own home. You";
@@ -1456,7 +1456,7 @@ lhz_in01,116,53,7 script Ninjose#nina 841,{
close;
}
-lhz_in01,116,39,7 script Kejulle Rekenber#reken 822,{
+lhz_in01,116,39,7 script Kejulle Rekenber#reken 4_M_CHNMAN,{
mes "[Kejulle Rekenber]";
mes "Hm? Sure, my last name";
mes "is Rekenber and that's the";
@@ -1467,7 +1467,7 @@ lhz_in01,116,39,7 script Kejulle Rekenber#reken 822,{
close;
}
-lhz_in01,110,40,3 script Jorjerro#fhero 89,{
+lhz_in01,110,40,3 script Jorjerro#fhero 4_M_ORIENT02,{
mes "^3355FFThis man here";
mes "is motionless,";
mes "and for all intents";
@@ -1476,7 +1476,7 @@ lhz_in01,110,40,3 script Jorjerro#fhero 89,{
close;
}
-lhz_in01,116,45,7 script Joshua#aya 704,{
+lhz_in01,116,45,7 script Joshua#aya 4_M_BIBI,{
mes "[Joshua]";
mes "What am I doing here?";
mes "Waiting for my dream";
@@ -1493,7 +1493,7 @@ lhz_in01,116,45,7 script Joshua#aya 704,{
close;
}
-lighthalzen,326,249,5 script Grinnel#zen6 870,{
+lighthalzen,326,249,5 script Grinnel#zen6 4_M_LGTPOOR,{
mes "[Grinnel]";
mes "You know the men in";
mes "black suits? Boy, did";
@@ -1519,7 +1519,7 @@ lighthalzen,326,249,5 script Grinnel#zen6 870,{
close;
}
-lhz_in03,192,19,3 script Haggar#zen1 855,{
+lhz_in03,192,19,3 script Haggar#zen1 4_M_EINMAN,{
mes "[Haggar]";
mes "Whiskey!";
mes "I need me some";
@@ -1533,7 +1533,7 @@ lhz_in03,192,19,3 script Haggar#zen1 855,{
close;
}
-lhz_in03,193,25,2 script Bartender#12 61,{
+lhz_in03,193,25,2 script Bartender#12 1_M_PUBMASTER,{
mes "[Tony]";
if (Sex) {
mes "Hey man, I know this";
@@ -1565,7 +1565,7 @@ lhz_in03,193,25,2 script Bartender#12 61,{
close;
}
-lhz_in03,185,20,6 script Bad Drunk#amano06 869,2,2,{
+lhz_in03,185,20,6 script Bad Drunk#amano06 4_M_LGTMAN,2,2,{
mes "[Garry]";
mes "Hey! Hey you...!";
mes "D'you wanna, you";
@@ -1583,7 +1583,7 @@ lhz_in03,185,20,6 script Bad Drunk#amano06 869,2,2,{
close;
}
-lhz_in03,186,29,7 script Bad Drunk#12 869,{
+lhz_in03,186,29,7 script Bad Drunk#12 4_M_LGTMAN,{
mes "[Bonse]";
mes "*Hiccup* I loooove";
mes "this rum! I caught a cold";
@@ -1602,7 +1602,7 @@ lhz_in03,186,29,7 script Bad Drunk#12 869,{
close;
}
-lhz_in02,265,273,6 script Lab Staff#amano08 865,{
+lhz_in02,265,273,6 script Lab Staff#amano08 4_LGTSCIENCE,{
mes "[Assam]";
mes "This place is nice";
mes "and usually pretty quiet.";
@@ -1619,7 +1619,7 @@ lhz_in02,265,273,6 script Lab Staff#amano08 865,{
close;
}
-lhz_in03,192,93,3 script City Girl#amano05 862,{
+lhz_in03,192,93,3 script City Girl#amano05 4_F_LGTGIRL,{
mes "[Lanko]";
mes "Oh, I'm only here";
mes "working as a waitress";
@@ -1638,7 +1638,7 @@ lhz_in03,192,93,3 script City Girl#amano05 862,{
close;
}
-lhz_in03,189,87,5 script Drunken Man#amano01 869,{
+lhz_in03,189,87,5 script Drunken Man#amano01 4_M_LGTMAN,{
mes "[Enku]";
mes "*Sob* I just got";
mes "dumped! Yeah, I thought";
@@ -1656,7 +1656,7 @@ lhz_in03,189,87,5 script Drunken Man#amano01 869,{
close;
}
-lhz_in03,183,82,7 script Drunken Man#amano02 870,{
+lhz_in03,183,82,7 script Drunken Man#amano02 4_M_LGTPOOR,{
mes "[Linus]";
mes "After ten years";
mes "of marriage. My";
@@ -1672,7 +1672,7 @@ lhz_in03,183,82,7 script Drunken Man#amano02 870,{
close;
}
-lhz_in03,180,83,6 script Citizen#amano03 86,{
+lhz_in03,180,83,6 script Citizen#amano03 4_M_04,{
mes "[Mitchell]";
mes "You know, everyone";
mes "is different, but I think";
@@ -1696,7 +1696,7 @@ lhz_in03,180,83,6 script Citizen#amano03 86,{
close;
}
-lhz_in03,176,85,5 script Citizen#amano04 869,{
+lhz_in03,176,85,5 script Citizen#amano04 4_M_LGTMAN,{
mes "[Dique]";
mes "One of the things I look";
mes "forward to during my day";
@@ -1714,7 +1714,7 @@ lhz_in03,176,85,5 script Citizen#amano04 869,{
close;
}
-lhz_in03,184,38,3 script Loudmouth 55,{
+lhz_in03,184,38,3 script Loudmouth 1_M_JOBTESTER,{
mes "[Loudmouth]";
mes "Do you know who I am?!";
mes "Just look at this peg leg.";
@@ -1729,7 +1729,7 @@ lhz_in03,184,38,3 script Loudmouth 55,{
close;
}
-lhz_in01,173,28,4 script Guard#01::LhzRekGuard 868,{
+lhz_in01,173,28,4 script Guard#01::LhzRekGuard 4_M_LGTGUARD,{
mes "[Guard]";
mes "This is a";
mes "restricted area.";
@@ -1740,9 +1740,9 @@ lhz_in01,173,28,4 script Guard#01::LhzRekGuard 868,{
close;
}
-lhz_in01,180,28,4 duplicate(LhzRekGuard) Guard#03 868
+lhz_in01,180,28,4 duplicate(LhzRekGuard) Guard#03 4_M_LGTGUARD
-lhz_in01,72,209,5 script Guide#lt0 862,{
+lhz_in01,72,209,5 script Guide#lt0 4_F_LGTGIRL,{
mes "[Lasoei]";
mes "Oh phooey.";
mes "The same customers";
@@ -1758,7 +1758,7 @@ lhz_in01,72,209,5 script Guide#lt0 862,{
close;
}
-lhz_in01,72,195,0 script Guide#lt1 90,{
+lhz_in01,72,195,0 script Guide#lt1 4_F_01,{
mes "[Geonuii]";
mes "Greetings. This path";
mes "leads to the Library and";
@@ -1769,14 +1769,14 @@ lhz_in01,72,195,0 script Guide#lt1 90,{
close;
}
-lhz_in01,73,188,0 script Guide#lt2 862,{
+lhz_in01,73,188,0 script Guide#lt2 4_F_LGTGIRL,{
mes "[Bonnie]";
mes "Oh no...";
mes "Where did I put it?";
close;
}
-lhz_in01,35,226,5 script Rekenber Guard#li01 867,{
+lhz_in01,35,226,5 script Rekenber Guard#li01 4_M_LGTGUARD2,{
if (isequipped(2241) && isequipped(2243)) {
mes "[Rekenber Guard]";
mes "^3355FF(Whoa, it's a member";
@@ -1806,7 +1806,7 @@ lhz_in01,35,226,5 script Rekenber Guard#li01 867,{
close;
}
-lhz_in01,23,132,3 script Rekenber Guard#li02 867,5,5,{
+lhz_in01,23,132,3 script Rekenber Guard#li02 4_M_LGTGUARD2,5,5,{
OnTouch:
if (isequipped(2241) && isequipped(2243)) {
mes "[Rekenber Guard]";
@@ -1830,7 +1830,7 @@ OnTouch:
end;
}
-lhz_in01,217,121,3 script Repairman#li_01 851,{
+lhz_in01,217,121,3 script Repairman#li_01 4_M_REPAIR,{
if (isequipped(2241) && isequipped(2243)) {
mes "[Repairman]";
mes "No wonder these things";
@@ -1860,7 +1860,7 @@ lhz_in01,217,121,3 script Repairman#li_01 851,{
}
}
-lhz_in01,203,123,3 script Scientist#li_02 750,{
+lhz_in01,203,123,3 script Scientist#li_02 4_M_ALCHE_C,{
if (isequipped(2241) && isequipped(2243)) {
mes "[Scientist]";
mes "Alright. Pull one test";
@@ -1890,7 +1890,7 @@ lhz_in01,203,123,3 script Scientist#li_02 750,{
end;
}
-lhz_in01,199,137,3 script Scientist#li_03 865,{
+lhz_in01,199,137,3 script Scientist#li_03 4_LGTSCIENCE,{
if (isequipped(2241) && isequipped(2243)) {
mes "[Scientist]";
mes "Whoa whoa~!";
@@ -1912,7 +1912,7 @@ lhz_in01,199,137,3 script Scientist#li_03 865,{
end;
}
-lhz_in01,46,125,3 script Rekenber Guard#li03 867,5,5,{
+lhz_in01,46,125,3 script Rekenber Guard#li03 4_M_LGTGUARD2,5,5,{
OnTouch:
if (isequipped(2241) && isequipped(2243)) {
mes "[Rekenber Guard]";
@@ -1936,7 +1936,7 @@ OnTouch:
end;
}
-lhz_in01,25,141,4 script Regenschirm Guard 868,{
+lhz_in01,25,141,4 script Regenschirm Guard 4_M_LGTGUARD,{
mes "[Regenschirm Guard]";
if(isequipped(2241) && isequipped(2243)){
@@ -1975,7 +1975,7 @@ lhz_in01,25,141,4 script Regenschirm Guard 868,{
// Lighthalzen Bank Area ------------------------------------------------------
-lhz_in02,34,41,1 script Arthur#zen16 849,{
+lhz_in02,34,41,1 script Arthur#zen16 4_M_DIEMAN,{
mes "[Arthur]";
mes "The chairs here are";
mes "so not ergonomic. And";
@@ -1986,7 +1986,7 @@ lhz_in02,34,41,1 script Arthur#zen16 849,{
close;
}
-lhz_in02,28,39,3 script Helen#zen6 703,{
+lhz_in02,28,39,3 script Helen#zen6 4_F_KID2,{
mes "[Helen]";
mes "You know, maybe when";
mes "I grow up, I'll be a bank";
@@ -1996,7 +1996,7 @@ lhz_in02,28,39,3 script Helen#zen6 703,{
close;
}
-lhz_in02,31,34,3 script Tadem#zen6 847,{
+lhz_in02,31,34,3 script Tadem#zen6 4_M_EINOLD,{
mes "[Tadem]";
mes "I do so enjoy the";
mes "architectural structure";
@@ -2007,7 +2007,7 @@ lhz_in02,31,34,3 script Tadem#zen6 847,{
close;
}
-lhz_in02,31,33,3 script Gracie#5 863,{
+lhz_in02,31,33,3 script Gracie#5 4_F_LGTGRAND,{
mes "[Gracie]";
mes "Oh, it's so comfortable";
mes "in here~ Though, why are";
@@ -2026,7 +2026,7 @@ lhz_in02,31,33,3 script Gracie#5 863,{
close;
}
-lhz_in02,21,38,7 script Bank Clerk#1::BankClerk 86,{
+lhz_in02,21,38,7 script Bank Clerk#1::BankClerk 4_M_04,{
mes "[Bank Clerk]";
mes "Due to some critical system";
mes "errors, all of the bank services";
@@ -2035,12 +2035,12 @@ lhz_in02,21,38,7 script Bank Clerk#1::BankClerk 86,{
close;
}
-lhz_in02,21,25,7 duplicate(BankClerk) Bank Clerk#2 86
-lhz_in02,34,22,1 duplicate(BankClerk) Bank Clerk#3 755
+lhz_in02,21,25,7 duplicate(BankClerk) Bank Clerk#2 4_M_04
+lhz_in02,34,22,1 duplicate(BankClerk) Bank Clerk#3 4_M_SAGE_C
// Lightalzen Prison Area -------------------------------------------------------------
-lhz_in02,145,177,0 script Togii#07 849,{
+lhz_in02,145,177,0 script Togii#07 4_M_DIEMAN,{
mes "[Togii]";
mes "Oooh yeah...";
mes "Goes down smooth.";
@@ -2050,7 +2050,7 @@ lhz_in02,145,177,0 script Togii#07 849,{
close;
}
-lhz_in02,159,198,7 script Healthy Looking Guy#hol 85,{
+lhz_in02,159,198,7 script Healthy Looking Guy#hol 4_M_03,{
mes "[Healthy Looking Guy]";
mes "Grrrrrr! Leave me alone!";
mes "How many times do I have";
@@ -2060,7 +2060,7 @@ lhz_in02,159,198,7 script Healthy Looking Guy#hol 85,{
close;
}
-lhz_in02,157,201,6 script Hinkley#06 870,{
+lhz_in02,157,201,6 script Hinkley#06 4_M_LGTPOOR,{
mes "[Hinkley]";
mes "Meh heh heh...";
mes "^333333*Hiccup*^000000 Believe";
@@ -2076,7 +2076,7 @@ lhz_in02,157,201,6 script Hinkley#06 870,{
close;
}
-lhz_in02,153,206,4 script Millette#05 853,{
+lhz_in02,153,206,4 script Millette#05 4_M_YURI,{
mes "[Millette]";
mes "Let me go!";
mes "Let me GO!!";
@@ -2095,7 +2095,7 @@ lhz_in02,153,206,4 script Millette#05 853,{
close;
}
-lhz_in02,147,222,3 script Officer Guo#06::off_guo 85,{
+lhz_in02,147,222,3 script Officer Guo#06::off_guo 4_M_03,{
mes "[Officer Guo]";
mes "Tell me...!";
mes "TELL ME...!!";
@@ -2168,11 +2168,11 @@ lhz_in02,147,222,3 script Officer Guo#06::off_guo 85,{
close;
}
-lhz_in02,142,222,6 duplicate(off_guo) Suspect#6 870
+lhz_in02,142,222,6 duplicate(off_guo) Suspect#6 4_M_LGTPOOR
// New -----------------------------------------------------------------------
-lhz_in01,14,28,3 script Banquet Staff 109,{
+lhz_in01,14,28,3 script Banquet Staff 4_M_MANAGER,{
mes "[Banquet Staff]";
mes "This Banquet Hall is used";
mes "to hold events such as dinner";
@@ -2191,7 +2191,7 @@ lhz_in01,14,28,3 script Banquet Staff 109,{
close;
}
-lhz_in01,43,52,3 script Luccet#li_party 703,{
+lhz_in01,43,52,3 script Luccet#li_party 4_F_KID2,{
mes "[Luccet]";
mes "Shhhh! Hey, my brother's";
mes "''it,'' so I gotta find a place";
@@ -2202,7 +2202,7 @@ lhz_in01,43,52,3 script Luccet#li_party 703,{
close;
}
-lhz_in01,28,33,7 script Hanccet#li_party 706,{
+lhz_in01,28,33,7 script Hanccet#li_party 4_M_KID1,{
mes "[Hanccet]";
mes "Man... I hate being ''it!''";
mes "I'm horrible at this game!";
@@ -2213,7 +2213,7 @@ lhz_in01,28,33,7 script Hanccet#li_party 706,{
close;
}
-lhz_in01,21,50,7 script Annette#li_party 91,{
+lhz_in01,21,50,7 script Annette#li_party 4_F_02,{
mes "[Annette]";
mes "I've heard that the";
mes "Rekenber Banquet Hall";
@@ -2230,7 +2230,7 @@ lhz_in01,21,50,7 script Annette#li_party 91,{
close;
}
-lhz_in01,129,54,1 script Mereth#erem 869,{
+lhz_in01,129,54,1 script Mereth#erem 4_M_LGTMAN,{
mes "^3355FF*Shhhhhhzzzz*";
mes "*Shhhhhhzzzz*^000000";
next;
@@ -2248,14 +2248,14 @@ lhz_in01,129,54,1 script Mereth#erem 869,{
close;
}
-lhz_in01,108,53,3 script #horri 111,{
+lhz_in01,108,53,3 script #horri HIDDEN_NPC,{
mes "^3355FFThis is simply a pile";
mes "of files, a smattering of";
mes "books and a family portrait.^000000";
close;
}
-lhz_in01,108,47,3 script #never 111,{
+lhz_in01,108,47,3 script #never HIDDEN_NPC,{
mes "^3355FFThis desk is very";
mes "neat and well organized";
mes "in comparison to the other";
@@ -2265,7 +2265,7 @@ lhz_in01,108,47,3 script #never 111,{
close;
}
-lhz_in01,166,55,3 script #crazy4u 111,{
+lhz_in01,166,55,3 script #crazy4u HIDDEN_NPC,{
mes "^3355FFThis desk has a bookshelf";
mes "that is crammed with all sorts";
mes "of books. Out of curiosity, you";
@@ -2279,7 +2279,7 @@ lhz_in01,166,55,3 script #crazy4u 111,{
close;
}
-lhz_in01,148,45,3 script Noama#amano 97,{
+lhz_in01,148,45,3 script Noama#amano 4W_M_01,{
mes "[Noama]";
mes "Hee hee~!";
mes "You wanna hear";
@@ -2301,7 +2301,7 @@ lhz_in01,148,45,3 script Noama#amano 97,{
close;
}
-lhz_in01,147,40,1 script Mazwon#minus1 828,{
+lhz_in01,147,40,1 script Mazwon#minus1 4_M_ROGUE,{
mes "[Mazwon]";
mes "Crap. Crap! Crap";
mes "crap crap crap crap!";
@@ -2321,7 +2321,7 @@ lhz_in01,147,40,1 script Mazwon#minus1 828,{
close;
}
-lhz_in01,157,47,1 script Mareth#seram 797,{
+lhz_in01,157,47,1 script Mareth#seram 4_M_NFLOSTMAN,{
mes "[Mareth]";
mes "Yoo hoo hoo~";
mes "Oh, how I love";
@@ -2336,7 +2336,7 @@ lhz_in01,157,47,1 script Mareth#seram 797,{
close;
}
-lhz_in01,164,45,3 script Eiya#iaiai 91,{
+lhz_in01,164,45,3 script Eiya#iaiai 4_F_02,{
mes "[Eiya]";
mes "Jorje seems so cranky";
mes "recently. He's usually";
@@ -2352,7 +2352,7 @@ lhz_in01,164,45,3 script Eiya#iaiai 91,{
close;
}
-lhz_in01,135,57,3 script Blackboard#li 111,{
+lhz_in01,135,57,3 script Blackboard#li HIDDEN_NPC,{
mes "^3355FFYou found a blackboard";
mes "filled with scribbling. You";
mes "can only read some of the";
@@ -2382,7 +2382,7 @@ lhz_in01,135,57,3 script Blackboard#li 111,{
close;
}
-lhz_in03,100,18,3 script Rocky#li_house 81,{
+lhz_in03,100,18,3 script Rocky#li_house 4_DOG01,{
if (rand(1,2) == 1) {
mes "[Rocky]";
mes "Woof woof!";
@@ -2393,7 +2393,7 @@ lhz_in03,100,18,3 script Rocky#li_house 81,{
close;
}
-lhz_in03,130,41,5 script Jay#li_house 706,{
+lhz_in03,130,41,5 script Jay#li_house 4_M_KID1,{
mes "[Jay]";
mes "My mommy and daddy";
mes "always come home late.";
@@ -2408,7 +2408,7 @@ lhz_in03,130,41,5 script Jay#li_house 706,{
close;
}
-lhz_in03,129,22,7 script Housemaid Jane#li_house1 850,{
+lhz_in03,129,22,7 script Housemaid Jane#li_house1 4_F_EINWOMAN,{
mes "[Housemaid Jane]";
mes "This house is enormous...";
mes "It's clearly much too big";
@@ -2425,7 +2425,7 @@ lhz_in03,129,22,7 script Housemaid Jane#li_house1 850,{
close;
}
-lhz_in03,124,117,1 script Housemaid Brenda#li 74,{
+lhz_in03,124,117,1 script Housemaid Brenda#li 1_F_MERCHANT_02,{
mes "[Housemaid Brenda]";
mes "I better dust extra";
mes "gently around this vase.";
@@ -2435,7 +2435,7 @@ lhz_in03,124,117,1 script Housemaid Brenda#li 74,{
close;
}
-lighthalzen,159,222,1 script Rekenber Employee#li 109,{
+lighthalzen,159,222,1 script Rekenber Employee#li 4_M_MANAGER,{
mes "[Benatuth]";
mes "Down there, the repairman";
mes "is just finishing maintenance";
@@ -2453,7 +2453,7 @@ lighthalzen,159,222,1 script Rekenber Employee#li 109,{
close;
}
-lighthalzen,162,304,7 script Rekenber Guard Drew#li 868,{
+lighthalzen,162,304,7 script Rekenber Guard Drew#li 4_M_LGTGUARD,{
mes "[Rekenber Guard Drew]";
mes "Dude, check it out~";
mes "Official glossy photos";
@@ -2488,7 +2488,7 @@ lighthalzen,162,304,7 script Rekenber Guard Drew#li 868,{
close;
}
-lighthalzen,163,306,3 script Rekenber Guard Tan#li 867,{
+lighthalzen,163,306,3 script Rekenber Guard Tan#li 4_M_LGTGUARD2,{
mes "[Rekenber Guard Tan]";
mes "Whoa, whoa. Now this...";
mes "This is art. The lighting,";
@@ -2510,7 +2510,7 @@ lighthalzen,163,306,3 script Rekenber Guard Tan#li 867,{
close;
}
-lighthalzen,70,227,4 script Delna#li_reken 102,{
+lighthalzen,70,227,4 script Delna#li_reken 8_F,{
mes "[Delna]";
mes "Sometimes the simple";
mes "pleasures can give you";
@@ -2528,7 +2528,7 @@ lighthalzen,70,227,4 script Delna#li_reken 102,{
close;
}
-lhz_in02,289,277,3 script Martial Artist#1 753,{
+lhz_in02,289,277,3 script Martial Artist#1 4_M_MONK,{
mes "[Martial Artist]";
mes "Curses...";
mes "I've come to the";
@@ -2547,7 +2547,7 @@ lhz_in02,289,277,3 script Martial Artist#1 753,{
close;
}
-lighthalzen,107,107,3 script Kosit#zen1 869,{
+lighthalzen,107,107,3 script Kosit#zen1 4_M_LGTMAN,{
mes "[Kosit]";
mes "This city might have";
mes "more guards and rules";
@@ -2571,7 +2571,7 @@ lighthalzen,107,107,3 script Kosit#zen1 869,{
close;
}
-lhz_in03,32,99,3 script Sopheap#zen1 863,{
+lhz_in03,32,99,3 script Sopheap#zen1 4_F_LGTGRAND,{
mes "[Sopheap]";
mes "Oh, you youngsters.";
mes "Always traveling around";
@@ -2588,7 +2588,7 @@ lhz_in03,32,99,3 script Sopheap#zen1 863,{
close;
}
-lhz_in03,25,105,5 script Gopal#zen4 869,{
+lhz_in03,25,105,5 script Gopal#zen4 4_M_LGTMAN,{
mes "[Gopal]";
mes "Granny may be happy";
mes "just sitting around and";
@@ -2605,7 +2605,7 @@ lhz_in03,25,105,5 script Gopal#zen4 869,{
close;
}
-lighthalzen,176,65,5 script Kimmy#zen3 862,{
+lighthalzen,176,65,5 script Kimmy#zen3 4_F_LGTGIRL,{
mes "[Kimmy]";
mes "Unlike most places,";
mes "Lighthalzen has many";
@@ -2624,7 +2624,7 @@ lighthalzen,176,65,5 script Kimmy#zen3 862,{
close;
}
-lighthalzen,364,282,3 script Bodger#zen5 870,{
+lighthalzen,364,282,3 script Bodger#zen5 4_M_LGTPOOR,{
mes "[Bodger]";
mes "Another hungry day...";
mes "I don't have any money";
@@ -2642,7 +2642,7 @@ lighthalzen,364,282,3 script Bodger#zen5 870,{
close;
}
-lhz_in03,239,38,3 script Avetis#zen10 849,{
+lhz_in03,239,38,3 script Avetis#zen10 4_M_DIEMAN,{
mes "[Avetis]";
mes "A-ack...";
mes "^333333*Cough cough*^000000";
@@ -2661,7 +2661,7 @@ lhz_in03,239,38,3 script Avetis#zen10 849,{
close;
}
-lhz_in02,267,25,4 script Diana#npc 747,{
+lhz_in02,267,25,4 script Diana#npc 4_F_ROGUE,{
mes "[Diana]";
mes "Oh wow, that weapon";
mes "is fantastic! But I'm sure";
@@ -2721,7 +2721,7 @@ lhz_in02,267,25,4 script Diana#npc 747,{
close;
}
-lhz_in02,267,22,1 script Shop Assistant#cobo 91,{
+lhz_in02,267,22,1 script Shop Assistant#cobo 4_F_02,{
mes "[Shop Assistant]";
mes "Welcome to our";
mes "store where we offer";
@@ -2739,7 +2739,7 @@ lhz_in02,267,22,1 script Shop Assistant#cobo 91,{
close;
}
-lighthalzen,192,63,4 script Sergei#zen1 92,{
+lighthalzen,192,63,4 script Sergei#zen1 4_F_03,{
mes "[Sergei]";
mes "You know, there's an";
mes "interesting story about";
@@ -2780,7 +2780,7 @@ lighthalzen,192,63,4 script Sergei#zen1 92,{
close;
}
-lighthalzen,258,223,3 script Srinivas#zen4 866,{
+lighthalzen,258,223,3 script Srinivas#zen4 4_M_LGTGRAND,{
mes "[Srinivas]";
mes "Those rundown buildings";
mes "in the slums are an eyesore";
@@ -2791,7 +2791,7 @@ lighthalzen,258,223,3 script Srinivas#zen4 866,{
close;
}
-lighthalzen,77,203,3 script Victor Perfecto#zen9 869,{
+lighthalzen,77,203,3 script Victor Perfecto#zen9 4_M_LGTMAN,{
mes "[Victor Perfecto]";
mes "I've heard that the";
mes "Rekenber Corporation";
@@ -2817,7 +2817,7 @@ lighthalzen,77,203,3 script Victor Perfecto#zen9 869,{
close;
}
-lighthalzen,40,107,4 script Vergil#zen4 869,{
+lighthalzen,40,107,4 script Vergil#zen4 4_M_LGTMAN,{
mes "[Vergil]";
mes "The weather is so";
mes "nice today, like always.";
@@ -2900,7 +2900,7 @@ lighthalzen,40,107,4 script Vergil#zen4 869,{
}
}
-lhz_in01,144,53,3 script Jorje#zero 98,1,1,{
+lhz_in01,144,53,3 script Jorje#zero 4W_M_02,1,1,{
OnTouch:
switch(rand(1,3)) {
case 1:
@@ -2938,7 +2938,7 @@ OnTouch:
end;
}
-lhz_in01,139,48,7 script Leimi#mimir 73,{
+lhz_in01,139,48,7 script Leimi#mimir 1_F_MERCHANT_01,{
mes "[Leimi]";
mes "...";
mes "......";
@@ -2986,7 +2986,7 @@ OnTouch:
end;
}
-lhz_in02,36,274,4 script Cool Event Staff#Saera 831,{
+lhz_in02,36,274,4 script Cool Event Staff#Saera 4_F_ZONDAGIRL,{
mes "[Saera]";
mes "Welcome to the";
mes "temporary headquarters";
@@ -3064,7 +3064,7 @@ lhz_in02,36,274,4 script Cool Event Staff#Saera 831,{
}
}
-lhz_in02,40,280,6 script Event Planner 833,{
+lhz_in02,40,280,6 script Event Planner 4_M_ZONDAOYAJI,{
mes "[Jellarin]";
mes "I don't like this.";
mes "But I don't like that";
@@ -3080,7 +3080,7 @@ lhz_in02,40,280,6 script Event Planner 833,{
close;
}
-lhz_in02,110,286,5 script Cool Event Manager 853,{
+lhz_in02,110,286,5 script Cool Event Manager 4_M_YURI,{
mes "[Baoto]";
mes "Hmmm...";
mes "The employees seem";
@@ -3098,7 +3098,7 @@ lhz_in02,110,286,5 script Cool Event Manager 853,{
close;
}
-lhz_in02,36,284,0 script Cool Event Staff#Cesuna 874,{
+lhz_in02,36,284,0 script Cool Event Staff#Cesuna 4_M_ZONDAMAN,{
mes "[Cesuna]";
mes "Ack! I'm totally";
mes "swamped with all this";
@@ -3116,7 +3116,7 @@ lhz_in02,36,284,0 script Cool Event Staff#Cesuna 874,{
}
/*
-lhz_in02,19,274,2 script Maintenance Guy#lhz 851,{
+lhz_in02,19,274,2 script Maintenance Guy#lhz 4_M_REPAIR,{
mes "[Kudiuu]";
mes "Holy...!";
mes "Will this place";
@@ -3128,7 +3128,7 @@ lhz_in02,19,274,2 script Maintenance Guy#lhz 851,{
}
*/
-lighthalzen,337,296,3 script Rekenber Employee#li_2 868,{
+lighthalzen,337,296,3 script Rekenber Employee#li_2 4_M_LGTGUARD,{
if (hg_tre > 54) {
mes "[Rekenber Employee]";
mes "Greetings. As part of our";
@@ -3149,7 +3149,7 @@ lighthalzen,337,296,3 script Rekenber Employee#li_2 868,{
}
}
-lhz_in01,221,131,7 script Scientist#li_01 865,{
+lhz_in01,221,131,7 script Scientist#li_01 4_LGTSCIENCE,{
if (isequipped(2241) && isequipped(2243)) {
if (hg_tre > 54) {
mes "[A Scientist]";
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index bcac70d9d..adb01b867 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -95,7 +95,7 @@
}
}
-lou_fild01,190,100,7 script Girl#1lou 815,{
+lou_fild01,190,100,7 script Girl#1lou 4_F_CHNDRESS1,{
mes "[Girl]";
mes "Would you";
mes "like to go back";
@@ -135,7 +135,7 @@ lou_fild01,190,100,7 script Girl#1lou 815,{
// Generic Louyang NPCs
//============================================================
-louyang,297,167,2 script Muscular Woman#lou 815,{
+louyang,297,167,2 script Muscular Woman#lou 4_F_CHNDRESS1,{
if (!Sex) {
mes "[Zhi Ching Li]";
mes "All the members of the Maiden Palace, including myself and our master, are all female.";
@@ -158,7 +158,7 @@ louyang,297,167,2 script Muscular Woman#lou 815,{
close;
}
-louyang,274,136,4 script Powerful-looking guy#lou 819,{
+louyang,274,136,4 script Powerful-looking guy#lou 4_M_CHN8GUEK,{
mes "[Akiira]";
mes "I am practicing my 'Claw of Dragon.' I not only need to use the power of my fists, I must also condition myself spiritually.";
next;
@@ -180,7 +180,7 @@ louyang,274,136,4 script Powerful-looking guy#lou 819,{
close;
}
-louyang,276,136,4 script Fist master#lou 819,{
+louyang,276,136,4 script Fist master#lou 4_M_CHN8GUEK,{
mes "[Zhiang Xiau Ji]";
mes "Finally...";
mes "I have mastered";
@@ -205,7 +205,7 @@ louyang,276,136,4 script Fist master#lou 819,{
close;
}
-louyang,276,133,0 script Trainee#1lou::LouTrainee 819,{
+louyang,276,133,0 script Trainee#1lou::LouTrainee 4_M_CHN8GUEK,{
mes "[Trainee]";
mes "Yeeeyap~!";
mes "Taaaaaah~~!!";
@@ -213,7 +213,7 @@ louyang,276,133,0 script Trainee#1lou::LouTrainee 819,{
close;
}
-louyang,276,131,0 script Trainee#2lou 819,{
+louyang,276,131,0 script Trainee#2lou 4_M_CHN8GUEK,{
mes "[Trainee]";
mes "Tah Tah Tah!";
mes "Taaaaaah~~!!";
@@ -221,14 +221,14 @@ louyang,276,131,0 script Trainee#2lou 819,{
close;
}
-louyang,276,129,0 script Trainee#3lou 819,{
+louyang,276,129,0 script Trainee#3lou 4_M_CHN8GUEK,{
mes "[Trainee]";
mes "Si!";
mes "Ayah!!";
close;
}
-louyang,274,133,0 script Trainee#4lou 819,{
+louyang,274,133,0 script Trainee#4lou 4_M_CHN8GUEK,{
mes "[Trainee]";
mes "Dergh!";
mes "Dergh!";
@@ -236,7 +236,7 @@ louyang,274,133,0 script Trainee#4lou 819,{
close;
}
-louyang,274,131,0 script Trainee#5lou 819,{
+louyang,274,131,0 script Trainee#5lou 4_M_CHN8GUEK,{
mes "[Trainee]";
mes "Yah Yah Yah!";
mes "Taaaaaah~~!!";
@@ -244,7 +244,7 @@ louyang,274,131,0 script Trainee#5lou 819,{
close;
}
-louyang,274,129,0 script Trainee#6lou 819,{
+louyang,274,129,0 script Trainee#6lou 4_M_CHN8GUEK,{
mes "[Trainee]";
mes "Yeeeyap~!";
mes "Taaaaaah~~!!";
@@ -252,16 +252,16 @@ louyang,274,129,0 script Trainee#6lou 819,{
close;
}
-louyang,278,133,0 duplicate(LouTrainee) Trainee#7lou 819
-louyang,278,131,0 duplicate(LouTrainee) Trainee#8lou 819
-louyang,278,129,0 duplicate(LouTrainee) Trainee#9lou 819
-louyang,272,133,0 duplicate(LouTrainee) Trainee#10lou 819
-louyang,272,131,0 duplicate(LouTrainee) Trainee#11lou 819
-louyang,272,129,0 duplicate(LouTrainee) Trainee#12lou 819
+louyang,278,133,0 duplicate(LouTrainee) Trainee#7lou 4_M_CHN8GUEK
+louyang,278,131,0 duplicate(LouTrainee) Trainee#8lou 4_M_CHN8GUEK
+louyang,278,129,0 duplicate(LouTrainee) Trainee#9lou 4_M_CHN8GUEK
+louyang,272,133,0 duplicate(LouTrainee) Trainee#10lou 4_M_CHN8GUEK
+louyang,272,131,0 duplicate(LouTrainee) Trainee#11lou 4_M_CHN8GUEK
+louyang,272,129,0 duplicate(LouTrainee) Trainee#12lou 4_M_CHN8GUEK
// Louyang Viewing Tower
//============================================================
-lou_in01,25,23,5 script Friendly Looking Lady#lo 817,{
+lou_in01,25,23,5 script Friendly Looking Lady#lo 4_F_CHNDRESS3,{
mes "[Hong Miao]";
mes "Welcome.";
next;
@@ -304,7 +304,7 @@ lou_in01,25,23,5 script Friendly Looking Lady#lo 817,{
}
}
-louyang,84,254,0 script Exit#lou 111,{
+louyang,84,254,0 script Exit#lou HIDDEN_NPC,{
mes "^3355FFThere is some sort";
mes "of descent apparatus.";
mes "Would you like to use it?^000000";
diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt
index df9e0960d..49070d7d1 100644
--- a/npc/cities/lutie.txt
+++ b/npc/cities/lutie.txt
@@ -19,7 +19,7 @@
// Teleport to Lutie
//============================================================
-aldebaran,223,222,4 script Mr. Claus 718,{
+aldebaran,223,222,4 script Mr. Claus 4_M_SANTA,{
mes "[Mr. Claus]";
mes "Ho Ho Ho~";
mes "Merry Christmas!!";
@@ -68,7 +68,7 @@ aldebaran,223,222,4 script Mr. Claus 718,{
// Inside Lutie
//============================================================
-xmas_in,100,96,4 script Santa Claus 718,{
+xmas_in,100,96,4 script Santa Claus 4_M_SANTA,{
mes "[Santa Claus]";
mes "Ho Ho Ho~";
mes "Meeeerry Christmas !!";
@@ -89,7 +89,7 @@ xmas_in,100,96,4 script Santa Claus 718,{
close;
}
-xmas_in,167,173,4 script Duffle 711,{
+xmas_in,167,173,4 script Duffle 4_F_05,{
if (xmas_npc == 1) {
mes "[Duffle]";
mes "Merry Christmas!";
@@ -149,7 +149,7 @@ xmas_in,167,173,4 script Duffle 711,{
}
}
-xmas_in,27,103,4 script Lenient Aunt 701,{
+xmas_in,27,103,4 script Lenient Aunt 4_F_GODEMOM,{
switch (xmas_npc) {
case 5:
mes "[Thachentze]";
@@ -274,7 +274,7 @@ xmas_in,27,103,4 script Lenient Aunt 701,{
// Lutie
//============================================================
-xmas,117,304,4 script Poze 713,{
+xmas,117,304,4 script Poze 4_M_06,{
if (xmas_npc == 3 || xmas_npc == 4) {
mes "[Poze]";
mes "You've gone to";
@@ -318,7 +318,7 @@ xmas,117,304,4 script Poze 713,{
}
}
-xmas,176,236,4 script Uncle Hairy 712,{
+xmas,176,236,4 script Uncle Hairy 4_M_05,{
if (xmas_npc == 4) {
if (countitem(1024) > 0 && countitem(938) > 0) {
mes "[Cantata]";
@@ -451,7 +451,7 @@ xmas,176,236,4 script Uncle Hairy 712,{
}
}
-xmas,134,112,4 script Snowman 710,{
+xmas,134,112,4 script Snowman 4_M_SNOWMAN,{
if (checkweight(1201,1) == 0 ) {
cutin "rutie_snownow01.bmp",2;
mes "- Wait a minute !! -";
@@ -768,7 +768,7 @@ xmas,134,112,4 script Snowman 710,{
}
}
-xmas,146,136,4 script Hashokii 715,{
+xmas,146,136,4 script Hashokii 4_M_PIERROT,{
mes "[Hashokii]";
mes "Meeee~RrrrrYYYY Christmas~!";
mes "La La La~!";
@@ -842,7 +842,7 @@ xmas,146,136,4 script Hashokii 715,{
}
}
-xmas,206,168,4 script Little Boy 706,{
+xmas,206,168,4 script Little Boy 4_M_KID1,{
if (xmas_npc == 9) {
mes "[Charu Charu]";
mes "Errrm?";
@@ -884,7 +884,7 @@ xmas,206,168,4 script Little Boy 706,{
}
}
-xmas,208,168,4 script Little Girl 703,{
+xmas,208,168,4 script Little Girl 4_F_KID2,{
if (xmas_npc == 9 || xmas_npc == 10) {
switch(xmas_npc) {
case 9:
diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt
index c51bfd22c..77c5306ed 100644
--- a/npc/cities/manuk.txt
+++ b/npc/cities/manuk.txt
@@ -15,7 +15,7 @@
//============================================================
// cat_enhance
-manuk,304,195,5 script Soldier#ep13pa829 454,{
+manuk,304,195,5 script Soldier#ep13pa829 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Food Provider]";
mes "The Manuk family subsists mostly on refining Gray Hollows that were burried a long time ago deep down under the ground.";
@@ -28,7 +28,7 @@ manuk,304,195,5 script Soldier#ep13pa829 454,{
}
}
-manuk,274,239,5 script Soldier#ep13_2 455,{
+manuk,274,239,5 script Soldier#ep13_2 4_MAN_PIOM2,{
if (isequipped(2782) == 1) {
mes "[Injured Manuk Soldier]";
mes "I can't absorb Bradium Essence anymore because of my fatal injury.";
@@ -48,7 +48,7 @@ manuk,274,239,5 script Soldier#ep13_2 455,{
}
}
-manuk,107,233,5 script Soldier#ep13_3 454,{
+manuk,107,233,5 script Soldier#ep13_3 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Anxious Soldier]";
mes "Hurry, I am in big trouble. I lost all the Manuk Coins. I think I dropped them somewhere on the snowfield. Gosh, I saw them right before I fell asleep!";
@@ -62,7 +62,7 @@ manuk,107,233,5 script Soldier#ep13_3 454,{
}
// ep13_2_hiki
-manuk,100,100,3 script Piom 454,{
+manuk,100,100,3 script Piom 4_MAN_PIOM,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Piom]";
mes "You are... tiny. But you don't seem like a Fairy.";
@@ -81,7 +81,7 @@ manuk,100,100,3 script Piom 454,{
}
}
-manuk,188,216,3 script Benknee#ep13_2_1 449,{
+manuk,188,216,3 script Benknee#ep13_2_1 4_MAN_BENKUNI,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Benknee]";
mes "What brings you here?";
@@ -108,7 +108,7 @@ manuk,188,216,3 script Benknee#ep13_2_1 449,{
}
}
-manuk,169,260,3 script Piom#ep13_2_1 455,{
+manuk,169,260,3 script Piom#ep13_2_1 4_MAN_PIOM2,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Piom]";
mes "We, Saphas are always together!";
@@ -127,7 +127,7 @@ manuk,169,260,3 script Piom#ep13_2_1 455,{
}
}
-manuk,218,163,3 script Galtun#ep13_2_1 450,{
+manuk,218,163,3 script Galtun#ep13_2_1 4_MAN_GALTUN,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Galtun]";
mes "Recently, tiny things have been flying around.";
@@ -155,7 +155,7 @@ manuk,218,163,3 script Galtun#ep13_2_1 450,{
}
}
-manuk,266,199,5 script Galtun#ep13_2_2 450,{
+manuk,266,199,5 script Galtun#ep13_2_2 4_MAN_GALTUN,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Galtun]";
mes "I can relax now that we have those piles of Bradium.";
@@ -172,7 +172,7 @@ manuk,266,199,5 script Galtun#ep13_2_2 450,{
}
}
-manuk,225,129,5 script Benknee#ep13_2_2 449,{
+manuk,225,129,5 script Benknee#ep13_2_2 4_MAN_BENKUNI,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Benknee]";
mes "Huh? Who?? Who are you??";
@@ -191,7 +191,7 @@ manuk,225,129,5 script Benknee#ep13_2_2 449,{
}
}
-manuk,286,147,3 script Piom#ep13_2_2 454,{
+manuk,286,147,3 script Piom#ep13_2_2 4_MAN_PIOM,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Piom]";
mes "I'll never forget the deep-rooted rancor against those traitors.";
@@ -218,7 +218,7 @@ manuk,286,147,3 script Piom#ep13_2_2 454,{
}
}
-manuk,183,185,5 script Piom#ep13_2_3 454,{
+manuk,183,185,5 script Piom#ep13_2_3 4_MAN_PIOM,{
set tongyeok,Ring_Of_Wise_King;
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Piom]";
@@ -248,7 +248,7 @@ manuk,183,185,5 script Piom#ep13_2_3 454,{
}
}
-manuk,256,143,3 script Galtun#ep13_2_3 450,{
+manuk,256,143,3 script Galtun#ep13_2_3 4_MAN_GALTUN,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Galtun]";
mes "I will devote myself to";
@@ -265,7 +265,7 @@ manuk,256,143,3 script Galtun#ep13_2_3 450,{
}
}
-manuk,245,124,3 script Piom#ep13_2_4 455,{
+manuk,245,124,3 script Piom#ep13_2_4 4_MAN_PIOM2,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Piom]";
mes "Human, you think our battle is stupid, don't you?";
@@ -288,7 +288,7 @@ manuk,245,124,3 script Piom#ep13_2_4 455,{
}
// ep13_2_npc
-man_in01,346,135,0 script Worker#ep13bsg1 454,{
+man_in01,346,135,0 script Worker#ep13bsg1 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Worker]";
mes "It is dangerous if the valve is not checked properly every day.";
@@ -305,7 +305,7 @@ man_in01,346,135,0 script Worker#ep13bsg1 454,{
}
}
-man_in01,393,134,3 script Worker#ep13bsg2 454,{
+man_in01,393,134,3 script Worker#ep13bsg2 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Worker]";
mes "What!! Wh.. Oh... I... I didn't fall asleep!!";
@@ -320,7 +320,7 @@ man_in01,393,134,3 script Worker#ep13bsg2 454,{
}
}
-man_in01,377,143,5 script Worker#ep13bsg3 454,{
+man_in01,377,143,5 script Worker#ep13bsg3 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Worker]";
mes "Hmm... It's working just fine... No probems at all...";
@@ -333,7 +333,7 @@ man_in01,377,143,5 script Worker#ep13bsg3 454,{
}
}
-man_in01,333,128,5 script Worker#ep13bsg4 454,{
+man_in01,333,128,5 script Worker#ep13bsg4 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Worker]";
mes "My eyesight is getting weaker these days.";
@@ -346,7 +346,7 @@ man_in01,333,128,5 script Worker#ep13bsg4 454,{
}
}
-man_in01,336,128,5 script Worker#ep13bsg5 454,{
+man_in01,336,128,5 script Worker#ep13bsg5 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Worker]";
mes "Isn't this fabulous?";
@@ -359,7 +359,7 @@ man_in01,336,128,5 script Worker#ep13bsg5 454,{
}
}
-man_in01,283,288,3 script Worker#ep13bsg6 454,{
+man_in01,283,288,3 script Worker#ep13bsg6 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Worker]";
mes "It is fortunate to have lots of fine quality Bradium today.";
@@ -379,7 +379,7 @@ man_in01,283,288,3 script Worker#ep13bsg6 454,{
}
// ep13_2_tre
-manuk,103,354,5 script Manuk Galtun#door1 450,{
+manuk,103,354,5 script Manuk Galtun#door1 4_MAN_GALTUN,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Manuk Galtun]";
mes "Here is Manuk where the Sapha who is descendant of Hwergelmir lives.";
@@ -392,7 +392,7 @@ manuk,103,354,5 script Manuk Galtun#door1 450,{
}
}
-manuk,122,354,3 script Manuk Galtun#door2 450,{
+manuk,122,354,3 script Manuk Galtun#door2 4_MAN_GALTUN,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Manuk Galtun]";
mes "Here is Manuk where the Sapha who is descendant of Hwergelmir lives.";
@@ -405,7 +405,7 @@ manuk,122,354,3 script Manuk Galtun#door2 450,{
}
}
-manuk,99,334,5 script Manuk Piom#tre1 460,{
+manuk,99,334,5 script Manuk Piom#tre1 4_MAN_PIOM3,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Manuk Piom]";
mes "Galtuns are brave Sapha warriors.";
@@ -426,7 +426,7 @@ manuk,99,334,5 script Manuk Piom#tre1 460,{
}
}
-manuk,103,311,3 script Manuk Piom#tre2 455,{
+manuk,103,311,3 script Manuk Piom#tre2 4_MAN_PIOM2,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Manuk Piom]";
mes "My leg...";
@@ -441,7 +441,7 @@ manuk,103,311,3 script Manuk Piom#tre2 455,{
}
}
-manuk,194,189,3 script Manuk Galtun#tre3 450,{
+manuk,194,189,3 script Manuk Galtun#tre3 4_MAN_GALTUN,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Manuk Galtun]";
mes "Welcome to Manuk.";
@@ -451,7 +451,7 @@ manuk,194,189,3 script Manuk Galtun#tre3 450,{
end;
}
-manuk,293,203,3 script Manuk Piom#tre4 454,{
+manuk,293,203,3 script Manuk Piom#tre4 4_MAN_PIOM,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Manuk Piom]";
mes "Hey, Be careful!";
@@ -468,7 +468,7 @@ manuk,293,203,3 script Manuk Piom#tre4 454,{
}
}
-manuk,253,173,3 script Manuk Benknee#tre5 449,{
+manuk,253,173,3 script Manuk Benknee#tre5 4_MAN_BENKUNI,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Manuk Benknee]";
mes "Can you see that statue?";
@@ -486,7 +486,7 @@ manuk,253,173,3 script Manuk Benknee#tre5 449,{
}
// ep12_2_dailybs
-manuk,251,180,5 script Young Villager#ep13bs 454,{
+manuk,251,180,5 script Young Villager#ep13bs 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Young Villager]";
mes "It's past the time of our date, why isn't she here yet!!?";
@@ -499,7 +499,7 @@ manuk,251,180,5 script Young Villager#ep13bs 454,{
}
}
-man_in01,360,137,5 script Mechanic#ep13bs 454,{
+man_in01,360,137,5 script Mechanic#ep13bs 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Mechanic]";
mes "Alien races are not allowed to enter.";
@@ -514,7 +514,7 @@ man_in01,360,137,5 script Mechanic#ep13bs 454,{
}
}
-man_in01,68,187,0 script Worker#ep13bs1 454,{
+man_in01,68,187,0 script Worker#ep13bs1 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Worker]";
mes "Hmm, it smells delicious.";
@@ -535,7 +535,7 @@ man_in01,68,187,0 script Worker#ep13bs1 454,{
}
}
-man_in01,74,181,3 script Worker#ep13bs2 454,{
+man_in01,74,181,3 script Worker#ep13bs2 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
mes "[Worker]";
mes "Chef Cook, how many plates should I put down?";
@@ -548,7 +548,7 @@ man_in01,74,181,3 script Worker#ep13bs2 454,{
}
}
-man_in01,227,280,5 script Scientist#ep13bs 449,{
+man_in01,227,280,5 script Scientist#ep13bs 4_MAN_BENKUNI,{
if (isequipped(2782) == 1) {
mes "[Scientist]";
mes "Is there only one way we can survive..?";
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index 6060a2555..d2afe9d8d 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -27,7 +27,7 @@
// Morroc
//============================================================
-morocc,150,120,5 script Soldier - Morroc#01::MocSoldier 707,3,3,{
+morocc,150,120,5 script Soldier - Morroc#01::MocSoldier 4_M_MOC_SOLDIER,3,3,{
mes "[Morroc Soldier]";
mes "Hey, you! Stop there.";
next;
@@ -44,7 +44,7 @@ OnTouch:
close;
}
-morocc,202,244,0 script Volunteer - Morroc#01 745,{
+morocc,202,244,0 script Volunteer - Morroc#01 4_F_CRU,{
mes "[Morroc Volunteer]";
mes "After that terrible incident wiped out the entire Morroc, Rune-Midgard Kingdom has gathered us valunteers to help restorations.";
next;
@@ -53,7 +53,7 @@ morocc,202,244,0 script Volunteer - Morroc#01 745,{
close;
}
-morocc,88,133,3 script Volunteer - Morroc#02 748,{
+morocc,88,133,3 script Volunteer - Morroc#02 4_M_ALCHE_A,{
mes "[Morroc Volunteer]";
mes "We're... We're flooded with work...";
next;
@@ -66,7 +66,7 @@ morocc,88,133,3 script Volunteer - Morroc#02 748,{
close;
}
-morocc,202,110,0 script Volunteer - Morroc#03 730,{
+morocc,202,110,0 script Volunteer - Morroc#03 4_M_JOB_ASSASSIN,{
mes "[Morroc Volunteer]";
mes "We're still unable to estimate the overall damage.";
next;
@@ -78,7 +78,7 @@ morocc,202,110,0 script Volunteer - Morroc#03 730,{
close;
}
-morocc,268,287,3 script Volunteer - Morroc#04 727,{
+morocc,268,287,3 script Volunteer - Morroc#04 4_F_JOB_HUNTER,{
mes "[Morroc Volunteer]";
mes "As bad as it seems, we can't even ask for more support.";
mes "This sure must be the worst thing ever happened in Rune-Midgard's history.";
@@ -88,7 +88,7 @@ morocc,268,287,3 script Volunteer - Morroc#04 727,{
close;
}
-morocc,37,287,0 script Volunteer - Morroc#05 79,{
+morocc,37,287,0 script Volunteer - Morroc#05 1_F_PRIEST,{
mes "[Morroc Volunteer]";
mes "The town's all shattered, but the real problem is the towners.";
next;
@@ -100,7 +100,7 @@ morocc,37,287,0 script Volunteer - Morroc#05 79,{
close;
}
-morocc,223,102,0 script Volunteer - Morroc#06::MocVolunteer 741,{
+morocc,223,102,0 script Volunteer - Morroc#06::MocVolunteer 2_M_BARD_ORIENT,{
mes "[Morroc Volunteer]";
mes "Ugh.. It's kinda spooky, here.. Even this dry wind of the desert seems to have a dark nature.";
next;
@@ -139,9 +139,9 @@ morocc,223,102,0 script Volunteer - Morroc#06::MocVolunteer 741,{
close;
}
-morocc,226,102,4 duplicate(MocVolunteer) Volunteer - Morroc#07 726
+morocc,226,102,4 duplicate(MocVolunteer) Volunteer - Morroc#07 4_F_JOB_BLACKSMITH
-moc_ruins,123,154,0 script Young Man#moc01 99,{
+moc_ruins,123,154,0 script Young Man#moc01 4W_M_03,{
mes "[Young Man]";
mes "The town's completely destroyed, but that giant triangular structure hasn't been harmed at all. Maybe it's protected by some kinda special power.";
next;
@@ -159,7 +159,7 @@ moc_ruins,123,154,0 script Young Man#moc01 99,{
close;
}
-moc_ruins,128,153,0 script Grampa#moc 61,{
+moc_ruins,128,153,0 script Grampa#moc 1_M_PUBMASTER,{
mes "[Old Scholar]";
mes "I've devoted my life to researching the mysterious pyramids near Morroc. I haven't been able to concretely confirm anything yet, but...";
next;
@@ -168,7 +168,7 @@ moc_ruins,128,153,0 script Grampa#moc 61,{
close;
}
-moc_ruins,132,144,0 script Wolf Young Man#moc 85,{
+moc_ruins,132,144,0 script Wolf Young Man#moc 4_M_03,{
mes "[Young Man]";
mes "I remember I said the bandits of desert are the desert wolves.. Those bastards always roam around in a bunch and they would get so cruel and outrageous if one of them got attacked.";
next;
@@ -181,7 +181,7 @@ moc_ruins,132,144,0 script Wolf Young Man#moc 85,{
close;
}
-moc_ruins,115,144,3 script Muka Young Man#moc 83,{
+moc_ruins,115,144,3 script Muka Young Man#moc 4_M_01,{
mes "[Young Man]";
mes "I work in the trading business, so I always have to cross the hot, dry Morroc Desert on business.";
next;
@@ -200,7 +200,7 @@ moc_ruins,115,144,3 script Muka Young Man#moc 83,{
close;
}
-moc_ruins,109,138,0 script Diamond Young Man#moc 99,{
+moc_ruins,109,138,0 script Diamond Young Man#moc 4W_M_03,{
mes "[Young Man]";
mes "The undisputed queen of jewels has to be the Diamond. After looking at it just once, no one can deny its beauty.";
next;
@@ -218,7 +218,7 @@ moc_ruins,109,138,0 script Diamond Young Man#moc 99,{
close;
}
-morocc,54,251,0 script Young Man#moc02 89,{
+morocc,54,251,0 script Young Man#moc02 4_M_ORIENT02,{
mes "[Drunken Young Man]";
mes "Wait a second..! Are you perhaps an adventurer? Welcome! How's your trip?";
mes "Heh heh~ Let me tell you a story. You know I just got out of that Tavern, there, huh?";
@@ -238,7 +238,7 @@ morocc,54,251,0 script Young Man#moc02 89,{
close;
}
-moc_ruins,94,117,0 script Pale Looking Young Man 48,{
+moc_ruins,94,117,0 script Pale Looking Young Man 1_M_02,{
mes "[Pale-looking Young Man]";
mes "... That day... I saw the bloody moon in the sky. It was too silent that it felt so spooky.";
next;
@@ -259,7 +259,7 @@ moc_ruins,94,117,0 script Pale Looking Young Man 48,{
close;
}
-moc_ruins,115,82,0 script Little Girl#moc 703,{
+moc_ruins,115,82,0 script Little Girl#moc 4_F_KID2,{
mes "[Little Girl]";
mes "-Crying-";
next;
@@ -274,7 +274,7 @@ moc_ruins,115,82,0 script Little Girl#moc 703,{
close;
}
-moc_ruins,118,82,1 script Little Boy#moc 706,{
+moc_ruins,118,82,1 script Little Boy#moc 4_M_KID1,{
mes "[Little Boy]";
mes "............... Let's stop crying, Eliese...";
next;
@@ -292,7 +292,7 @@ moc_ruins,118,82,1 script Little Boy#moc 706,{
close;
}
-moc_ruins,121,116,4 script Picky Lady#moc 66,{
+moc_ruins,121,116,4 script Picky Lady#moc 1_F_01,{
mes "[Syvia]";
mes "The fields of Rune-Midgard are infested with wild and dangerous monsters..But, you've got to admit a bunch of them are soooo cute!";
mes "You know, like how Spore sticks out its tongue after you kill it..";
@@ -342,7 +342,7 @@ moc_ruins,121,116,4 script Picky Lady#moc 66,{
}
}
-moc_ruins,155,107,4 script Ant Man#moc 47,{
+moc_ruins,155,107,4 script Ant Man#moc 1_M_01,{
mes "[Akira]";
mes "Hey, you. Did you cross the desert?";
next;
@@ -394,7 +394,7 @@ moc_ruins,155,107,4 script Ant Man#moc 47,{
}
}
-moc_ruins,143,43,4 script Assassin Boy#moc 118,{
+moc_ruins,143,43,4 script Assassin Boy#moc 2_M_THIEFMASTER,{
mes "[Slayer Kid]";
mes "Unbeatable in man-to-man fights, Assassins always overcome their enemies! Erm, always overcome their enemies without a trace.";
next;
@@ -447,7 +447,7 @@ moc_ruins,143,43,4 script Assassin Boy#moc 118,{
}
}
-moc_ruins,173,141,4 script Dimitri#moc 49,{
+moc_ruins,173,141,4 script Dimitri#moc 1_M_03,{
mes "[Dimitri]";
mes "The desert of Morroc has the highest average temperature in Midgard. You might as well think twice before you sit on the sand in the middle of the desert, cause your ass will be toasted.";
next;
@@ -489,7 +489,7 @@ moc_ruins,173,141,4 script Dimitri#moc 49,{
}
}
-moc_ruins,174,120,4 script Fly Man#moc 54,{
+moc_ruins,174,120,4 script Fly Man#moc 1_M_JOBGUIDER,{
mes "[Armani]";
mes "Ooh, Woooowwww.";
next;
@@ -521,7 +521,7 @@ moc_ruins,174,120,4 script Fly Man#moc 54,{
}
}
-moc_ruins,173,70,4 script Uncle Morroc#moc 48,{
+moc_ruins,173,70,4 script Uncle Morroc#moc 1_M_02,{
mes "[Phlanette]";
mes "Morroc is located in an extremely dry region, surrounded by desert.";
mes "No place in the world is as hot as Morroc.";
@@ -561,7 +561,7 @@ moc_ruins,173,70,4 script Uncle Morroc#moc 48,{
}
}
-moc_fild16,199,212,4 script Uncle Assassin#moc 55,{
+moc_fild16,199,212,4 script Uncle Assassin#moc 1_M_JOBTESTER,{
mes "[Hashisid]";
mes "...Assassins are trained";
mes "to approach their enemies steathily,";
@@ -621,7 +621,7 @@ moc_fild16,199,212,4 script Uncle Assassin#moc 55,{
}
}
-moc_fild16,211,254,4 script Assassin#07rhea_30 118,{
+moc_fild16,211,254,4 script Assassin#07rhea_30 2_M_THIEFMASTER,{
mes "[La Conte]";
mes "Once Thiefs are promoted";
mes "to Assassins, which is very professional";
@@ -715,7 +715,7 @@ moc_fild16,211,254,4 script Assassin#07rhea_30 118,{
//============================================================
//Bartender
/*
-morocc_in,166,76,3 script Bartender#02 46,{
+morocc_in,166,76,3 script Bartender#02 1_ETC_01,{
mes "[Bartender]";
mes "What are you going to order?";
next;
@@ -756,7 +756,7 @@ morocc_in,166,76,3 script Bartender#02 46,{
// Assassin Guild Guards
//===================================================
-moc_fild16,195,281,4 script Assassin Guardian#1::SinGuard 707,{
+moc_fild16,195,281,4 script Assassin Guardian#1::SinGuard 4_M_MOC_SOLDIER,{
mes "[Assassin Guardian]";
if(BaseJob == Job_Assassin) {
mes "Welcome.";
@@ -770,11 +770,11 @@ moc_fild16,195,281,4 script Assassin Guardian#1::SinGuard 707,{
close;
}
-moc_fild16,204,281,4 duplicate(SinGuard) Assassin Guardian#2 707
-moc_fild16,207,281,4 duplicate(SinGuard) Assassin Guardian#3 707
-moc_fild16,216,281,4 duplicate(SinGuard) Assassin Guardian#4 707
-moc_fild16,200,231,4 duplicate(SinGuard) Assassin Guardian#5 707
-moc_fild16,211,231,4 duplicate(SinGuard) Assassin Guardian#6 707
-moc_fild16,200,257,4 duplicate(SinGuard) Assassin Guardian#7 707
-moc_fild16,211,257,4 duplicate(SinGuard) Assassin Guardian#8 707
+moc_fild16,204,281,4 duplicate(SinGuard) Assassin Guardian#2 4_M_MOC_SOLDIER
+moc_fild16,207,281,4 duplicate(SinGuard) Assassin Guardian#3 4_M_MOC_SOLDIER
+moc_fild16,216,281,4 duplicate(SinGuard) Assassin Guardian#4 4_M_MOC_SOLDIER
+moc_fild16,200,231,4 duplicate(SinGuard) Assassin Guardian#5 4_M_MOC_SOLDIER
+moc_fild16,211,231,4 duplicate(SinGuard) Assassin Guardian#6 4_M_MOC_SOLDIER
+moc_fild16,200,257,4 duplicate(SinGuard) Assassin Guardian#7 4_M_MOC_SOLDIER
+moc_fild16,211,257,4 duplicate(SinGuard) Assassin Guardian#8 4_M_MOC_SOLDIER
diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt
index f7c8d1e1a..4872f94e0 100644
--- a/npc/cities/moscovia.txt
+++ b/npc/cities/moscovia.txt
@@ -90,7 +90,7 @@
}
}
-moscovia,166,53,4 script Moscovia P.R. Officer#2 960,{
+moscovia,166,53,4 script Moscovia P.R. Officer#2 4_F_RUSWOMAN2,{
mes "[Moscovia P.R. Officer]";
mes "How was your trip?";
mes "Do you have good memories from Moscovia?";
@@ -117,7 +117,7 @@ moscovia,166,53,4 script Moscovia P.R. Officer#2 960,{
// Moscovia Palace :: mos_swan
//============================================================
-moscovia,253,166,4 script Soldier#mosk1 966,{
+moscovia,253,166,4 script Soldier#mosk1 4_M_RUSKNIGHT,{
mes "[Soldier]";
mes "Our dear Csar Alexsay III is in the palace.";
mes "He rules over Moscovia.";
@@ -125,12 +125,12 @@ moscovia,253,166,4 script Soldier#mosk1 966,{
close;
}
-- script Soldier#mosk::MoscSoldier 966,{
+- script Soldier#mosk::MoscSoldier 4_M_RUSKNIGHT,{
mes "[Soldier]";
mes "Please be silent or the Csar will be angry.";
close;
}
-mosk_in,118,66,5 duplicate(MoscSoldier) Soldier#mosk02 966
-mosk_in,133,110,3 duplicate(MoscSoldier) Soldier#mosk03 966
-mosk_in,133,73,3 duplicate(MoscSoldier) Soldier#mosk04 966
-mosk_in,113,124,5 duplicate(MoscSoldier) Soldier#mosk05 966
+mosk_in,118,66,5 duplicate(MoscSoldier) Soldier#mosk02 4_M_RUSKNIGHT
+mosk_in,133,110,3 duplicate(MoscSoldier) Soldier#mosk03 4_M_RUSKNIGHT
+mosk_in,133,73,3 duplicate(MoscSoldier) Soldier#mosk04 4_M_RUSKNIGHT
+mosk_in,113,124,5 duplicate(MoscSoldier) Soldier#mosk05 4_M_RUSKNIGHT
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index 776a62ab1..0ee31c1da 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -25,14 +25,14 @@
//= 1.5 Added dummy "OnMyMobDead" event to Cursed Spirit. [L0ne_W0lf]
//============================================================
-niflheim,52,147,3 script Keedz#nif 796,{
+niflheim,52,147,3 script Keedz#nif 4_M_NFDEADSWDMAN,{
mes "[Keedz]";
mes "I don't allow any living person";
mes "to come in this place!";
close;
}
-niflheim,195,211,6 script Gigantia#nif 796,3,3,{
+niflheim,195,211,6 script Gigantia#nif 4_M_NFDEADSWDMAN,3,3,{
if (isequipped(5038) || isequipped(2257) || isequipped(2256)) {
mes "[" + strcharinfo(0) + "]";
mes "What's up?";
@@ -67,7 +67,7 @@ OnTouch:
end;
}
-nif_in,16,27,1 script Undead Chicken#nif 800,{
+nif_in,16,27,1 script Undead Chicken#nif 4_NFCOCK,{
percentheal -5,0;
mes "[Undead Chicken]";
mes "I lived a peaceful life as a normal chicken. But then came the day I was tragically killed and eaten by humans. Well... Heh heh~! Now it's my turn! *Cackles*";
@@ -86,7 +86,7 @@ nif_in,16,27,1 script Undead Chicken#nif 800,{
close;
}
-nif_in,16,30,4 script Undead Familiar#nif 799,{
+nif_in,16,30,4 script Undead Familiar#nif 4_NFBAT,{
percentheal -5,0;
mes "[Vatoman]";
mes "Oooh, how handy, a living";
@@ -106,7 +106,7 @@ nif_in,16,30,4 script Undead Familiar#nif 799,{
close;
}
-nif_in,156,93,5 script Child#niflheim 793,{
+nif_in,156,93,5 script Child#niflheim 4_F_NFLOSTGIRL,{
mes "[Alakina Ann]";
mes "Where...where am I...?";
mes "I remember I was sleeping";
@@ -162,7 +162,7 @@ nif_in,156,93,5 script Child#niflheim 793,{
}
}
-niflheim,350,258,1 script Cursed Spirit#nif 802,{
+niflheim,350,258,1 script Cursed Spirit#nif 4_NFWISP,{
killmonster "niflheim","Cursed Spirit#nif::OnMyMobDead";
mes "[Ashe Bruce]";
mes "I sense you're cursed";
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index 70f2d9f69..5a4bb811d 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -28,7 +28,7 @@
// Payon
//============================================================
-payon,246,154,0 script Lady#payon 90,{
+payon,246,154,0 script Lady#payon 4_F_01,{
mes "[Lady]";
mes "A long time ago,";
mes "when Payon was still";
@@ -56,7 +56,7 @@ payon,246,154,0 script Lady#payon 90,{
close;
}
-payon,134,211,4 script Young Man#payon 59,{
+payon,134,211,4 script Young Man#payon 1_M_ORIENT01,{
mes "[Young Man]";
mes "From your attire,";
mes "I can see that you";
@@ -77,7 +77,7 @@ payon,134,211,4 script Young Man#payon 59,{
close;
}
-payon,173,82,0 script Young Man#2payon 88,{
+payon,173,82,0 script Young Man#2payon 4_M_ORIENT01,{
mes "[Young Man]";
mes "I remember the story my dearly departed grandfather has told me.";
next;
@@ -110,7 +110,7 @@ payon,173,82,0 script Young Man#2payon 88,{
close;
}
-payon,158,246,3 script Guardsman#payon 708,3,3,{
+payon,158,246,3 script Guardsman#payon 4_M_PAY_SOLDIER,3,3,{
end;
OnTouch:
@@ -125,7 +125,7 @@ OnTouch:
close;
}
-payon,249,156,1 script Woman#payon 66,{
+payon,249,156,1 script Woman#payon 1_F_01,{
mes "[Woman]";
mes "Welcome to Payon.";
mes "You must have had";
@@ -177,7 +177,7 @@ payon,249,156,1 script Woman#payon 66,{
close;
}
-payon,246,158,5 script Woman#2payon 66,0,0,{
+payon,246,158,5 script Woman#2payon 1_F_01,0,0,{
mes "[Jim's Mother]";
mes "Oh boy~";
mes "There she goes again.";
@@ -224,7 +224,7 @@ payon,246,158,5 script Woman#2payon 66,0,0,{
close;
}
-payon,210,110,1 script Drunkard#payon 120,{
+payon,210,110,1 script Drunkard#payon 2_M_PHARMACIST,{
if (Class != Job_Archer) {
mes "[Drunkard]";
mes "Hey...";
@@ -296,7 +296,7 @@ payon,210,110,1 script Drunkard#payon 120,{
close;
}
-payon,132,235,3 script Monster Scholar#02 98,{
+payon,132,235,3 script Monster Scholar#02 4W_M_02,{
mes "[Monster Scholar Vuicokk]";
mes "Nice to meet you.";
mes "I am called Vuicokk.";
@@ -371,7 +371,7 @@ payon,132,235,3 script Monster Scholar#02 98,{
// Inside Payon
//============================================================
-payon_in01,180,7,2 script Waitress#payon 90,{
+payon_in01,180,7,2 script Waitress#payon 4_F_01,{
mes "[Pub Lady]";
mes "This place is always bustling with busy people. Little Novices come and go to become Archers, and everyone else is buying arrows while I have to stay here in this small shop.";
next;
@@ -463,7 +463,7 @@ payon_in01,180,7,2 script Waitress#payon 90,{
close;
}
-payon_in03,96,116,3 script Chief Guardsman#payon 708,3,3,{
+payon_in03,96,116,3 script Chief Guardsman#payon 4_M_PAY_SOLDIER,3,3,{
end;
OnTouch:
@@ -481,7 +481,7 @@ OnTouch:
close;
}
-payon_in01,66,64,5 script Archer Zakk#payon 88,{
+payon_in01,66,64,5 script Archer Zakk#payon 4_M_ORIENT01,{
mes "[Archer Zakk]";
mes "I'm kind of worried";
mes "about one of my pals.";
@@ -536,7 +536,7 @@ payon_in01,66,64,5 script Archer Zakk#payon 88,{
close;
}
-payon_in01,47,59,2 script Archer Wolt#payon 88,{
+payon_in01,47,59,2 script Archer Wolt#payon 4_M_ORIENT01,{
mes "[Archer Wolt]";
mes "Archers should";
mes "practice as much";
@@ -827,7 +827,7 @@ payon_in01,47,59,2 script Archer Wolt#payon 88,{
close;
}
-payon_in03,99,190,4 script Chief#payon 107,2,2,{
+payon_in03,99,190,4 script Chief#payon 1_M_PAY_ELDER,2,2,{
end;
OnTouch:
@@ -968,7 +968,7 @@ OnTouch:
end;
}
-payon_in03,102,185,5 script Guard#payon 708,{
+payon_in03,102,185,5 script Guard#payon 4_M_PAY_SOLDIER,{
if (BaseLevel < 30) {
mes "[Guard]";
mes "Hey...!";
@@ -990,7 +990,7 @@ payon_in03,102,185,5 script Guard#payon 708,{
// Payon Archer Village
//============================================================
-pay_arche,77,131,2 script Archer Joe#payon 88,{
+pay_arche,77,131,2 script Archer Joe#payon 4_M_ORIENT01,{
mes "[Archer Joe]";
mes "Payon!";
mes "Such a wonderful";
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index a7d4b4ba7..ff5851452 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -23,16 +23,16 @@
// Prontera
//============================================================
-prontera,160,330,0 script Guard#pront::prtguard 105,{
+prontera,160,330,0 script Guard#pront::prtguard 8W_SOLDIER,{
mes "[Prontera Guard]";
mes "Welcome to Prontera.";
close;
}
-prontera,223,99,1 duplicate(prtguard) Guard#2pront 105
-prontera,229,104,5 duplicate(prtguard) Guard#3pront 105
-prontera,47,339,5 duplicate(prtguard) Guard#4pront 105
+prontera,223,99,1 duplicate(prtguard) Guard#2pront 8W_SOLDIER
+prontera,229,104,5 duplicate(prtguard) Guard#3pront 8W_SOLDIER
+prontera,47,339,5 duplicate(prtguard) Guard#4pront 8W_SOLDIER
-prontera,101,288,3 script Shuger#pront 98,{
+prontera,101,288,3 script Shuger#pront 4W_M_02,{
mes "[Shuger]";
mes "Outside the safety of the city, there is a pink beast known as ^000077Poring^000000.";
next;
@@ -47,7 +47,7 @@ prontera,101,288,3 script Shuger#pront 98,{
close;
}
-prontera,54,240,6 script Tono#pront 97,{
+prontera,54,240,6 script Tono#pront 4W_M_01,{
mes "[Tono]";
mes "Did you know?";
next;
@@ -65,7 +65,7 @@ prontera,54,240,6 script Tono#pront 97,{
close;
}
-prontera,106,116,6 script Merideth#pront 91,{
+prontera,106,116,6 script Merideth#pront 4_F_02,{
mes "[Merideth]";
mes "The weather was nice on my day off so my family and I went for a picnic. We chose to go to a slightly secluded area where I saw something really interesting...";
next;
@@ -77,7 +77,7 @@ prontera,106,116,6 script Merideth#pront 91,{
close;
}
-prontera,160,133,2 script YuPi#pront 102,{
+prontera,160,133,2 script YuPi#pront 8_F,{
mes "[YuPi]";
mes "Although many monsters may look the same, be careful! There are variations among monsters that have the same basic form.";
next;
@@ -89,7 +89,7 @@ prontera,160,133,2 script YuPi#pront 102,{
close;
}
-prontera,149,202,2 script YuNa#pront 700,{
+prontera,149,202,2 script YuNa#pront 8_F_GIRL,{
mes "[YuNa]";
mes "Behold...";
mes "Mighty Odin!";
@@ -113,7 +113,7 @@ prontera,149,202,2 script YuNa#pront 700,{
close;
}
-prontera,216,70,2 script Strife#pront 48,{
+prontera,216,70,2 script Strife#pront 1_M_02,{
if (Class == Job_Novice) {
if (event_prt_nov_dreamtalk == 0) {
mes "[Strife]";
@@ -210,7 +210,7 @@ prontera,216,70,2 script Strife#pront 48,{
}
}
-prontera,78,150,3 script Dairenne#pront 90,{
+prontera,78,150,3 script Dairenne#pront 4_F_01,{
mes "[Towngirl Dairenne]";
mes "Ahh...";
mes "The streets are too crowded these days. *Cough Cough* Look at all this dust, not everything about living in the capital city is good. Anyway, may I help you?";
@@ -235,7 +235,7 @@ prontera,78,150,3 script Dairenne#pront 90,{
//============================================================
/*
//This NPC has been disabled officially.
-prt_in,178,92,0 script Curator of Library#pront 57,{
+prt_in,178,92,0 script Curator of Library#pront 1_M_LIBRARYMASTER,{
mes "[Curator Guiss]";
mes "Here, in the Western branch of the Prontera Library, ";
mes "we keep records of monsters found in various dungeons scattered around the Rune-Midgarts Kingdom.";
@@ -251,14 +251,14 @@ prt_in,178,92,0 script Curator of Library#pront 57,{
}
*/
-prt_in,175,50,0 script Library Girl#pront 71,{
+prt_in,175,50,0 script Library Girl#pront 1_F_LIBRARYGIRL,{
mes "[Library Girl Ellen]";
mes "Here in the Eastern branch of the Prontera Library, we provide Monster Encyclopedias in which creatures are organized by their properties. We also have books on Merchant and Blacksmith skills.";
mes "Ooh~! The other branch of our library also has many interesting things to read! So if you get a chance, you just might want to visit.";
close;
}
-prt_in,47,141,0 script An Old Man#pront 56,{
+prt_in,47,141,0 script An Old Man#pront 1_M_KNIGHTMASTER,{
mes "[Old Man]";
mes "The Prontera Culvert sewers have been left unattended for a long time. Now that place is infested with ^000077Thief Bugs^000000!";
next;
@@ -267,7 +267,7 @@ prt_in,47,141,0 script An Old Man#pront 56,{
close;
}
-prt_in,26,31,0 script An Old Man#2pront 54,{
+prt_in,26,31,0 script An Old Man#2pront 1_M_JOBGUIDER,{
mes "[Old Man]";
mes "I dunno if you'll believe me, but I saw the weirdest thing down in the ^000077Culvert Sewers^000000...";
next;
@@ -288,7 +288,7 @@ prt_in,26,31,0 script An Old Man#2pront 54,{
close;
}
-prt_in,180,20,2 script Bartender#pront 61,{
+prt_in,180,20,2 script Bartender#pront 1_M_PUBMASTER,{
mes "[Bartender]";
mes "Sigh...as more and more people coming into Prontera,";
mes "better and better my business has become nowadays. But...";
@@ -339,7 +339,7 @@ prt_in,180,20,2 script Bartender#pront 61,{
}
-prt_in,173,24,2 script Shevild#pront 85,{
+prt_in,173,24,2 script Shevild#pront 4_M_03,{
mes "[Shevild]";
mes "Hey, come on over and let's drink! I have lots of interesting stories to tell!";
mes "I know lots of things about Prontera. I have seen many fine views and I also have explored some monster lairs around this city.";
@@ -411,7 +411,7 @@ prt_in,173,24,2 script Shevild#pront 85,{
close;
}
-prt_in,177,20,2 script TenSue#pront 97,{
+prt_in,177,20,2 script TenSue#pront 4W_M_01,{
switch(rand(3)) {
case 1:
mes "[TenSue]";
@@ -468,7 +468,7 @@ prt_in,177,20,2 script TenSue#pront 97,{
}
}
-prt_in,177,18,2 script Marvin#pront 80,{
+prt_in,177,18,2 script Marvin#pront 1_F_PUBGIRL,{
mes "[Marvin]";
mes "Whether it's schmoozing with a member of the opposite sex, or battling monsters, I gotta say, it's all about ^333399skills^000000.";
next;
@@ -492,7 +492,7 @@ prt_in,177,18,2 script Marvin#pront 80,{
close;
}
-prt_in,284,168,3 script Ginedin Rephere#pront 55,{
+prt_in,284,168,3 script Ginedin Rephere#pront 1_M_JOBTESTER,{
mes "[Tailor Ginedin Rephere]";
mes "11...";
mes "12...";
@@ -540,7 +540,7 @@ prt_in,284,168,3 script Ginedin Rephere#pront 55,{
// Prontera Church
//============================================================
-prt_church,103,76,0 script Garnet#pront 67,{
+prt_church,103,76,0 script Garnet#pront 1_F_02,{
mes "[Garnet]";
mes "Hello there~";
mes "Are you interested in learning more about helping and supporting other people?";
@@ -638,7 +638,7 @@ prt_church,103,76,0 script Garnet#pront 67,{
end;
}
-prt_church,103,71,0 script Henson#pront 120,{
+prt_church,103,71,0 script Henson#pront 2_M_PHARMACIST,{
mes "[Henson]";
mes "We Priests and Acolytes are not only limited to easing the suffering of our fellow man...";
next;
@@ -738,7 +738,7 @@ prt_church,103,71,0 script Henson#pront 120,{
// Hidden Temple
//============================================================
-prt_maze02,100,69,0 script Soldier#pront 105,{
+prt_maze02,100,69,0 script Soldier#pront 8W_SOLDIER,{
mes "[Soldier]";
mes "H-hey!";
mes "What are";
@@ -750,7 +750,7 @@ prt_maze02,100,69,0 script Soldier#pront 105,{
close;
}
-prt_maze02,110,69,0 script Soldier#2pront 105,{
+prt_maze02,110,69,0 script Soldier#2pront 8W_SOLDIER,{
mes "[Soldier]";
mes "*Sigh...* The last guy that entered this place haven't come back at all. He didn't listen to me and went in to gather Herbs or something dumb like that...";
next;
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index 455db505e..edbdaa1eb 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -19,7 +19,7 @@
//============================================================
//===== Set 1 ================================================
-ice_dun04,33,166,3 script Frozen Boy 925,{
+ice_dun04,33,166,3 script Frozen Boy 4_M_FROZEN,{
cutin "ra_sboy.bmp",2;
mes "["+strcharinfo(0)+"]";
mes "This boy must be the one who Ktullanux tried to protect.";
@@ -41,7 +41,7 @@ ice_dun04,33,166,3 script Frozen Boy 925,{
end;
}
-ra_san04,137,48,3 script Loomin-1st Class Secret 111,{
+ra_san04,137,48,3 script Loomin-1st Class Secret HIDDEN_NPC,{
mes "^3131FFLoomin, the boy";
mes "trapped in the Ice Cave.^000000";
mes "Class: 1st";
@@ -90,7 +90,7 @@ ra_san04,137,48,3 script Loomin-1st Class Secret 111,{
close;
}
-rachel,124,132,1 script Citizen#1 921,{
+rachel,124,132,1 script Citizen#1 4_M_CHILD1,{
mes "[Citizen]";
mes "May Freya bless";
mes "you, and give you an";
@@ -106,7 +106,7 @@ rachel,124,132,1 script Citizen#1 921,{
close;
}
-rachel,74,150,7 script Girl#1 914,{
+rachel,74,150,7 script Girl#1 4_F_CHILD,{
mes "[Girl]";
mes "I've never seen our pope";
mes "before, I hear that she has";
@@ -133,7 +133,7 @@ rachel,74,150,7 script Girl#1 914,{
close;
}
-rachel,144,243,5 script Cheshrumnir Guard::ChesGuard 934,{
+rachel,144,243,5 script Cheshrumnir Guard::ChesGuard 4_M_RASWORD,{
mes "[Cheshrumnir Guard]";
mes "You are at Cheshrumnir,";
mes "the hallowed grounds occupied";
@@ -144,10 +144,10 @@ rachel,144,243,5 script Cheshrumnir Guard::ChesGuard 934,{
close;
}
-rachel,155,243,3 duplicate(ChesGuard) Cheshrumnir Guard 934
+rachel,155,243,3 duplicate(ChesGuard) Cheshrumnir Guard 4_M_RASWORD
-rachel,209,198,3 script Kinos#aru 921,{
+rachel,209,198,3 script Kinos#aru 4_M_CHILD1,{
mes "[Kid]";
mes "If you open this door, you";
mes "can go inside this house,";
@@ -164,7 +164,7 @@ rachel,209,198,3 script Kinos#aru 921,{
close;
}
-rachel,260,175,3 script Anku#aru 914,{
+rachel,260,175,3 script Anku#aru 4_F_CHILD,{
mes "[Anku]";
mes "It's been so long";
mes "already! I can't find";
@@ -180,7 +180,7 @@ rachel,260,175,3 script Anku#aru 914,{
close;
}
-rachel,272,141,3 script Himuhimu#aru 921,{
+rachel,272,141,3 script Himuhimu#aru 4_M_CHILD1,{
mes "[Himuhimu]";
mes "Zzzz...Z...";
mes "Anku, you'll never";
@@ -190,7 +190,7 @@ rachel,272,141,3 script Himuhimu#aru 921,{
close;
}
-rachel,268,120,1 script Rachel Guard#1aru::RaGuard 934,{
+rachel,268,120,1 script Rachel Guard#1aru::RaGuard 4_M_RASWORD,{
mes "[Rachel Guard]";
mes "Welcome to Rachel";
mes "the capital of Arunafeltz.";
@@ -201,11 +201,11 @@ rachel,268,120,1 script Rachel Guard#1aru::RaGuard 934,{
close;
}
-rachel,125,33,5 duplicate(RaGuard) Rachel Guard#2aru 934
+rachel,125,33,5 duplicate(RaGuard) Rachel Guard#2aru 4_M_RASWORD
-rachel,31,130,3 duplicate(RaGuard) Rachel Guard#3aru 934
+rachel,31,130,3 duplicate(RaGuard) Rachel Guard#3aru 4_M_RASWORD
-rachel,76,77,3 script Rachel Priest 927,{
+rachel,76,77,3 script Rachel Priest 4_M_MASK,{
mes "[Rachel Priest]";
mes "Bwahahaha! Somehow,";
mes "drinks taste much better";
@@ -213,7 +213,7 @@ rachel,76,77,3 script Rachel Priest 927,{
close;
}
-ra_fild12,45,230,3 script Airship Guide#Fild 934,{
+ra_fild12,45,230,3 script Airship Guide#Fild 4_M_RASWORD,{
mes "[Airship Guide]";
mes "The Schwaltzvalt Republic's";
mes "international Airship service";
@@ -225,8 +225,8 @@ ra_fild12,45,230,3 script Airship Guide#Fild 934,{
close;
}
-//rachel,201,174,3 script Freya's Follower 927,{
-rachel,201,174,3 script Freya's Follower 926,{
+//rachel,201,174,3 script Freya's Follower 4_M_MASK,{
+rachel,201,174,3 script Freya's Follower 4_M_MASK1,{
mes "[Freya's Follower]";
mes "All of Arunafeltz believes";
mes "in the goddess Freya, but";
@@ -266,7 +266,7 @@ rachel,201,174,3 script Freya's Follower 926,{
close;
}
-rachel,206,30,3 script Freya's Priest#play 920,{
+rachel,206,30,3 script Freya's Priest#play 4_F_TRAINEE,{
mes "[Freya's Priest]";
mes "This...";
mes "bores me...";
@@ -316,7 +316,7 @@ rachel,206,30,3 script Freya's Priest#play 920,{
end;
}
-rachel,197,137,3 script Bard#aru 51,{
+rachel,197,137,3 script Bard#aru 1_M_BARD,{
mes "[Bard]";
mes "I've wandered this";
mes "land, singing my songs~";
@@ -344,7 +344,7 @@ rachel,197,137,3 script Bard#aru 51,{
close;
}
-ra_temple,148,91,3 script Follower Akarna 916,{
+ra_temple,148,91,3 script Follower Akarna 4_F_MASK1,{
mes "[Follower Akarna]";
mes "Cheshrumnir...";
mes "It is said that one";
@@ -355,7 +355,7 @@ ra_temple,148,91,3 script Follower Akarna 916,{
close;
}
-ra_temple,115,148,7 script Follower Yakum 916,{
+ra_temple,115,148,7 script Follower Yakum 4_F_MASK1,{
mes "[Follower Yakum]";
mes "......";
mes ".........";
@@ -369,7 +369,7 @@ ra_temple,115,148,7 script Follower Yakum 916,{
close;
}
-ra_temin,287,88,7 script Follower Lekua 926,{
+ra_temin,287,88,7 script Follower Lekua 4_M_MASK1,{
mes "[Follower Lekua]";
mes "Look at these flowers.";
mes "Aren't they so beautiful?";
@@ -385,8 +385,8 @@ ra_temin,287,88,7 script Follower Lekua 926,{
close;
}
-//ra_temin,228,303,5 script Freya's Follower#in1 927,{
-ra_temin,228,303,5 script Freya's Follower#in1 926,{
+//ra_temin,228,303,5 script Freya's Follower#in1 4_M_MASK,{
+ra_temin,228,303,5 script Freya's Follower#in1 4_M_MASK1,{
mes "[Freya's Follower]";
mes "Once again, I didn't get";
mes "any sleep yesterday... I'm";
@@ -397,8 +397,8 @@ ra_temin,228,303,5 script Freya's Follower#in1 926,{
close;
}
-//ra_temin,230,303,3 script Freya's Follower#in2 927,{
-ra_temin,230,303,3 script Freya's Follower#in2 926,{
+//ra_temin,230,303,3 script Freya's Follower#in2 4_M_MASK,{
+ra_temin,230,303,3 script Freya's Follower#in2 4_M_MASK1,{
mes "[Freya's Follower]";
mes "You have done well,";
mes "my brother. I am certain";
@@ -407,7 +407,7 @@ ra_temin,230,303,3 script Freya's Follower#in2 926,{
close;
}
-ra_temin,138,64,5 script Child Follower#in1 921,{
+ra_temin,138,64,5 script Child Follower#in1 4_M_CHILD1,{
mes "[Child Follower]";
mes "No! My Mingming is dead!";
next;
@@ -432,7 +432,7 @@ ra_temin,138,64,5 script Child Follower#in1 921,{
//===== Set 2 ================================================
-ra_fild12,283,208,3 script Apprentice Priestess 914,{
+ra_fild12,283,208,3 script Apprentice Priestess 4_F_CHILD,{
if ($rachel_donate < 10000) {
mes "[Papaii]";
mes "Welcome to Arunafeltz,";
@@ -538,7 +538,7 @@ ra_fild12,283,208,3 script Apprentice Priestess 914,{
close;
}
-rachel,127,117,4 script Child Follower#2 914,{
+rachel,127,117,4 script Child Follower#2 4_F_CHILD,{
mes "[Deno]";
mes "Although we pray to";
mes "the goddess Freya and";
@@ -564,7 +564,7 @@ rachel,127,117,4 script Child Follower#2 914,{
close;
}
-ra_temple,167,155,4 script Child Follower#3 914,{
+ra_temple,167,155,4 script Child Follower#3 4_F_CHILD,{
mes "[Lewei]";
mes "Shushh!";
mes "Be quiet.";
@@ -593,7 +593,7 @@ ra_temple,167,155,4 script Child Follower#3 914,{
close;
}
-ra_temple,179,161,7 script Child Follower#4 921,{
+ra_temple,179,161,7 script Child Follower#4 4_M_CHILD1,{
mes "[Zhikka]";
mes "Shh! I'm playing";
mes "Hide-and-Seek. Would";
@@ -604,7 +604,7 @@ ra_temple,179,161,7 script Child Follower#4 921,{
close;
}
-ra_temple,77,114,7 script Child Follower#5 921,{
+ra_temple,77,114,7 script Child Follower#5 4_M_CHILD1,{
mes "[Emmet]";
mes "Oh my Freya! You scared me!";
mes "I thought you were one of the";
@@ -614,7 +614,7 @@ ra_temple,77,114,7 script Child Follower#5 921,{
close;
}
-ra_temple,172,113,5 script Child Follower#6 921,{
+ra_temple,172,113,5 script Child Follower#6 4_M_CHILD1,{
mes "[Harse]";
mes "Where are yoooou~";
mes "Come out, come out";
@@ -629,7 +629,7 @@ ra_temple,172,113,5 script Child Follower#6 921,{
close;
}
-airplane,238,54,7 script Adventurer 59,{
+airplane,238,54,7 script Adventurer 1_M_ORIENT01,{
if ($rachel_donate < 10000) {
mes "[Adventurer]";
mes "You know that the temple";
diff --git a/npc/cities/splendide.txt b/npc/cities/splendide.txt
index 948d1c911..b06bd6487 100644
--- a/npc/cities/splendide.txt
+++ b/npc/cities/splendide.txt
@@ -14,7 +14,7 @@
//============================================================
// cat_enhance
-splendide,218,193,3 script Fairy#ep13_1 441,{
+splendide,218,193,3 script Fairy#ep13_1 4_F_FAIRYKID6,{
if (isequipped(2782) == 1) {
mes "[Exhausted Fairy]";
mes "Wait, don't come any closer. I can't stand your smell, it makes me feel dizzy.";
@@ -27,7 +27,7 @@ splendide,218,193,3 script Fairy#ep13_1 441,{
}
}
-splendide,180,223,3 script Fairy#ep13_2 440,{
+splendide,180,223,3 script Fairy#ep13_2 4_F_FAIRYKID5,{
if (isequipped(2782) == 1) {
mes "[Kalua]";
mes "You don't look sophisticated, but I think you are better than those uncivilized guys who are around the snowfield.";
@@ -40,7 +40,7 @@ splendide,180,223,3 script Fairy#ep13_2 440,{
}
}
-splendide,125,227,3 script Fairy#ep13_3 444,{
+splendide,125,227,3 script Fairy#ep13_3 4_M_FAIRYKID3,{
if (isequipped(2782) == 1) {
mes "[Flowa]";
mes "No offense, I was not looking at you with sympathy.";
@@ -56,7 +56,7 @@ splendide,125,227,3 script Fairy#ep13_3 444,{
}
// ep13_2_hiki
-splendide,159,164,3 script Fairy#13_2_1 461,{
+splendide,159,164,3 script Fairy#13_2_1 4_M_FAIRYSOLDIER2,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "It is shame that I have to";
@@ -73,7 +73,7 @@ splendide,159,164,3 script Fairy#13_2_1 461,{
}
}
-splendide,229,54,3 script Fairy#13_2_2 439,{
+splendide,229,54,3 script Fairy#13_2_2 4_F_FAIRYKID4,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "Huh? You are a human.";
@@ -98,7 +98,7 @@ splendide,229,54,3 script Fairy#13_2_2 439,{
}
}
-splendide,89,235,5 script Fairy#13_2_3 446,{
+splendide,89,235,5 script Fairy#13_2_3 4_M_FAIRYKID5,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "Lalalalal~Lala~Lalala~";
@@ -121,7 +121,7 @@ splendide,89,235,5 script Fairy#13_2_3 446,{
}
}
-splendide,245,243,3 script Fairy#13_2_4 462,{
+splendide,245,243,3 script Fairy#13_2_4 4_F_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "This land was such a waste land.";
@@ -151,7 +151,7 @@ splendide,245,243,3 script Fairy#13_2_4 462,{
}
}
-splendide,230,142,3 script Fairy#13_2_5 439,{
+splendide,230,142,3 script Fairy#13_2_5 4_F_FAIRYKID4,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "Ah-Ha, I am so stunning.";
@@ -164,7 +164,7 @@ splendide,230,142,3 script Fairy#13_2_5 439,{
}
}
-splendide,274,203,3 script Fairy#13_2_6 444,{
+splendide,274,203,3 script Fairy#13_2_6 4_M_FAIRYKID3,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "Hey, you~! Human! How did you find us?";
@@ -181,7 +181,7 @@ splendide,274,203,3 script Fairy#13_2_6 444,{
}
}
-splendide,275,141,3 script Fairy#13_2_7 447,{
+splendide,275,141,3 script Fairy#13_2_7 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "Don't talk to me. What do you want?";
@@ -204,7 +204,7 @@ splendide,275,141,3 script Fairy#13_2_7 447,{
}
}
-splendide,224,230,3 script Fairy#13_2_8 440,{
+splendide,224,230,3 script Fairy#13_2_8 4_F_FAIRYKID5,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "Listen carefully and learn more!";
@@ -227,7 +227,7 @@ splendide,224,230,3 script Fairy#13_2_8 440,{
}
}
-splendide,223,36,3 script Fairy#13_2_9 462,{
+splendide,223,36,3 script Fairy#13_2_9 4_F_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "I don't want to touch them at all.";
@@ -256,7 +256,7 @@ splendide,223,36,3 script Fairy#13_2_9 462,{
}
}
-splendide,305,129,3 script Fairy#13_2_10 436,{
+splendide,305,129,3 script Fairy#13_2_10 4_F_FAIRYKID,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "Hu...feel sleepy.";
@@ -284,7 +284,7 @@ splendide,305,129,3 script Fairy#13_2_10 436,{
}
}
-splendide,142,315,3 script Fairy#13_2_11 462,{
+splendide,142,315,3 script Fairy#13_2_11 4_F_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "Flying in the sky is not easy.";
@@ -312,7 +312,7 @@ splendide,142,315,3 script Fairy#13_2_11 462,{
}
}
-splendide,181,107,5 script Fairy#13_2_12 462,{
+splendide,181,107,5 script Fairy#13_2_12 4_F_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Fairy]";
mes "Neatness, tidiness and cleanness!";
@@ -332,7 +332,7 @@ splendide,181,107,5 script Fairy#13_2_12 462,{
}
// ep13_2_tre
-splendide,188,76,5 script Splendide Soldier#tre1 461,{
+splendide,188,76,5 script Splendide Soldier#tre1 4_M_FAIRYSOLDIER2,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Splendide Soldier]";
mes "This is Splendide, the garrison base of the Laphine.";
@@ -345,7 +345,7 @@ splendide,188,76,5 script Splendide Soldier#tre1 461,{
}
}
-splendide,201,76,3 script Splendide Soldier#tre2 461,{
+splendide,201,76,3 script Splendide Soldier#tre2 4_M_FAIRYSOLDIER2,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Splendide Soldier]";
mes "This is Splendide, the garrison base of the Laphine.";
@@ -358,7 +358,7 @@ splendide,201,76,3 script Splendide Soldier#tre2 461,{
}
}
-splendide,207,97,5 script Middle-Ranked Laphine#1 443,{
+splendide,207,97,5 script Middle-Ranked Laphine#1 4_M_FAIRYKID2,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Middle-Ranked Laphine]";
mes "Haap-!";
@@ -375,7 +375,7 @@ splendide,207,97,5 script Middle-Ranked Laphine#1 443,{
}
}
-splendide,210,95,3 script Middle-Ranked Laphine#2 442,{
+splendide,210,95,3 script Middle-Ranked Laphine#2 4_M_FAIRYKID,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Middle-Ranked Laphine]";
mes "Wow~ Great!!";
@@ -390,7 +390,7 @@ splendide,210,95,3 script Middle-Ranked Laphine#2 442,{
}
}
-spl_in01,190,314,5 script Security Officer#tre 461,{
+spl_in01,190,314,5 script Security Officer#tre 4_M_FAIRYSOLDIER2,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Security Officer]";
mes "This is the underground prison of Splendide.";
@@ -409,7 +409,7 @@ spl_in01,190,314,5 script Security Officer#tre 461,{
}
}
-spl_in01,281,329,3 script Splendide Guard#tre 447,{
+spl_in01,281,329,3 script Splendide Guard#tre 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Splendide Guard]";
mes "If you make too much noise, the prisoners will cause trouble. So try to keep quiet at all times.";
@@ -422,7 +422,7 @@ spl_in01,281,329,3 script Splendide Guard#tre 447,{
}
}
-spl_in01,287,306,3 script #spl_prs 111,{
+spl_in01,287,306,3 script #spl_prs HIDDEN_NPC,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Manuk Prisoner]";
mes "My, my body...!!";
@@ -456,7 +456,7 @@ OnTouch:
}
// ep13_spl_extra
-spl_in01,172,225,3 script Wandering Poet#ep13 51,{
+spl_in01,172,225,3 script Wandering Poet#ep13 1_M_BARD,{
cutin "god_nelluad02",2;
mes "[Poet Nell]";
mes "Hi~~ do you hear the beautiful music comeing from afar~?";
@@ -568,7 +568,7 @@ spl_in01,172,225,3 script Wandering Poet#ep13 51,{
end;
}
-spl_in01,182,213,1 script Resting Laphine#ep13_1 438,{
+spl_in01,182,213,1 script Resting Laphine#ep13_1 4_F_FAIRYKID3,{
if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
mes "[Resting Laphine]";
mes "The poet on the stagie is mysterious.";
@@ -589,7 +589,7 @@ spl_in01,182,213,1 script Resting Laphine#ep13_1 438,{
}
}
-spl_in01,181,218,5 script Resting Laphine#ep13_2 446,{
+spl_in01,181,218,5 script Resting Laphine#ep13_2 4_M_FAIRYKID5,{
if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
mes "- He is nodding his head to the sound of the music -";
next;
@@ -609,7 +609,7 @@ spl_in01,181,218,5 script Resting Laphine#ep13_2 446,{
}
}
-spl_in01,161,213,7 script Dining Laphine#ep13 447,{
+spl_in01,161,213,7 script Dining Laphine#ep13 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
mes "[Dining Laphine]";
mes "I got bored eating home cooked food.";
@@ -630,7 +630,7 @@ spl_in01,161,213,7 script Dining Laphine#ep13 447,{
}
}
-spl_in01,162,202,5 script Laphine taking notes#1 436,{
+spl_in01,162,202,5 script Laphine taking notes#1 4_F_FAIRYKID,{
if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
mes "[Laphine taking notes]";
mes "We are quite impressed by the poet.";
@@ -655,12 +655,12 @@ spl_in01,162,202,5 script Laphine taking notes#1 436,{
}
}
-spl_in01,167,207,7 script Silent Laphine#ep13 445,{
+spl_in01,167,207,7 script Silent Laphine#ep13 4_M_FAIRYKID4,{
mes "- He is almost sleeping but he is still managing to hold a cup with a drink in it. He must be really tired-";
close;
}
-spl_in01,180,201,3 script Laphine Soldier#ep13_1 461,{
+spl_in01,180,201,3 script Laphine Soldier#ep13_1 4_M_FAIRYSOLDIER2,{
if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
mes "[Laphine Soldier]";
mes "You are a stranger here, aren't you?";
@@ -688,7 +688,7 @@ spl_in01,180,201,3 script Laphine Soldier#ep13_1 461,{
}
}
-spl_in01,189,207,3 script Laphine Staff#ep13_1 439,{
+spl_in01,189,207,3 script Laphine Staff#ep13_1 4_F_FAIRYKID4,{
if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
mes "[Laphine Staff]";
mes "Hm, what's up?";
@@ -713,7 +713,7 @@ spl_in01,189,207,3 script Laphine Staff#ep13_1 439,{
}
}
-spl_in01,154,207,5 script Laphine Staff#ep13_2 440,{
+spl_in01,154,207,5 script Laphine Staff#ep13_2 4_F_FAIRYKID5,{
if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
mes "[Laphine Staff]";
mes "his camp serves a military purpose. But we also have a need for bars.";
@@ -734,7 +734,7 @@ spl_in01,154,207,5 script Laphine Staff#ep13_2 440,{
}
}
-spl_in01,122,314,5 script High-Ranked Soldier#ep13 461,{
+spl_in01,122,314,5 script High-Ranked Soldier#ep13 4_M_FAIRYSOLDIER2,{
if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
mes "[High-Ranked Soldier]";
mes "Are ther any new supplies?";
@@ -763,7 +763,7 @@ spl_in01,122,314,5 script High-Ranked Soldier#ep13 461,{
}
}
-spl_in01,122,311,1 script Laphine Soldier#ep13_2 447,{
+spl_in01,122,311,1 script Laphine Soldier#ep13_2 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) > 0) && (ep13_2_rhea > 99)) {
mes "[Laphine Soldier]";
mes "Are you a stranger?";
@@ -792,7 +792,7 @@ spl_in01,122,311,1 script Laphine Soldier#ep13_2 447,{
}
// ep33_2_dailybs
-splendide,121,259,3 script Fairy#ep13bs1 436,{
+splendide,121,259,3 script Fairy#ep13bs1 4_F_FAIRYKID,{
if (isequipped(2782) == 1) {
mes "[Fairy]";
mes "Have you ever gone to the East side?";
@@ -809,7 +809,7 @@ splendide,121,259,3 script Fairy#ep13bs1 436,{
}
}
-splendide,163,264,3 script Fairy#ep13bs2 438,{
+splendide,163,264,3 script Fairy#ep13bs2 4_F_FAIRYKID3,{
if (isequipped(2782) == 1) {
mes "[Fairy]";
mes "What are you looking at!";
diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index 961fea7fb..88bbcb36f 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -22,11 +22,11 @@
//= 2.1 Updated to Aegis 10.3 standards. [L0ne_W0lf]
//============================================================
-comodo,170,137,7 script La Ed#um 84,{
+comodo,170,137,7 script La Ed#um 4_M_02,{
end;
}
-comodo,171,137,1 script Haith#um 92,{
+comodo,171,137,1 script Haith#um 4_F_03,{
mes "[La Ed]";
mes "There MUST be a treasure hidden in that place!";
next;
@@ -136,7 +136,7 @@ comodo,171,137,1 script Haith#um 92,{
close;
}
-cmd_in01,175,120,3 script Iriya#um 69,{
+cmd_in01,175,120,3 script Iriya#um 1_F_04,{
mes "[Iriya]";
mes "Mr. Niels is at the table in the";
mes "corner. He has many interesting";
@@ -156,7 +156,7 @@ cmd_in01,175,120,3 script Iriya#um 69,{
close;
}
-cmd_in01,164,115,1 script Niels#um 731,{
+cmd_in01,164,115,1 script Niels#um 4_M_JOB_BLACKSMITH,{
mes "[Niels]";
mes "Hmm? What's that look for?";
mes "Ah~ You must of heard the rumors";
@@ -236,7 +236,7 @@ cmd_in01,164,115,1 script Niels#um 731,{
close;
}
-umbala,70,106,3 script Utan Kid#um 781,{
+umbala,70,106,3 script Utan Kid#um 4_F_UMGIRL,{
if (event_umbala >= 3) {
mes "[???]";
mes "Huh?";
@@ -361,7 +361,7 @@ umbala,70,106,3 script Utan Kid#um 781,{
close;
}
-umbala,59,243,5 script Utan Kid#1 787,{
+umbala,59,243,5 script Utan Kid#1 4_M_UMKID,{
if (event_umbala >= 3) {
mes "[Kotan]";
mes "............";
@@ -437,7 +437,7 @@ umbala,59,243,5 script Utan Kid#1 787,{
}
}
-umbala,177,153,3 script Pasto#um 97,{
+umbala,177,153,3 script Pasto#um 4W_M_01,{
mes "[Pasto]";
emotion e_gasp;
mes "Oh my god~! Finally,";
@@ -488,7 +488,7 @@ umbala,177,153,3 script Pasto#um 97,{
close;
}
-umbala,80,146,4 script Yuwooki#um 753,{
+umbala,80,146,4 script Yuwooki#um 4_M_MONK,{
mes "[Yuwooki]";
mes "Umbah umbah woogawoo...";
mes "oops, sorry! I'm so used";
@@ -542,7 +542,7 @@ umbala,80,146,4 script Yuwooki#um 753,{
close;
}
-umbala,140,157,6 script Utan Man#1 785,{
+umbala,140,157,6 script Utan Man#1 4_M_UMDANCEKID2,{
if (event_umbala >= 3) {
mes "[Jertan]";
mes "Bungee jumping can be dangerous,";
@@ -562,7 +562,7 @@ umbala,140,157,6 script Utan Man#1 785,{
}
}
-umbala,146,157,4 script Utan Man#2 786,{
+umbala,146,157,4 script Utan Man#2 4_M_UMDANCEKID,{
if (event_umbala >= 3) {
mes "[Arotan]";
mes "Completing the bungee jump";
@@ -580,7 +580,7 @@ umbala,146,157,4 script Utan Man#2 786,{
}
}
-umbala,149,165,4 script Utan Kid#3 781,{
+umbala,149,165,4 script Utan Kid#3 4_F_UMGIRL,{
if (event_umbala >= 3) {
mes "[Klumatan]";
mes "It's really scary, falling from";
@@ -606,7 +606,7 @@ umbala,149,165,4 script Utan Kid#3 781,{
}
}
-umbala,92,159,4 script Bertan#um 785,{
+umbala,92,159,4 script Bertan#um 4_M_UMDANCEKID2,{
if (event_umbala >= 3) {
mes "[Bertan]";
mes "What up, loser!";
@@ -802,7 +802,7 @@ umbala,92,159,4 script Bertan#um 785,{
close;
}
-umbala,194,104,4 script Utan Kid#2 787,{
+umbala,194,104,4 script Utan Kid#2 4_M_UMKID,{
if (event_umbala >= 3) {
mes "[Boorkatan]";
mes "Huh? You're from Rune-Midgard,";
@@ -845,7 +845,7 @@ umbala,194,104,4 script Utan Kid#2 787,{
}
}
-umbala,193,208,6 script Utan Man#3 789,{
+umbala,193,208,6 script Utan Man#3 4_M_UMSOLDIER,{
if (event_umbala >= 3) {
mes "[Weitan]";
mes "I too did the bungee jump when I";
@@ -873,7 +873,7 @@ umbala,193,208,6 script Utan Man#3 789,{
}
}
-umbala,139,205,4 script Utan Man#5 785,{
+umbala,139,205,4 script Utan Man#5 4_M_UMDANCEKID2,{
if (event_umbala >= 3) {
mes "[Jooltan]";
mes "It's been a long time since I last";
@@ -928,7 +928,7 @@ umbala,139,205,4 script Utan Man#5 785,{
}
}
-um_in,158,71,3 script Utan villager#um 787,{
+um_in,158,71,3 script Utan villager#um 4_M_UMKID,{
if (event_umbala >= 3) {
mes "[Mutakutan]";
mes "Umbala has many many trees!";
diff --git a/npc/cities/veins.txt b/npc/cities/veins.txt
index e0b03573f..d0b40a07d 100644
--- a/npc/cities/veins.txt
+++ b/npc/cities/veins.txt
@@ -14,7 +14,7 @@
// Veins
//============================================================
-veins,162,34,5 script Towner#ve1 943,{
+veins,162,34,5 script Towner#ve1 4_M_DESERT,{
mes "[Towner]";
mes "I love cacti. They're";
mes "the most beautiful plants";
@@ -38,7 +38,7 @@ veins,162,34,5 script Towner#ve1 943,{
close;
}
-veins,148,41,3 script Towner#ve2 940,{
+veins,148,41,3 script Towner#ve2 4_F_DESERT,{
mes "[Towner]";
mes "Welcome to Veins, the";
mes "town near the Temple of";
@@ -61,7 +61,7 @@ veins,148,41,3 script Towner#ve2 940,{
close;
}
-veins,137,179,5 script Towner#ve3 943,{
+veins,137,179,5 script Towner#ve3 4_M_DESERT,{
mes "[Towner]";
mes "Geez, why is our weapon";
mes "shop so boring? Nothing";
@@ -78,7 +78,7 @@ veins,137,179,5 script Towner#ve3 943,{
close;
}
-veins,166,91,5 script Towner#ve4 946,{
+veins,166,91,5 script Towner#ve4 4_M_DST_MASTER,{
mes "[Towner]";
mes "Though we're in the";
mes "middle of the desert,";
@@ -96,7 +96,7 @@ veins,166,91,5 script Towner#ve4 946,{
close;
}
-veins,138,71,5 script Kid#ve1 941,{
+veins,138,71,5 script Kid#ve1 4_F_DST_CHILD,{
mes "[Kid]";
mes "Whoa, get out of here!";
mes "Can't you see that I'm";
@@ -105,7 +105,7 @@ veins,138,71,5 script Kid#ve1 941,{
close;
}
-veins,253,133,3 script Kid#ve2 944,{
+veins,253,133,3 script Kid#ve2 4_M_DST_CHILD,{
mes "[Kid]";
mes "Gosh, where could she";
mes "be hiding? I hate being";
@@ -116,7 +116,7 @@ veins,253,133,3 script Kid#ve2 944,{
close;
}
-veins,270,164,5 script Old Man#ve1 945,{
+veins,270,164,5 script Old Man#ve1 4_M_DST_GRAND,{
mes "[Old Man]";
mes "Praise be to Freya";
mes "for blessing me with";
@@ -133,7 +133,7 @@ veins,270,164,5 script Old Man#ve1 945,{
close;
}
-veins,310,195,1 script Towner#ve5 946,{
+veins,310,195,1 script Towner#ve5 4_M_DST_MASTER,{
mes "[Towner]";
mes "Cacti are wonderful,";
mes "they're the most beautiful";
@@ -150,7 +150,7 @@ veins,310,195,1 script Towner#ve5 946,{
close;
}
-veins,320,254,5 script Towner#ve6 943,{
+veins,320,254,5 script Towner#ve6 4_M_DESERT,{
mes "[Towner]";
mes "What do you want?";
mes "Sorry, but I'm just";
@@ -165,7 +165,7 @@ veins,320,254,5 script Towner#ve6 943,{
close;
}
-veins,333,318,3 script Towner#ve7 940,{
+veins,333,318,3 script Towner#ve7 4_F_DESERT,{
mes "[Towner]";
mes "What's an adventurer";
mes "doing here in such an";
@@ -176,7 +176,7 @@ veins,333,318,3 script Towner#ve7 940,{
close;
}
-veins,218,323,1 script Towner#ve8 945,{
+veins,218,323,1 script Towner#ve8 4_M_DST_GRAND,{
mes "[Towner]";
mes "Whoa, it's been a while";
mes "seen I've seen tourists";
@@ -204,7 +204,7 @@ veins,218,323,1 script Towner#ve8 945,{
close;
}
-veins,206,275,3 script Kid#ve3 941,{
+veins,206,275,3 script Kid#ve3 4_F_DST_CHILD,{
mes "[Kid]";
mes "I really want to look";
mes "inside the temple, but";
@@ -214,7 +214,7 @@ veins,206,275,3 script Kid#ve3 941,{
close;
}
-veins,171,256,3 script Towner#ve9 943,{
+veins,171,256,3 script Towner#ve9 4_M_DESERT,{
mes "[Towner]";
mes "Don't get me wrong:";
mes "I'd give my life in Freya's";
@@ -225,7 +225,7 @@ veins,171,256,3 script Towner#ve9 943,{
close;
}
-veins,197,219,5 script Towner#ve10 943,{
+veins,197,219,5 script Towner#ve10 4_M_DESERT,{
mes "[Towner]";
mes "I guess you can tell";
mes "from this withered tree";
@@ -236,7 +236,7 @@ veins,197,219,5 script Towner#ve10 943,{
close;
}
-veins,232,169,5 script Old lady#ve1 942,{
+veins,232,169,5 script Old lady#ve1 4_F_DST_GRAND,{
mes "[Old Lady]";
mes "When I look down on";
mes "Veins from here, I've";
@@ -254,7 +254,7 @@ veins,232,169,5 script Old lady#ve1 942,{
close;
}
-veins,121,199,3 script Old Man#ve2 945,{
+veins,121,199,3 script Old Man#ve2 4_M_DST_GRAND,{
mes "[Old Man]";
mes "This isn't good.";
mes "The elderly outnumber";
@@ -273,7 +273,7 @@ veins,121,199,3 script Old Man#ve2 945,{
close;
}
-veins,111,50,3 script Towner#ve11 943,{
+veins,111,50,3 script Towner#ve11 4_M_DESERT,{
mes "[Towner]";
mes "People cherish water";
mes "around here, but I've";
@@ -291,7 +291,7 @@ veins,111,50,3 script Towner#ve11 943,{
close;
}
-veins,112,51,3 script Towner#ve12 940,{
+veins,112,51,3 script Towner#ve12 4_F_DESERT,{
mes "[Towner]";
mes "Well, I'm actually";
mes "a little tired of coming";
@@ -309,7 +309,7 @@ veins,112,51,3 script Towner#ve12 940,{
close;
}
-veins,191,134,3 script Old Man#ve3 945,{
+veins,191,134,3 script Old Man#ve3 4_M_DST_GRAND,{
mes "[Old Man]";
mes "Why don't you take";
mes "a look at my goods?";
@@ -326,7 +326,7 @@ veins,191,134,3 script Old Man#ve3 945,{
close;
}
-veins,177,147,3 script Old Lady#ve2 942,{
+veins,177,147,3 script Old Lady#ve2 4_F_DST_GRAND,{
mes "[Old Lady]";
mes "Owning a lot of stuff";
mes "might seem great, but";
@@ -350,7 +350,7 @@ veins,177,147,3 script Old Lady#ve2 942,{
close;
}
-veins,223,165,5 script Kid#ve4 944,{
+veins,223,165,5 script Kid#ve4 4_M_DST_CHILD,{
mes "[Kid]";
mes "Hey! Do you think";
mes "I can reach the bridge";
@@ -368,7 +368,7 @@ veins,223,165,5 script Kid#ve4 944,{
close;
}
-veins,263,153,5 script Towner#ve13 943,{
+veins,263,153,5 script Towner#ve13 4_M_DESERT,{
mes "[Towner]";
mes "The clothes we make here";
mes "are high, airy, and sewn";
@@ -387,7 +387,7 @@ veins,263,153,5 script Towner#ve13 943,{
close;
}
-veins,296,184,3 script Towner#ve14 940,{
+veins,296,184,3 script Towner#ve14 4_F_DESERT,{
mes "[Towner]";
mes "Let me tell you a secret.";
mes "But promise not to tell";
@@ -417,7 +417,7 @@ veins,296,184,3 script Towner#ve14 940,{
close;
}
-veins,291,205,3 script Kid#ve5 944,{
+veins,291,205,3 script Kid#ve5 4_M_DST_CHILD,{
mes "[Kid]";
mes "Argh! I'm a war god";
mes "protecting Goddess Freya";
@@ -438,7 +438,7 @@ veins,291,205,3 script Kid#ve5 944,{
close;
}
-veins,291,259,3 script Old Man#ve4 945,{
+veins,291,259,3 script Old Man#ve4 4_M_DST_GRAND,{
mes "[Old Man]";
mes "Fr... Fr...";
next;
@@ -463,7 +463,7 @@ veins,291,259,3 script Old Man#ve4 945,{
close;
}
-veins,291,284,3 script Old Lady#ve3 942,{
+veins,291,284,3 script Old Lady#ve3 4_F_DST_GRAND,{
mes "[Old Lady]";
mes "I wonder what my";
mes "standing with Freya";
@@ -474,7 +474,7 @@ veins,291,284,3 script Old Lady#ve3 942,{
close;
}
-veins,248,301,3 script Kid#ve6 944,{
+veins,248,301,3 script Kid#ve6 4_M_DST_CHILD,{
mes "[Kid]";
mes "Huh? You don't live here.";
mes "Are you... Are you a traveler?";
@@ -493,7 +493,7 @@ veins,248,301,3 script Kid#ve6 944,{
close;
}
-veins,161,63,3 script Old Man#ve5 945,{
+veins,161,63,3 script Old Man#ve5 4_M_DST_GRAND,{
mes "[Old Man]";
mes "Oh. You must be";
mes "sightseeing. Um,";
@@ -518,7 +518,7 @@ veins,161,63,3 script Old Man#ve5 945,{
close;
}
-veins,157,123,3 script Towner#ve15 946,{
+veins,157,123,3 script Towner#ve15 4_M_DST_MASTER,{
mes "[Towner]";
mes "You know what's good";
mes "about the desert? No?";
@@ -534,7 +534,7 @@ veins,157,123,3 script Towner#ve15 946,{
// Inside Veins
//============================================================
-ve_in,119,386,3 script Prisoner#ve1 946,{
+ve_in,119,386,3 script Prisoner#ve1 4_M_DST_MASTER,{
mes "[Prisoner]";
mes "Unbelievable!";
mes "What kind of country";
@@ -551,7 +551,7 @@ ve_in,119,386,3 script Prisoner#ve1 946,{
close;
}
-ve_in,111,379,8 script Ward#ve1 946,{
+ve_in,111,379,8 script Ward#ve1 4_M_DST_MASTER,{
mes "[Ward]";
mes "This place ensures that";
mes "dangerous criminals aren't";
@@ -562,7 +562,7 @@ ve_in,111,379,8 script Ward#ve1 946,{
close;
}
-ve_in,126,378,3 script Ward#ve2 946,{
+ve_in,126,378,3 script Ward#ve2 4_M_DST_MASTER,{
mes "[Ward]";
mes "I'm grateful that our";
mes "town is relatively peaceful.";
@@ -577,7 +577,7 @@ ve_in,126,378,3 script Ward#ve2 946,{
close;
}
-ve_in,101,314,1 script Towner#ve16 943,{
+ve_in,101,314,1 script Towner#ve16 4_M_DESERT,{
mes "[Towner]";
mes "^333333*Pant Pant*^000000";
mes "I must study as hard as I can";
@@ -591,7 +591,7 @@ ve_in,101,314,1 script Towner#ve16 943,{
close;
}
-ve_in,90,298,3 script Towner#ve17 849,{
+ve_in,90,298,3 script Towner#ve17 4_M_DIEMAN,{
mes "[Towner]";
mes "It's too hot...";
next;
@@ -600,7 +600,7 @@ ve_in,90,298,3 script Towner#ve17 849,{
close;
}
-ve_in,361,243,5 script Towner#ve18 849,{
+ve_in,361,243,5 script Towner#ve18 4_M_DIEMAN,{
mes "[Towner]";
mes "...............";
mes "...............";
@@ -618,7 +618,7 @@ ve_in,361,243,5 script Towner#ve18 849,{
close;
}
-ve_in,242,124,3 script Towner#ve19 849,{
+ve_in,242,124,3 script Towner#ve19 4_M_DIEMAN,{
mes "[Towner]";
mes "The drinks in this";
mes "town are so... They're...";
@@ -636,7 +636,7 @@ ve_in,242,124,3 script Towner#ve19 849,{
close;
}
-ve_in,180,232,5 script Towner#ve20 946,{
+ve_in,180,232,5 script Towner#ve20 4_M_DST_MASTER,{
mes "[Towner]";
mes "It's nice when a town";
mes "is peaceful and quiet...";
@@ -653,7 +653,7 @@ ve_in,180,232,5 script Towner#ve20 946,{
close;
}
-ve_in,163,212,3 script Towner#ve21 940,{
+ve_in,163,212,3 script Towner#ve21 4_F_DESERT,{
mes "[Towner]";
mes "There's nothing but";
mes "old people and children";
@@ -670,7 +670,7 @@ ve_in,163,212,3 script Towner#ve21 940,{
close;
}
-ve_in,190,215,3 script Towner#ve22 946,{
+ve_in,190,215,3 script Towner#ve22 4_M_DST_MASTER,{
mes "[Towner]";
mes "Well, our town doesn't";
mes "have a choice but to";
@@ -694,7 +694,7 @@ ve_in,190,215,3 script Towner#ve22 946,{
close;
}
-ve_in,318,121,3 script Towner#ve23 943,{
+ve_in,318,121,3 script Towner#ve23 4_M_DESERT,{
mes "[Towner]";
mes "This storage solely";
mes "exists for serious drinkers.";
@@ -718,7 +718,7 @@ ve_in,318,121,3 script Towner#ve23 943,{
close;
}
-ve_in,222,125,5 script Towner#ve24 943,{
+ve_in,222,125,5 script Towner#ve24 4_M_DESERT,{
mes "[Towner]";
mes "I really want to";
mes "ask out the woman";
@@ -732,7 +732,7 @@ ve_in,222,125,5 script Towner#ve24 943,{
close;
}
-ve_in,222,122,1 script Towner#ve25 940,{
+ve_in,222,122,1 script Towner#ve25 4_F_DESERT,{
mes "[Towner]";
mes "I heard all that...";
mes "Gosh, he's so clueless.";
@@ -743,7 +743,7 @@ ve_in,222,122,1 script Towner#ve25 940,{
close;
}
-ve_in,232,135,5 script Towner#ve26 946,{
+ve_in,232,135,5 script Towner#ve26 4_M_DST_MASTER,{
mes "[Towner]";
mes "If you enjoy a good,";
mes "stiff drink, then you have";
@@ -758,7 +758,7 @@ ve_in,232,135,5 script Towner#ve26 946,{
close;
}
-ve_in,239,135,5 script Towner#ve27 946,{
+ve_in,239,135,5 script Towner#ve27 4_M_DST_MASTER,{
mes "[Towner]";
mes "Isn't the sun so hot?";
mes "Doesn't it make you feel";
@@ -776,7 +776,7 @@ ve_in,239,135,5 script Towner#ve27 946,{
close;
}
-ve_in,232,124,5 script Towner#ve28 943,{
+ve_in,232,124,5 script Towner#ve28 4_M_DESERT,{
mes "[Towner]";
mes "A lone wolf of the desert.";
mes "That's me. Well, that's why";
@@ -789,7 +789,7 @@ ve_in,232,124,5 script Towner#ve28 943,{
close;
}
-ve_in,234,105,3 script Towner#ve29 946,{
+ve_in,234,105,3 script Towner#ve29 4_M_DST_MASTER,{
mes "[Towner]";
mes "Man, the world is just...";
mes "It's just desires...!";
diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index e3085c6b3..c1432c4c2 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -24,7 +24,7 @@
// Juno
//============================================================
-yuno,184,173,4 script Freidrich#juno 729,{
+yuno,184,173,4 script Freidrich#juno 4_F_NOVICE,{
if (rand(1,5) == 1) {
mes "[Freidrich]";
mes "^3355FFJuno^000000 is kept aloft in the air by an ancient and mysterious force.";
@@ -57,7 +57,7 @@ yuno,184,173,4 script Freidrich#juno 729,{
}
}
-yuno,337,227,4 script Juno Granny#juno 103,{
+yuno,337,227,4 script Juno Granny#juno 8_F_GRANDMOTHER,{
mes "[Granny]";
if (rand(1,50) == 1) {
if (Zeny > 999) {
@@ -111,7 +111,7 @@ yuno,337,227,4 script Juno Granny#juno 103,{
}
}
-yuno,328,239,4 script Juno Fighter#juno 732,{
+yuno,328,239,4 script Juno Fighter#juno 4_M_JOB_HUNTER,{
mes "[Sergiof]";
mes "My name is Sergiof,";
mes "the fighter who";
@@ -125,7 +125,7 @@ yuno,328,239,4 script Juno Fighter#juno 732,{
close;
}
-yuno,343,68,4 script Juno Despot#juno 730,{
+yuno,343,68,4 script Juno Despot#juno 4_M_JOB_ASSASSIN,{
mes "[Ninno]";
if (rand(1,1000) == 1) {
mes "You are very lucky to have me tell you this story. This only happens by ^FF33551 out of a 1,000 chance^000000.";
@@ -149,7 +149,7 @@ yuno,343,68,4 script Juno Despot#juno 730,{
close;
}
-yuno,165,111,4 script Juno Sage#juno 123,,{
+yuno,165,111,4 script Juno Sage#juno 2_F_MAGICMASTER,,{
mes "[Le Morpheus]";
if (rand(1,50) == 25) {
if (Zeny > 4999) {
@@ -196,7 +196,7 @@ yuno,165,111,4 script Juno Sage#juno 123,,{
}
}
-yuno,157,205,4 script Juno Artisan#juno 54,{
+yuno,157,205,4 script Juno Artisan#juno 1_M_JOBGUIDER,{
mes "[Artisan]";
mes "*Mumble mumble...*";
next;
@@ -337,7 +337,7 @@ yuno,157,205,4 script Juno Artisan#juno 54,{
close;
}
-yuno,142,183,5 script Airship Representative 100,{
+yuno,142,183,5 script Airship Representative 4W_SAILOR,{
mes "[Airship Representative]";
mes "Good day, I am here to inform you";
mes "about the Juno Airship which";
diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt
index 49e48c293..6f701d582 100644
--- a/npc/custom/battleground/bg_common.txt
+++ b/npc/custom/battleground/bg_common.txt
@@ -5,7 +5,7 @@
// BattleGround Warper - Entrance
// *********************************************************************
-- script Maroll Battle Recruiter::BatRecruit 728,{
+- script Maroll Battle Recruiter::BatRecruit 4_F_JOB_KNIGHT,{
mes "[Maroll Battle Recruiter]";
mes "Good day, adventurer.";
mes "I'm a knight from a far country called Maroll Kingdom.";
@@ -26,17 +26,17 @@
end;
}
-payon,189,104,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit1 728
-prontera,123,83,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit2 728
-rachel,149,138,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit3 728
-moc_ruins,75,162,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit4 728
-aldebaran,146,109,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit5 728
-lighthalzen,153,86,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit6 728
+payon,189,104,3 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit1 4_F_JOB_KNIGHT
+prontera,123,83,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit2 4_F_JOB_KNIGHT
+rachel,149,138,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit3 4_F_JOB_KNIGHT
+moc_ruins,75,162,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit4 4_F_JOB_KNIGHT
+aldebaran,146,109,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit5 4_F_JOB_KNIGHT
+lighthalzen,153,86,5 duplicate(BatRecruit) Maroll Battle Recruiter::BatRecruit6 4_F_JOB_KNIGHT
// BattleGround Warper - Exit
// *********************************************************************
-bat_room,148,150,4 script Teleporter#bat 124,{
+bat_room,148,150,4 script Teleporter#bat 4_F_TELEPORTER,{
mes "[Teleporter]";
mes "Do you wish to leave the battlefield? Use my service to return to town.";
next;
@@ -59,14 +59,14 @@ bat_room,148,150,4 script Teleporter#bat 124,{
// Kafra
// *********************************************************************
-bat_room,148,147,4 script Kafra Staff::kaf_bat 861,{
+bat_room,148,147,4 script Kafra Staff::kaf_bat 4_F_KAFRA9,{
cutin "kafra_09",2;
callfunc "F_Kafra",0,2,1,150,0;
}
// General Guillaume
// *********************************************************************
-bat_room,160,159,3 script General Guillaume 420,{
+bat_room,160,159,3 script General Guillaume 4_M_KY_KIYOM,{
cutin "bat_kiyom2",2;
mes "[General Guillaume]";
mes "Hot-blooded adventurer, we need your ability to win this battle.";
@@ -105,7 +105,7 @@ bat_room,160,159,3 script General Guillaume 420,{
// General Croix
// *********************************************************************
-bat_room,160,140,3 script Prince Croix 416,{
+bat_room,160,140,3 script Prince Croix 4_M_CRU_CRUA,{
cutin "bat_crua1",2;
mes "[Prince Croix]";
mes "Wise adventurer, why don't you lend us your power for victory?";
@@ -171,7 +171,7 @@ function script Time2Str {
// Guillaume Knight - Tierra Valley
// *********************************************************************
-bat_room,159,178,5 script Guillaume Knight#1 417,{
+bat_room,159,178,5 script Guillaume Knight#1 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
next;
@@ -190,7 +190,7 @@ bat_room,159,178,5 script Guillaume Knight#1 417,{
// Tierra Officer - Guillaume
// *********************************************************************
-bat_room,156,178,5 script Tierra Valley Officer#1 418,{
+bat_room,156,178,5 script Tierra Valley Officer#1 4_M_KY_KNT,{
mes "[Tierra Officer]";
if( Bat_Team == 2 )
{
@@ -241,7 +241,7 @@ bat_room,156,178,5 script Tierra Valley Officer#1 418,{
// Croix Knight - Tierra Valley
// *********************************************************************
-bat_room,159,121,1 script Croix Knight#1 413,{
+bat_room,159,121,1 script Croix Knight#1 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
next;
@@ -260,7 +260,7 @@ bat_room,159,121,1 script Croix Knight#1 413,{
// Tierra Officer - Croix
// *********************************************************************
-bat_room,156,121,1 script Tierra Valley Officer#2 414,{
+bat_room,156,121,1 script Tierra Valley Officer#2 4_M_CRU_KNT,{
mes "[Tierra Officer]";
if( Bat_Team == 1 )
{
@@ -311,7 +311,7 @@ bat_room,156,121,1 script Tierra Valley Officer#2 414,{
// Guillaume Knight - Tierra
// *********************************************************************
-bat_room,167,178,5 script Guillaume Knight#2 417,{
+bat_room,167,178,5 script Guillaume Knight#2 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
next;
@@ -330,7 +330,7 @@ bat_room,167,178,5 script Guillaume Knight#2 417,{
// Tierra Officer - Guillaume
// *********************************************************************
-bat_room,164,178,5 script Tierra Valley Officer#3 418,{
+bat_room,164,178,5 script Tierra Valley Officer#3 4_M_KY_KNT,{
mes "[Tierra Officer]";
if( Bat_Team == 2 )
{
@@ -381,7 +381,7 @@ bat_room,164,178,5 script Tierra Valley Officer#3 418,{
// Croix Knight - Tierra
// *********************************************************************
-bat_room,167,121,1 script Croix Knight#2 413,{
+bat_room,167,121,1 script Croix Knight#2 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "Tierra Gorge is a very steep canyon with two forts residing in the north and south ends of the map.";
next;
@@ -400,7 +400,7 @@ bat_room,167,121,1 script Croix Knight#2 413,{
// Tierra Officer - Croix
// *********************************************************************
-bat_room,164,121,1 script Tierra Valley Officer#4 414,{
+bat_room,164,121,1 script Tierra Valley Officer#4 4_M_CRU_KNT,{
mes "[Tierra Officer]";
if( Bat_Team == 1 )
{
@@ -451,7 +451,7 @@ bat_room,164,121,1 script Tierra Valley Officer#4 414,{
// Guillaune Knight - Flavius
// *********************************************************************
-bat_room,175,178,5 script Guillaume Knight#3 417,{
+bat_room,175,178,5 script Guillaume Knight#3 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -471,7 +471,7 @@ bat_room,175,178,5 script Guillaume Knight#3 417,{
// Flavius Officer - Guillaume
// *********************************************************************
-bat_room,172,178,5 script Flavius Officer#1 418,{
+bat_room,172,178,5 script Flavius Officer#1 4_M_KY_KNT,{
mes "[Flavius Officer]";
if( Bat_Team == 2 )
{
@@ -522,7 +522,7 @@ bat_room,172,178,5 script Flavius Officer#1 418,{
// Croix Knight - Flavius
// *********************************************************************
-bat_room,175,121,1 script Croix Knight#3 413,{
+bat_room,175,121,1 script Croix Knight#3 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -542,7 +542,7 @@ bat_room,175,121,1 script Croix Knight#3 413,{
// Flavius Officerer - Croix
// *********************************************************************
-bat_room,172,121,1 script Flavius Officer#2 414,{
+bat_room,172,121,1 script Flavius Officer#2 4_M_CRU_KNT,{
mes "[Flavius Officer]";
if( Bat_Team == 1 )
{
@@ -593,7 +593,7 @@ bat_room,172,121,1 script Flavius Officer#2 414,{
// Guillaune Knight - Flavius
// *********************************************************************
-bat_room,151,178,5 script Guillaume Knight#4 417,{
+bat_room,151,178,5 script Guillaume Knight#4 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -613,7 +613,7 @@ bat_room,151,178,5 script Guillaume Knight#4 417,{
// Flavius Officerer - Guillaume
// *********************************************************************
-bat_room,148,178,5 script Flavius Officer#3 418,{
+bat_room,148,178,5 script Flavius Officer#3 4_M_KY_KNT,{
mes "[Flavius Officer]";
if( Bat_Team == 2 )
{
@@ -664,7 +664,7 @@ bat_room,148,178,5 script Flavius Officer#3 418,{
// Croix Knight - Flavius
// *********************************************************************
-bat_room,151,121,1 script Croix Knight#4 413,{
+bat_room,151,121,1 script Croix Knight#4 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "The objective of the Flavius Battle is to score 2 points before your enemy by destroying their crystal.";
next;
@@ -684,7 +684,7 @@ bat_room,151,121,1 script Croix Knight#4 413,{
// Flavius Officerer - Croix
// *********************************************************************
-bat_room,148,121,1 script Flavius Officer#4 414,{
+bat_room,148,121,1 script Flavius Officer#4 4_M_CRU_KNT,{
mes "[Flavius Officer]";
if( Bat_Team == 1 )
{
@@ -735,7 +735,7 @@ bat_room,148,121,1 script Flavius Officer#4 414,{
// Guillaume Knight - KvM
// *********************************************************************
-bat_room,143,178,5 script Guillaume Knight#5 417,{
+bat_room,143,178,5 script Guillaume Knight#5 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -752,7 +752,7 @@ bat_room,143,178,5 script Guillaume Knight#5 417,{
// KvM Officerer - Guillaume
// *********************************************************************
-bat_room,140,178,5 script KVM [80-99] Officer#1 418,{
+bat_room,140,178,5 script KVM [80-99] Officer#1 4_M_KY_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 2 )
{
@@ -803,7 +803,7 @@ bat_room,140,178,5 script KVM [80-99] Officer#1 418,{
// Croix Knight - KvM
// *********************************************************************
-bat_room,143,121,1 script Croix Knight#5 413,{
+bat_room,143,121,1 script Croix Knight#5 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -820,7 +820,7 @@ bat_room,143,121,1 script Croix Knight#5 413,{
// KvM Officer - Croix
// *********************************************************************
-bat_room,140,121,1 script KVM [80-99] Officer#2 414,{
+bat_room,140,121,1 script KVM [80-99] Officer#2 4_M_CRU_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 1 )
{
@@ -871,7 +871,7 @@ bat_room,140,121,1 script KVM [80-99] Officer#2 414,{
// Guillaume Knight - KvM
// *********************************************************************
-bat_room,135,178,5 script Guillaume Knight#6 417,{
+bat_room,135,178,5 script Guillaume Knight#6 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -888,7 +888,7 @@ bat_room,135,178,5 script Guillaume Knight#6 417,{
// KvM Officerer - Guillaume
// *********************************************************************
-bat_room,132,178,5 script KVM [60-79] Officer#1 418,{
+bat_room,132,178,5 script KVM [60-79] Officer#1 4_M_KY_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 2 )
{
@@ -939,7 +939,7 @@ bat_room,132,178,5 script KVM [60-79] Officer#1 418,{
// Croix Knight - KvM
// *********************************************************************
-bat_room,135,121,1 script Croix Knight#6 413,{
+bat_room,135,121,1 script Croix Knight#6 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -956,7 +956,7 @@ bat_room,135,121,1 script Croix Knight#6 413,{
// KvM Officer - Croix
// *********************************************************************
-bat_room,132,121,1 script KVM [60-79] Officer#2 414,{
+bat_room,132,121,1 script KVM [60-79] Officer#2 4_M_CRU_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 1 )
{
@@ -1007,7 +1007,7 @@ bat_room,132,121,1 script KVM [60-79] Officer#2 414,{
// Guillaume Knight - KvM
// *********************************************************************
-bat_room,127,178,5 script Guillaume Knight#7 417,{
+bat_room,127,178,5 script Guillaume Knight#7 4_M_KY_SOLD,{
mes "[Guillaume Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -1024,7 +1024,7 @@ bat_room,127,178,5 script Guillaume Knight#7 417,{
// KvM Officerer - Guillaume
// *********************************************************************
-bat_room,124,178,5 script KVM [1-59] Officer#1 418,{
+bat_room,124,178,5 script KVM [1-59] Officer#1 4_M_KY_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 2 )
{
@@ -1075,7 +1075,7 @@ bat_room,124,178,5 script KVM [1-59] Officer#1 418,{
// Croix Knight - KvM
// *********************************************************************
-bat_room,127,121,1 script Croix Knight#7 413,{
+bat_room,127,121,1 script Croix Knight#7 4_M_CRU_SOLD,{
mes "[Croix Knight]";
mes "To win the Battle of Kriger Von Midgard you and your team must kill all the other opponents before all of you die.";
next;
@@ -1092,7 +1092,7 @@ bat_room,127,121,1 script Croix Knight#7 413,{
// KvM Officer - Croix
// *********************************************************************
-bat_room,124,121,1 script KVM [1-59] Officer#2 414,{
+bat_room,124,121,1 script KVM [1-59] Officer#2 4_M_CRU_KNT,{
mes "[KVM Officer]";
if( Bat_Team == 1 )
{
@@ -1144,16 +1144,16 @@ bat_room,124,121,1 script KVM [1-59] Officer#2 414,{
// Guard Dummy
// *********************************************************************
-bat_room,161,141,3 script Prince Croix's Aid::bat_aid 415,{ end; }
-bat_room,161,139,3 duplicate(bat_aid) Prince Croix's Aid::bat_aid2 415
-bat_room,161,160,3 duplicate(bat_aid) General Guillaume's Aid::bat_aid3 419
-bat_room,161,158,3 duplicate(bat_aid) General Guillaume's Aid::bat_aid4 419
+bat_room,161,141,3 script Prince Croix's Aid::bat_aid 4_M_CRU_HEAD,{ end; }
+bat_room,161,139,3 duplicate(bat_aid) Prince Croix's Aid::bat_aid2 4_M_CRU_HEAD
+bat_room,161,160,3 duplicate(bat_aid) General Guillaume's Aid::bat_aid3 4_M_KY_HEAD
+bat_room,161,158,3 duplicate(bat_aid) General Guillaume's Aid::bat_aid4 4_M_KY_HEAD
// Flags
// *********************************************************************
-- script Guillaume camp#bat 973,{ end; }
-- script Croix camp#bat 974,{ end; }
+- script Guillaume camp#bat 1_FLAG_LION,{ end; }
+- script Croix camp#bat 1_FLAG_EAGLE,{ end; }
// Exit from Registration
// *********************************************************************
@@ -1167,58 +1167,58 @@ OnTouch:
}
// Flavius bat_b02
-bat_room,57,81,0 duplicate(warp2bat_room) bat1 45,1,1
-bat_room,57,90,0 duplicate(warp2bat_room) bat2 45,1,1
+bat_room,57,81,0 duplicate(warp2bat_room) bat1 WARPNPC,1,1
+bat_room,57,90,0 duplicate(warp2bat_room) bat2 WARPNPC,1,1
// Free BG
-bat_room,57,220,0 duplicate(warp2bat_room) bat3 45,1,1
-bat_room,57,211,0 duplicate(warp2bat_room) bat4 45,1,1
+bat_room,57,220,0 duplicate(warp2bat_room) bat3 WARPNPC,1,1
+bat_room,57,211,0 duplicate(warp2bat_room) bat4 WARPNPC,1,1
// Tierra Valley bat_a02
-bat_room,85,81,0 duplicate(warp2bat_room) bat5 45,1,1
-bat_room,85,90,0 duplicate(warp2bat_room) bat6 45,1,1
+bat_room,85,81,0 duplicate(warp2bat_room) bat5 WARPNPC,1,1
+bat_room,85,90,0 duplicate(warp2bat_room) bat6 WARPNPC,1,1
// Tierra Valley bat_a01
-bat_room,85,220,0 duplicate(warp2bat_room) bat7 45,1,1
-bat_room,85,211,0 duplicate(warp2bat_room) bat8 45,1,1
+bat_room,85,220,0 duplicate(warp2bat_room) bat7 WARPNPC,1,1
+bat_room,85,211,0 duplicate(warp2bat_room) bat8 WARPNPC,1,1
// Free BG
-bat_room,113,81,0 duplicate(warp2bat_room) bat9 45,1,1
-bat_room,113,90,0 duplicate(warp2bat_room) bat10 45,1,1
+bat_room,113,81,0 duplicate(warp2bat_room) bat9 WARPNPC,1,1
+bat_room,113,90,0 duplicate(warp2bat_room) bat10 WARPNPC,1,1
// Free BG
-bat_room,113,220,0 duplicate(warp2bat_room) bat11 45,1,1
-bat_room,113,211,0 duplicate(warp2bat_room) bat12 45,1,1
+bat_room,113,220,0 duplicate(warp2bat_room) bat11 WARPNPC,1,1
+bat_room,113,211,0 duplicate(warp2bat_room) bat12 WARPNPC,1,1
// Free BG
-bat_room,141,81,0 duplicate(warp2bat_room) bat13 45,1,1
-bat_room,141,90,0 duplicate(warp2bat_room) bat14 45,1,1
+bat_room,141,81,0 duplicate(warp2bat_room) bat13 WARPNPC,1,1
+bat_room,141,90,0 duplicate(warp2bat_room) bat14 WARPNPC,1,1
// Free BG
-bat_room,141,220,0 duplicate(warp2bat_room) bat15 45,1,1
-bat_room,141,211,0 duplicate(warp2bat_room) bat16 45,1,1
+bat_room,141,220,0 duplicate(warp2bat_room) bat15 WARPNPC,1,1
+bat_room,141,211,0 duplicate(warp2bat_room) bat16 WARPNPC,1,1
// Free BG
-bat_room,169,81,0 duplicate(warp2bat_room) bat17 45,1,1
-bat_room,169,90,0 duplicate(warp2bat_room) bat18 45,1,1
+bat_room,169,81,0 duplicate(warp2bat_room) bat17 WARPNPC,1,1
+bat_room,169,90,0 duplicate(warp2bat_room) bat18 WARPNPC,1,1
// Free BG
-bat_room,169,220,0 duplicate(warp2bat_room) bat19 45,1,1
-bat_room,169,211,0 duplicate(warp2bat_room) bat20 45,1,1
+bat_room,169,220,0 duplicate(warp2bat_room) bat19 WARPNPC,1,1
+bat_room,169,211,0 duplicate(warp2bat_room) bat20 WARPNPC,1,1
// Free BG
-bat_room,197,81,0 duplicate(warp2bat_room) bat21 45,1,1
-bat_room,197,90,0 duplicate(warp2bat_room) bat22 45,1,1
+bat_room,197,81,0 duplicate(warp2bat_room) bat21 WARPNPC,1,1
+bat_room,197,90,0 duplicate(warp2bat_room) bat22 WARPNPC,1,1
// KvM bat_c03
-bat_room,197,220,0 duplicate(warp2bat_room) bat23 45,1,1
-bat_room,197,211,0 duplicate(warp2bat_room) bat24 45,1,1
+bat_room,197,220,0 duplicate(warp2bat_room) bat23 WARPNPC,1,1
+bat_room,197,211,0 duplicate(warp2bat_room) bat24 WARPNPC,1,1
// Free BG
-bat_room,225,81,0 duplicate(warp2bat_room) bat25 45,1,1
-bat_room,225,90,0 duplicate(warp2bat_room) bat26 45,1,1
+bat_room,225,81,0 duplicate(warp2bat_room) bat25 WARPNPC,1,1
+bat_room,225,90,0 duplicate(warp2bat_room) bat26 WARPNPC,1,1
// KvM bat_c02
-bat_room,225,220,0 duplicate(warp2bat_room) bat27 45,1,1
-bat_room,225,211,0 duplicate(warp2bat_room) bat28 45,1,1
+bat_room,225,220,0 duplicate(warp2bat_room) bat27 WARPNPC,1,1
+bat_room,225,211,0 duplicate(warp2bat_room) bat28 WARPNPC,1,1
// Flavius bat_b01
-bat_room,253,81,0 duplicate(warp2bat_room) bat29 45,1,1
-bat_room,253,90,0 duplicate(warp2bat_room) bat30 45,1,1
+bat_room,253,81,0 duplicate(warp2bat_room) bat29 WARPNPC,1,1
+bat_room,253,90,0 duplicate(warp2bat_room) bat30 WARPNPC,1,1
// KvM bat_c01
-bat_room,253,220,0 duplicate(warp2bat_room) bat31 45,1,1
-bat_room,253,211,0 duplicate(warp2bat_room) bat32 45,1,1
+bat_room,253,220,0 duplicate(warp2bat_room) bat31 WARPNPC,1,1
+bat_room,253,211,0 duplicate(warp2bat_room) bat32 WARPNPC,1,1
// Badges Repairman
// *********************************************************************
-bat_room,138,144,5 script Repairman#bg 99,{
+bat_room,138,144,5 script Repairman#bg 4W_M_03,{
callfunc "repairmain","Repairman";
end;
}
@@ -1226,7 +1226,7 @@ bat_room,138,144,5 script Repairman#bg 99,{
// Badges Exchange
// *********************************************************************
-bat_room,160,150,3 script Erundek 109,{
+bat_room,160,150,3 script Erundek 4_M_MANAGER,{
mes "[Erundek]";
mes "Welcome, mighty warrior.";
mes "What can I do for you today ?";
diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index 4bb6fa7be..0d2ee8a7e 100644
--- a/npc/custom/battleground/bg_flavius_01.txt
+++ b/npc/custom/battleground/bg_flavius_01.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,86,227,4 script Registration::Fl1R_Guillaume 418,{
+bat_room,86,227,4 script Registration::Fl1R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Flavius_BG1::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
end;
}
-bat_room,85,204,0 script Registration::Fl1R_Croix 414,{
+bat_room,85,204,0 script Registration::Fl1R_Croix 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Flavius_BG1::OnCroixJoin",1;
@@ -268,7 +268,7 @@ OnReset:
// Battleground rewards
// *********************************************************************
-bat_b01,390,13,5 script Guillaume Vintenar#fl1 419,{
+bat_b01,390,13,5 script Guillaume Vintenar#fl1 4_M_KY_HEAD,{
if( $@FlaviusBG1_Victory )
{
if( $@FlaviusBG1_Victory == Bat_Team )
@@ -299,7 +299,7 @@ bat_b01,390,13,5 script Guillaume Vintenar#fl1 419,{
end;
}
-bat_b01,10,293,5 script Croix Vintenar#fl1 415,{
+bat_b01,10,293,5 script Croix Vintenar#fl1 4_M_CRU_HEAD,{
if( $@FlaviusBG1_Victory )
{
if( $@FlaviusBG1_Victory == Bat_Team )
@@ -333,7 +333,7 @@ bat_b01,10,293,5 script Croix Vintenar#fl1 415,{
// Battleground Therapist
// *********************************************************************
-bat_b01,390,13,5 script Therapist in battle#fl12 95,{
+bat_b01,390,13,5 script Therapist in battle#fl12 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -341,7 +341,7 @@ bat_b01,390,13,5 script Therapist in battle#fl12 95,{
close;
}
-bat_b01,10,293,5 script Therapist in battle#fl11 95,{
+bat_b01,10,293,5 script Therapist in battle#fl11 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -352,7 +352,7 @@ bat_b01,10,293,5 script Therapist in battle#fl11 95,{
// Battleground Respawn
// *********************************************************************
-bat_b01,390,10,0 script #gfl1_respawn 139,{
+bat_b01,390,10,0 script #gfl1_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -374,7 +374,7 @@ OnTimer25000:
end;
}
-bat_b01,10,290,0 script #cfl1_respawn 139,{
+bat_b01,10,290,0 script #cfl1_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -399,30 +399,30 @@ OnTimer25000:
// Flags
// *********************************************************************
-bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat1 973
-bat_b01,319,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat2 973
-bat_b01,304,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat3 973
-bat_b01,319,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat4 973
-bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat5 973
-bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat6 973
-bat_b01,335,142,1 duplicate(Guillaume camp#bat) Guillaume camp#bat7 973
-bat_b01,335,157,1 duplicate(Guillaume camp#bat) Guillaume camp#bat8 973
-bat_b01,390,16,1 duplicate(Guillaume camp#bat) Guillaume camp#bat9 973
-bat_b01,292,163,1 duplicate(Guillaume camp#bat) Guillaume camp#bat19 973
-bat_b01,292,136,1 duplicate(Guillaume camp#bat) Guillaume camp#bat20 973
-bat_b01,241,185,1 duplicate(Guillaume camp#bat) Guillaume camp#bat21 973
-bat_b01,247,179,1 duplicate(Guillaume camp#bat) Guillaume camp#bat22 973
-
-bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat1 974
-bat_b01,96,68,1 duplicate(Croix camp#bat) Croix camp#bat2 974
-bat_b01,79,81,1 duplicate(Croix camp#bat) Croix camp#bat3 974
-bat_b01,79,68,1 duplicate(Croix camp#bat) Croix camp#bat4 974
-bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat5 974
-bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat6 974
-bat_b01,59,164,1 duplicate(Croix camp#bat) Croix camp#bat7 974
-bat_b01,59,137,1 duplicate(Croix camp#bat) Croix camp#bat8 974
-bat_b01,10,296,1 duplicate(Croix camp#bat) Croix camp#bat9 974
-bat_b01,110,162,1 duplicate(Croix camp#bat) Croix camp#bat18 974
-bat_b01,110,137,1 duplicate(Croix camp#bat) Croix camp#bat19 974
-bat_b01,152,120,1 duplicate(Croix camp#bat) Croix camp#bat20 974
-bat_b01,158,114,1 duplicate(Croix camp#bat) Croix camp#bat21 974
+bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat1 1_FLAG_LION
+bat_b01,319,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat2 1_FLAG_LION
+bat_b01,304,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat3 1_FLAG_LION
+bat_b01,319,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat4 1_FLAG_LION
+bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat5 1_FLAG_LION
+bat_b01,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat6 1_FLAG_LION
+bat_b01,335,142,1 duplicate(Guillaume camp#bat) Guillaume camp#bat7 1_FLAG_LION
+bat_b01,335,157,1 duplicate(Guillaume camp#bat) Guillaume camp#bat8 1_FLAG_LION
+bat_b01,390,16,1 duplicate(Guillaume camp#bat) Guillaume camp#bat9 1_FLAG_LION
+bat_b01,292,163,1 duplicate(Guillaume camp#bat) Guillaume camp#bat19 1_FLAG_LION
+bat_b01,292,136,1 duplicate(Guillaume camp#bat) Guillaume camp#bat20 1_FLAG_LION
+bat_b01,241,185,1 duplicate(Guillaume camp#bat) Guillaume camp#bat21 1_FLAG_LION
+bat_b01,247,179,1 duplicate(Guillaume camp#bat) Guillaume camp#bat22 1_FLAG_LION
+
+bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat1 1_FLAG_EAGLE
+bat_b01,96,68,1 duplicate(Croix camp#bat) Croix camp#bat2 1_FLAG_EAGLE
+bat_b01,79,81,1 duplicate(Croix camp#bat) Croix camp#bat3 1_FLAG_EAGLE
+bat_b01,79,68,1 duplicate(Croix camp#bat) Croix camp#bat4 1_FLAG_EAGLE
+bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat5 1_FLAG_EAGLE
+bat_b01,96,81,1 duplicate(Croix camp#bat) Croix camp#bat6 1_FLAG_EAGLE
+bat_b01,59,164,1 duplicate(Croix camp#bat) Croix camp#bat7 1_FLAG_EAGLE
+bat_b01,59,137,1 duplicate(Croix camp#bat) Croix camp#bat8 1_FLAG_EAGLE
+bat_b01,10,296,1 duplicate(Croix camp#bat) Croix camp#bat9 1_FLAG_EAGLE
+bat_b01,110,162,1 duplicate(Croix camp#bat) Croix camp#bat18 1_FLAG_EAGLE
+bat_b01,110,137,1 duplicate(Croix camp#bat) Croix camp#bat19 1_FLAG_EAGLE
+bat_b01,152,120,1 duplicate(Croix camp#bat) Croix camp#bat20 1_FLAG_EAGLE
+bat_b01,158,114,1 duplicate(Croix camp#bat) Croix camp#bat21 1_FLAG_EAGLE
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index 4dc180d14..3e5215faa 100644
--- a/npc/custom/battleground/bg_flavius_02.txt
+++ b/npc/custom/battleground/bg_flavius_02.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,142,227,4 script Registration::Fl2R_Guillaume 418,{
+bat_room,142,227,4 script Registration::Fl2R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Flavius_BG2::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
end;
}
-bat_room,142,204,0 script Registration::Fl2R_Croix 414,{
+bat_room,142,204,0 script Registration::Fl2R_Croix 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Flavius_BG2::OnCroixJoin",1;
@@ -268,7 +268,7 @@ OnReset:
// Battleground rewards
// *********************************************************************
-bat_b02,390,13,5 script Guillaume Vintenar#fl2 419,{
+bat_b02,390,13,5 script Guillaume Vintenar#fl2 4_M_KY_HEAD,{
if( $@FlaviusBG2_Victory )
{
if( $@FlaviusBG2_Victory == Bat_Team )
@@ -299,7 +299,7 @@ bat_b02,390,13,5 script Guillaume Vintenar#fl2 419,{
end;
}
-bat_b02,10,293,5 script Croix Vintenar#fl2 415,{
+bat_b02,10,293,5 script Croix Vintenar#fl2 4_M_CRU_HEAD,{
if( $@FlaviusBG2_Victory )
{
if( $@FlaviusBG2_Victory == Bat_Team )
@@ -333,7 +333,7 @@ bat_b02,10,293,5 script Croix Vintenar#fl2 415,{
// Battleground Therapist
// *********************************************************************
-bat_b02,390,13,5 script Therapist in battle#fl22 95,{
+bat_b02,390,13,5 script Therapist in battle#fl22 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -341,7 +341,7 @@ bat_b02,390,13,5 script Therapist in battle#fl22 95,{
close;
}
-bat_b02,10,293,5 script Therapist in battle#fl21 95,{
+bat_b02,10,293,5 script Therapist in battle#fl21 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -352,7 +352,7 @@ bat_b02,10,293,5 script Therapist in battle#fl21 95,{
// Battleground Respawn
// *********************************************************************
-bat_b02,390,10,0 script #gfl2_respawn 139,{
+bat_b02,390,10,0 script #gfl2_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -374,7 +374,7 @@ OnTimer25000:
end;
}
-bat_b02,10,290,0 script #cfl2_respawn 139,{
+bat_b02,10,290,0 script #cfl2_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -399,30 +399,30 @@ OnTimer25000:
// Flags
// *********************************************************************
-bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat32 973
-bat_b02,319,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat33 973
-bat_b02,304,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat34 973
-bat_b02,319,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat35 973
-bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat36 973
-bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat37 973
-bat_b02,335,142,1 duplicate(Guillaume camp#bat) Guillaume camp#bat38 973
-bat_b02,335,157,1 duplicate(Guillaume camp#bat) Guillaume camp#bat39 973
-bat_b02,390,16,1 duplicate(Guillaume camp#bat) Guillaume camp#bat40 973
-bat_b02,292,163,1 duplicate(Guillaume camp#bat) Guillaume camp#bat41 973
-bat_b02,292,136,1 duplicate(Guillaume camp#bat) Guillaume camp#bat42 973
-bat_b02,241,185,1 duplicate(Guillaume camp#bat) Guillaume camp#bat43 973
-bat_b02,247,179,1 duplicate(Guillaume camp#bat) Guillaume camp#bat44 973
-
-bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat30 974
-bat_b02,96,68,1 duplicate(Croix camp#bat) Croix camp#bat31 974
-bat_b02,79,81,1 duplicate(Croix camp#bat) Croix camp#bat32 974
-bat_b02,79,68,1 duplicate(Croix camp#bat) Croix camp#bat33 974
-bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat34 974
-bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat35 974
-bat_b02,59,164,1 duplicate(Croix camp#bat) Croix camp#bat36 974
-bat_b02,59,137,1 duplicate(Croix camp#bat) Croix camp#bat37 974
-bat_b02,10,296,1 duplicate(Croix camp#bat) Croix camp#bat38 974
-bat_b02,110,162,1 duplicate(Croix camp#bat) Croix camp#bat39 974
-bat_b02,110,137,1 duplicate(Croix camp#bat) Croix camp#bat40 974
-bat_b02,152,120,1 duplicate(Croix camp#bat) Croix camp#bat41 974
-bat_b02,158,114,1 duplicate(Croix camp#bat) Croix camp#bat42 974
+bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat32 1_FLAG_LION
+bat_b02,319,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat33 1_FLAG_LION
+bat_b02,304,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat34 1_FLAG_LION
+bat_b02,319,218,1 duplicate(Guillaume camp#bat) Guillaume camp#bat35 1_FLAG_LION
+bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat36 1_FLAG_LION
+bat_b02,304,231,1 duplicate(Guillaume camp#bat) Guillaume camp#bat37 1_FLAG_LION
+bat_b02,335,142,1 duplicate(Guillaume camp#bat) Guillaume camp#bat38 1_FLAG_LION
+bat_b02,335,157,1 duplicate(Guillaume camp#bat) Guillaume camp#bat39 1_FLAG_LION
+bat_b02,390,16,1 duplicate(Guillaume camp#bat) Guillaume camp#bat40 1_FLAG_LION
+bat_b02,292,163,1 duplicate(Guillaume camp#bat) Guillaume camp#bat41 1_FLAG_LION
+bat_b02,292,136,1 duplicate(Guillaume camp#bat) Guillaume camp#bat42 1_FLAG_LION
+bat_b02,241,185,1 duplicate(Guillaume camp#bat) Guillaume camp#bat43 1_FLAG_LION
+bat_b02,247,179,1 duplicate(Guillaume camp#bat) Guillaume camp#bat44 1_FLAG_LION
+
+bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat30 1_FLAG_EAGLE
+bat_b02,96,68,1 duplicate(Croix camp#bat) Croix camp#bat31 1_FLAG_EAGLE
+bat_b02,79,81,1 duplicate(Croix camp#bat) Croix camp#bat32 1_FLAG_EAGLE
+bat_b02,79,68,1 duplicate(Croix camp#bat) Croix camp#bat33 1_FLAG_EAGLE
+bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat34 1_FLAG_EAGLE
+bat_b02,96,81,1 duplicate(Croix camp#bat) Croix camp#bat35 1_FLAG_EAGLE
+bat_b02,59,164,1 duplicate(Croix camp#bat) Croix camp#bat36 1_FLAG_EAGLE
+bat_b02,59,137,1 duplicate(Croix camp#bat) Croix camp#bat37 1_FLAG_EAGLE
+bat_b02,10,296,1 duplicate(Croix camp#bat) Croix camp#bat38 1_FLAG_EAGLE
+bat_b02,110,162,1 duplicate(Croix camp#bat) Croix camp#bat39 1_FLAG_EAGLE
+bat_b02,110,137,1 duplicate(Croix camp#bat) Croix camp#bat40 1_FLAG_EAGLE
+bat_b02,152,120,1 duplicate(Croix camp#bat) Croix camp#bat41 1_FLAG_EAGLE
+bat_b02,158,114,1 duplicate(Croix camp#bat) Croix camp#bat42 1_FLAG_EAGLE
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt
index 36c758f37..ed8e0ad76 100644
--- a/npc/custom/battleground/bg_kvm01.txt
+++ b/npc/custom/battleground/bg_kvm01.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,253,227,4 script Registration::KvM01R_Guillaume 418,{ // KvM Guillaume
+bat_room,253,227,4 script Registration::KvM01R_Guillaume 4_M_KY_KNT,{ // KvM Guillaume
end;
OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
end;
}
-bat_room,253,204,0 script Registration::KvM01R_Croix 414,{ // KvM Croix
+bat_room,253,204,0 script Registration::KvM01R_Croix 4_M_CRU_KNT,{ // KvM Croix
end;
OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
// Light Effects
// *********************************************************************
-bat_c01,54,123,0 script #bat_c01a 111,{
+bat_c01,54,123,0 script #bat_c01a HIDDEN_NPC,{
end;
OnKvM01LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM01LightB: misceffect 55; end;
OnKvM01LightC: misceffect 56; end;
}
-bat_c01,56,125,0 duplicate(#bat_c01a) #bat_c01b 111
-bat_c01,58,127,0 duplicate(#bat_c01a) #bat_c01c 111
-bat_c01,141,56,0 duplicate(#bat_c01a) #bat_c01d 111
-bat_c01,143,58,0 duplicate(#bat_c01a) #bat_c01e 111
-bat_c01,145,60,0 duplicate(#bat_c01a) #bat_c01f 111
+bat_c01,56,125,0 duplicate(#bat_c01a) #bat_c01b HIDDEN_NPC
+bat_c01,58,127,0 duplicate(#bat_c01a) #bat_c01c HIDDEN_NPC
+bat_c01,141,56,0 duplicate(#bat_c01a) #bat_c01d HIDDEN_NPC
+bat_c01,143,58,0 duplicate(#bat_c01a) #bat_c01e HIDDEN_NPC
+bat_c01,145,60,0 duplicate(#bat_c01a) #bat_c01f HIDDEN_NPC
// Battleground Engine
// *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
// Battleground Therapist
// *********************************************************************
-bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 95,{
+bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c01,51,130,5 script Therapist in battle::TherapistKvM01a 95,{
close;
}
-bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 95,{
+bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c01,148,53,1 script Therapist in battle::TherapistKvM01b 95,{
// Battleground rewards
// *********************************************************************
-bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 419,{
+bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 4_M_KY_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM01BG_Victory == 3 )
@@ -339,7 +339,7 @@ bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 419,{
end;
}
-bat_c01,148,53,1 script Croix Vintenar::VintenarKvM01b 415,{
+bat_c01,148,53,1 script Croix Vintenar::VintenarKvM01b 4_M_CRU_HEAD,{
if( $@KvM01BG_Victory )
{
if( $@KvM01BG_Victory == 3 )
diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt
index 5bfbba328..919b7a583 100644
--- a/npc/custom/battleground/bg_kvm02.txt
+++ b/npc/custom/battleground/bg_kvm02.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,225,227,4 script Registration::KvM02R_Guillaume 418,{ // KvM Guillaume
+bat_room,225,227,4 script Registration::KvM02R_Guillaume 4_M_KY_KNT,{ // KvM Guillaume
end;
OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
end;
}
-bat_room,225,204,0 script Registration::KvM02R_Croix 414,{ // KvM Croix
+bat_room,225,204,0 script Registration::KvM02R_Croix 4_M_CRU_KNT,{ // KvM Croix
end;
OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
// Light Effects
// *********************************************************************
-bat_c02,54,123,0 script #bat_c02a 111,{
+bat_c02,54,123,0 script #bat_c02a HIDDEN_NPC,{
end;
OnKvM02LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM02LightB: misceffect 55; end;
OnKvM02LightC: misceffect 56; end;
}
-bat_c02,56,125,0 duplicate(#bat_c02a) #bat_c02b 111
-bat_c02,58,127,0 duplicate(#bat_c02a) #bat_c02c 111
-bat_c02,141,56,0 duplicate(#bat_c02a) #bat_c02d 111
-bat_c02,143,58,0 duplicate(#bat_c02a) #bat_c02e 111
-bat_c02,145,60,0 duplicate(#bat_c02a) #bat_c02f 111
+bat_c02,56,125,0 duplicate(#bat_c02a) #bat_c02b HIDDEN_NPC
+bat_c02,58,127,0 duplicate(#bat_c02a) #bat_c02c HIDDEN_NPC
+bat_c02,141,56,0 duplicate(#bat_c02a) #bat_c02d HIDDEN_NPC
+bat_c02,143,58,0 duplicate(#bat_c02a) #bat_c02e HIDDEN_NPC
+bat_c02,145,60,0 duplicate(#bat_c02a) #bat_c02f HIDDEN_NPC
// Battleground Engine
// *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
// Battleground Therapist
// *********************************************************************
-bat_c02,51,130,5 script Therapist in battle::TherapistKvM02a 95,{
+bat_c02,51,130,5 script Therapist in battle::TherapistKvM02a 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c02,51,130,5 script Therapist in battle::TherapistKvM02a 95,{
close;
}
-bat_c02,148,53,1 script Therapist in battle::TherapistKvM02b 95,{
+bat_c02,148,53,1 script Therapist in battle::TherapistKvM02b 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c02,148,53,1 script Therapist in battle::TherapistKvM02b 95,{
// Battleground rewards
// *********************************************************************
-bat_c02,51,130,5 script Guillaume Vintenar::VintenarKvM02a 419,{
+bat_c02,51,130,5 script Guillaume Vintenar::VintenarKvM02a 4_M_KY_HEAD,{
if( $@KvM02BG_Victory )
{
if( $@KvM02BG_Victory == 3 )
@@ -339,7 +339,7 @@ bat_c02,51,130,5 script Guillaume Vintenar::VintenarKvM02a 419,{
end;
}
-bat_c02,148,53,1 script Croix Vintenar::VintenarKvM02b 415,{
+bat_c02,148,53,1 script Croix Vintenar::VintenarKvM02b 4_M_CRU_HEAD,{
if( $@KvM02BG_Victory )
{
if( $@KvM02BG_Victory == 3 )
diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt
index 6efa99e4c..b13624067 100644
--- a/npc/custom/battleground/bg_kvm03.txt
+++ b/npc/custom/battleground/bg_kvm03.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,197,227,4 script Registration::KvM03R_Guillaume 418,{ // KvM Guillaume
+bat_room,197,227,4 script Registration::KvM03R_Guillaume 4_M_KY_KNT,{ // KvM Guillaume
end;
OnInit:
@@ -17,7 +17,7 @@ OnEnterBG:
end;
}
-bat_room,197,204,0 script Registration::KvM03R_Croix 414,{ // KvM Croix
+bat_room,197,204,0 script Registration::KvM03R_Croix 4_M_CRU_KNT,{ // KvM Croix
end;
OnInit:
@@ -32,7 +32,7 @@ OnEnterBG:
// Light Effects
// *********************************************************************
-bat_c03,54,123,0 script #bat_c03a 111,{
+bat_c03,54,123,0 script #bat_c03a HIDDEN_NPC,{
end;
OnKvM03LightA: misceffect 54; end;
@@ -40,11 +40,11 @@ OnKvM03LightB: misceffect 55; end;
OnKvM03LightC: misceffect 56; end;
}
-bat_c03,56,125,0 duplicate(#bat_c03a) #bat_c03b 111
-bat_c03,58,127,0 duplicate(#bat_c03a) #bat_c03c 111
-bat_c03,141,56,0 duplicate(#bat_c03a) #bat_c03d 111
-bat_c03,143,58,0 duplicate(#bat_c03a) #bat_c03e 111
-bat_c03,145,60,0 duplicate(#bat_c03a) #bat_c03f 111
+bat_c03,56,125,0 duplicate(#bat_c03a) #bat_c03b HIDDEN_NPC
+bat_c03,58,127,0 duplicate(#bat_c03a) #bat_c03c HIDDEN_NPC
+bat_c03,141,56,0 duplicate(#bat_c03a) #bat_c03d HIDDEN_NPC
+bat_c03,143,58,0 duplicate(#bat_c03a) #bat_c03e HIDDEN_NPC
+bat_c03,145,60,0 duplicate(#bat_c03a) #bat_c03f HIDDEN_NPC
// Battleground Engine
// *********************************************************************
@@ -282,7 +282,7 @@ OnTimer60000:
// Battleground Therapist
// *********************************************************************
-bat_c03,51,130,5 script Therapist in battle::TherapistKvM03a 95,{
+bat_c03,51,130,5 script Therapist in battle::TherapistKvM03a 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -290,7 +290,7 @@ bat_c03,51,130,5 script Therapist in battle::TherapistKvM03a 95,{
close;
}
-bat_c03,148,53,1 script Therapist in battle::TherapistKvM03b 95,{
+bat_c03,148,53,1 script Therapist in battle::TherapistKvM03b 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -301,7 +301,7 @@ bat_c03,148,53,1 script Therapist in battle::TherapistKvM03b 95,{
// Battleground rewards
// *********************************************************************
-bat_c03,51,130,5 script Guillaume Vintenar::VintenarKvM03a 419,{
+bat_c03,51,130,5 script Guillaume Vintenar::VintenarKvM03a 4_M_KY_HEAD,{
if( $@KvM03BG_Victory )
{
if( $@KvM03BG_Victory == 3 )
@@ -339,7 +339,7 @@ bat_c03,51,130,5 script Guillaume Vintenar::VintenarKvM03a 419,{
end;
}
-bat_c03,148,53,1 script Croix Vintenar::VintenarKvM03b 415,{
+bat_c03,148,53,1 script Croix Vintenar::VintenarKvM03b 4_M_CRU_HEAD,{
if( $@KvM03BG_Victory )
{
if( $@KvM03BG_Victory == 3 )
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index 4c65d0462..c6a6c3b36 100644
--- a/npc/custom/battleground/bg_tierra_01.txt
+++ b/npc/custom/battleground/bg_tierra_01.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,58,227,4 script Registration::TV1R_Guillaume 418,{
+bat_room,58,227,4 script Registration::TV1R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Tierra_BG1::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
end;
}
-bat_room,58,204,0 script Registration::TV1R_Croix 414,{
+bat_room,58,204,0 script Registration::TV1R_Croix 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Tierra_BG1::OnCroixJoin",1;
@@ -241,23 +241,23 @@ OnReset:
// Other Flags
// *********************************************************************
-bat_a01,148,85,1 duplicate(Croix camp#bat) Croix camp#bat10 974
-bat_a01,155,85,1 duplicate(Croix camp#bat) Croix camp#bat11 974
-bat_a01,357,75,1 duplicate(Croix camp#bat) Croix camp#bat12 974
-bat_a01,348,74,1 duplicate(Croix camp#bat) Croix camp#bat13 974
-bat_a01,199,49,1 duplicate(Croix camp#bat) Croix camp#bat14 974
-bat_a01,168,16,1 duplicate(Croix camp#bat) Croix camp#bat15 974
-bat_a01,138,12,1 duplicate(Croix camp#bat) Croix camp#bat16 974
-bat_a01,108,35,1 duplicate(Croix camp#bat) Croix camp#bat17 974
-bat_a01,164,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat10 973
-bat_a01,157,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat11 973
-bat_a01,359,327,1 duplicate(Guillaume camp#bat) Guillaume camp#bat12 973
-bat_a01,350,326,1 duplicate(Guillaume camp#bat) Guillaume camp#bat13 973
-bat_a01,209,344,1 duplicate(Guillaume camp#bat) Guillaume camp#bat14 973
-bat_a01,173,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat15 973
-bat_a01,150,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat16 973
-bat_a01,118,357,1 duplicate(Guillaume camp#bat) Guillaume camp#bat17 973
-bat_a01,119,336,1 duplicate(Guillaume camp#bat) Guillaume camp#bat18 973
+bat_a01,148,85,1 duplicate(Croix camp#bat) Croix camp#bat10 1_FLAG_EAGLE
+bat_a01,155,85,1 duplicate(Croix camp#bat) Croix camp#bat11 1_FLAG_EAGLE
+bat_a01,357,75,1 duplicate(Croix camp#bat) Croix camp#bat12 1_FLAG_EAGLE
+bat_a01,348,74,1 duplicate(Croix camp#bat) Croix camp#bat13 1_FLAG_EAGLE
+bat_a01,199,49,1 duplicate(Croix camp#bat) Croix camp#bat14 1_FLAG_EAGLE
+bat_a01,168,16,1 duplicate(Croix camp#bat) Croix camp#bat15 1_FLAG_EAGLE
+bat_a01,138,12,1 duplicate(Croix camp#bat) Croix camp#bat16 1_FLAG_EAGLE
+bat_a01,108,35,1 duplicate(Croix camp#bat) Croix camp#bat17 1_FLAG_EAGLE
+bat_a01,164,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat10 1_FLAG_LION
+bat_a01,157,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat11 1_FLAG_LION
+bat_a01,359,327,1 duplicate(Guillaume camp#bat) Guillaume camp#bat12 1_FLAG_LION
+bat_a01,350,326,1 duplicate(Guillaume camp#bat) Guillaume camp#bat13 1_FLAG_LION
+bat_a01,209,344,1 duplicate(Guillaume camp#bat) Guillaume camp#bat14 1_FLAG_LION
+bat_a01,173,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat15 1_FLAG_LION
+bat_a01,150,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat16 1_FLAG_LION
+bat_a01,118,357,1 duplicate(Guillaume camp#bat) Guillaume camp#bat17 1_FLAG_LION
+bat_a01,119,336,1 duplicate(Guillaume camp#bat) Guillaume camp#bat18 1_FLAG_LION
// Barricades
// *********************************************************************
@@ -317,7 +317,7 @@ OnWall:
// Battleground rewards
// *********************************************************************
-bat_a01,45,19,3 script Croix Vintenar#tv1 415,{
+bat_a01,45,19,3 script Croix Vintenar#tv1 4_M_CRU_HEAD,{
if( $@TierraBG1_Victory )
{
if( $@TierraBG1_Victory == Bat_Team )
@@ -348,7 +348,7 @@ bat_a01,45,19,3 script Croix Vintenar#tv1 415,{
end;
}
-bat_a01,53,377,3 script Guillaume Vintenar#tv1 419,{
+bat_a01,53,377,3 script Guillaume Vintenar#tv1 4_M_KY_HEAD,{
if( $@TierraBG1_Victory )
{
if( $@TierraBG1_Victory == Bat_Team )
@@ -382,14 +382,14 @@ bat_a01,53,377,3 script Guillaume Vintenar#tv1 419,{
// Battleground Therapist
// *********************************************************************
-bat_a01,60,216,3 script Ghost#tv13 950,{
+bat_a01,60,216,3 script Ghost#tv13 4_GHOSTRING,{
mes "[Ghost in valley]";
mes "Boo...Boo...";
specialeffect2 312;
close;
}
-bat_a01,53,377,3 script Therapist in battle#tv12 95,{
+bat_a01,53,377,3 script Therapist in battle#tv12 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -397,7 +397,7 @@ bat_a01,53,377,3 script Therapist in battle#tv12 95,{
close;
}
-bat_a01,45,18,3 script Therapist in battle#tv11 95,{
+bat_a01,45,18,3 script Therapist in battle#tv11 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -408,7 +408,7 @@ bat_a01,45,18,3 script Therapist in battle#tv11 95,{
// Battleground Respawn
// *********************************************************************
-bat_a01,57,213,0 script #ntv1_respawn 139,{
+bat_a01,57,213,0 script #ntv1_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -430,7 +430,7 @@ OnTimer20000:
end;
}
-bat_a01,50,374,0 script #gtv1_respawn 139,{
+bat_a01,50,374,0 script #gtv1_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -452,7 +452,7 @@ OnTimer25000:
end;
}
-bat_a01,42,16,0 script #ctv1_respawn 139,{
+bat_a01,42,16,0 script #ctv1_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index 7f72cdb3d..23b58dffd 100644
--- a/npc/custom/battleground/bg_tierra_02.txt
+++ b/npc/custom/battleground/bg_tierra_02.txt
@@ -5,7 +5,7 @@
// Registration NPC's
// *********************************************************************
-bat_room,114,227,4 script Registration::TV2R_Guillaume 418,{
+bat_room,114,227,4 script Registration::TV2R_Guillaume 4_M_KY_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Tierra_BG2::OnGuillaumeJoin",1;
@@ -15,7 +15,7 @@ OnEnterBG:
end;
}
-bat_room,114,204,0 script Registration::TV2R_Croix 414,{
+bat_room,114,204,0 script Registration::TV2R_Croix 4_M_CRU_KNT,{
end;
OnInit:
waitingroom "Battle Station 10 Players",10,"Tierra_BG2::OnCroixJoin",1;
@@ -241,23 +241,23 @@ OnReset:
// Other Flags
// *********************************************************************
-bat_a02,148,85,1 duplicate(Croix camp#bat) Croix camp#bat22 974
-bat_a02,155,85,1 duplicate(Croix camp#bat) Croix camp#bat23 974
-bat_a02,357,75,1 duplicate(Croix camp#bat) Croix camp#bat24 974
-bat_a02,348,74,1 duplicate(Croix camp#bat) Croix camp#bat25 974
-bat_a02,199,49,1 duplicate(Croix camp#bat) Croix camp#bat26 974
-bat_a02,168,16,1 duplicate(Croix camp#bat) Croix camp#bat27 974
-bat_a02,138,12,1 duplicate(Croix camp#bat) Croix camp#bat28 974
-bat_a02,108,35,1 duplicate(Croix camp#bat) Croix camp#bat29 974
-bat_a02,164,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat23 973
-bat_a02,157,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat24 973
-bat_a02,359,327,1 duplicate(Guillaume camp#bat) Guillaume camp#bat25 973
-bat_a02,350,326,1 duplicate(Guillaume camp#bat) Guillaume camp#bat26 973
-bat_a02,209,344,1 duplicate(Guillaume camp#bat) Guillaume camp#bat27 973
-bat_a02,173,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat28 973
-bat_a02,150,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat29 973
-bat_a02,118,357,1 duplicate(Guillaume camp#bat) Guillaume camp#bat30 973
-bat_a02,119,336,1 duplicate(Guillaume camp#bat) Guillaume camp#bat31 973
+bat_a02,148,85,1 duplicate(Croix camp#bat) Croix camp#bat22 1_FLAG_EAGLE
+bat_a02,155,85,1 duplicate(Croix camp#bat) Croix camp#bat23 1_FLAG_EAGLE
+bat_a02,357,75,1 duplicate(Croix camp#bat) Croix camp#bat24 1_FLAG_EAGLE
+bat_a02,348,74,1 duplicate(Croix camp#bat) Croix camp#bat25 1_FLAG_EAGLE
+bat_a02,199,49,1 duplicate(Croix camp#bat) Croix camp#bat26 1_FLAG_EAGLE
+bat_a02,168,16,1 duplicate(Croix camp#bat) Croix camp#bat27 1_FLAG_EAGLE
+bat_a02,138,12,1 duplicate(Croix camp#bat) Croix camp#bat28 1_FLAG_EAGLE
+bat_a02,108,35,1 duplicate(Croix camp#bat) Croix camp#bat29 1_FLAG_EAGLE
+bat_a02,164,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat23 1_FLAG_LION
+bat_a02,157,308,1 duplicate(Guillaume camp#bat) Guillaume camp#bat24 1_FLAG_LION
+bat_a02,359,327,1 duplicate(Guillaume camp#bat) Guillaume camp#bat25 1_FLAG_LION
+bat_a02,350,326,1 duplicate(Guillaume camp#bat) Guillaume camp#bat26 1_FLAG_LION
+bat_a02,209,344,1 duplicate(Guillaume camp#bat) Guillaume camp#bat27 1_FLAG_LION
+bat_a02,173,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat28 1_FLAG_LION
+bat_a02,150,380,1 duplicate(Guillaume camp#bat) Guillaume camp#bat29 1_FLAG_LION
+bat_a02,118,357,1 duplicate(Guillaume camp#bat) Guillaume camp#bat30 1_FLAG_LION
+bat_a02,119,336,1 duplicate(Guillaume camp#bat) Guillaume camp#bat31 1_FLAG_LION
// Barricades
// *********************************************************************
@@ -317,7 +317,7 @@ OnWall:
// Battleground rewards
// *********************************************************************
-bat_a02,45,19,3 script Croix Vintenar#tv2 415,{
+bat_a02,45,19,3 script Croix Vintenar#tv2 4_M_CRU_HEAD,{
if( $@TierraBG2_Victory )
{
if( $@TierraBG2_Victory == Bat_Team )
@@ -348,7 +348,7 @@ bat_a02,45,19,3 script Croix Vintenar#tv2 415,{
end;
}
-bat_a02,53,377,3 script Guillaume Vintenar#tv2 419,{
+bat_a02,53,377,3 script Guillaume Vintenar#tv2 4_M_KY_HEAD,{
if( $@TierraBG2_Victory )
{
if( $@TierraBG2_Victory == Bat_Team )
@@ -382,14 +382,14 @@ bat_a02,53,377,3 script Guillaume Vintenar#tv2 419,{
// Battleground Therapist
// *********************************************************************
-bat_a02,60,216,3 script Ghost#tv23 950,{
+bat_a02,60,216,3 script Ghost#tv23 4_GHOSTRING,{
mes "[Ghost in valley]";
mes "Boo...Boo...";
specialeffect2 312;
close;
}
-bat_a02,53,377,3 script Therapist in battle#tv22 95,{
+bat_a02,53,377,3 script Therapist in battle#tv22 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -397,7 +397,7 @@ bat_a02,53,377,3 script Therapist in battle#tv22 95,{
close;
}
-bat_a02,45,18,3 script Therapist in battle#tv21 95,{
+bat_a02,45,18,3 script Therapist in battle#tv21 4_F_SISTER,{
mes "[Therapist in battle]";
mes "Just close your eyes, and take a deep breathe.";
mes "You can be free from pain.";
@@ -408,7 +408,7 @@ bat_a02,45,18,3 script Therapist in battle#tv21 95,{
// Battleground Respawn
// *********************************************************************
-bat_a02,57,213,0 script #ntv2_respawn 139,{
+bat_a02,57,213,0 script #ntv2_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -430,7 +430,7 @@ OnTimer20000:
end;
}
-bat_a02,50,374,0 script #gtv2_respawn 139,{
+bat_a02,50,374,0 script #gtv2_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
@@ -452,7 +452,7 @@ OnTimer25000:
end;
}
-bat_a02,42,16,0 script #ctv2_respawn 139,{
+bat_a02,42,16,0 script #ctv2_respawn HIDDEN_WARP_NPC,{
end;
OnBGStart:
diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt
index 4b2a9b250..b3db9f81d 100644
--- a/npc/custom/bgqueue/flavius.txt
+++ b/npc/custom/bgqueue/flavius.txt
@@ -19,7 +19,7 @@
//Tacham, while the script is under testings the original will remain, meaning if you wanna test this you need to disable the other, or they'll conflict.
-bat_b01,15,15,3 script start#bat_b01 844,{
+bat_b01,15,15,3 script start#bat_b01 CLEAR_NPC,{
OnInit:
mapwarp "bat_b01","bat_room",154,150;
end;
@@ -131,7 +131,7 @@ OnMatchOver:
end;
}
-bat_b01,1,1,3 script OBJ#bat_b01_a 844,{
+bat_b01,1,1,3 script OBJ#bat_b01_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id1,"bat_b01",61,150,"Pink Crystal",1915,"OBJ#bat_b01_a::OnMyMobDead";
end;
@@ -162,7 +162,7 @@ OnMyMobDead:
}
end;
}
-bat_b01,1,2,3 script OBJ#bat_b01_b 844,{
+bat_b01,1,2,3 script OBJ#bat_b01_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id2,"bat_b01",328,150,"Blue Crystal",1914,"OBJ#bat_b01_b::OnMyMobDead";
end;
@@ -194,7 +194,7 @@ OnMyMobDead:
end;
}
-bat_b01,1,3,3 script guardian#bat_b01_a 844,{
+bat_b01,1,3,3 script guardian#bat_b01_a CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id1,"bat_b01",108,159,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
bg_monster $@FlaviusBG1_id1,"bat_b01",108,141,"Guillaume Camp Guardian",1949,"guardian#bat_b01_a::OnMyMobDead";
@@ -212,7 +212,7 @@ OnMyMobDead:
end;
}
-bat_b01,1,3,3 script guardian#bat_b01_b 844,{
+bat_b01,1,3,3 script guardian#bat_b01_b CLEAR_NPC,{
OnEnable:
bg_monster $@FlaviusBG1_id2,"bat_b01",307,160,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
bg_monster $@FlaviusBG1_id2,"bat_b01",307,138,"Croix Camp Guardian",1949,"guardian#bat_b01_b::OnMyMobDead";
@@ -230,7 +230,7 @@ OnMyMobDead:
end;
}
-bat_b01,1,4,3 script cell#bat_b01_a 844,{
+bat_b01,1,4,3 script cell#bat_b01_a CLEAR_NPC,{
Onred:
setcell "bat_b01",62,149,60,151,cell_basilica,1;
setcell "bat_b01",62,149,60,151,cell_walkable,0;
@@ -242,7 +242,7 @@ Ongreen:
end;
}
-bat_b01,1,5,3 script cell#bat_b01_b 844,{
+bat_b01,1,5,3 script cell#bat_b01_b CLEAR_NPC,{
Onred:
setcell "bat_b01",327,151,329,149,cell_basilica,1;
setcell "bat_b01",327,151,329,149,cell_walkable,0;
@@ -254,7 +254,7 @@ Ongreen:
end;
}
-bat_b01,1,6,1 script time#bat_b01 844,{
+bat_b01,1,6,1 script time#bat_b01 CLEAR_NPC,{
OnEnable:
donpcevent "Battle Therapist#b01_a::OnEnable";
donpcevent "Battle Therapist#b01_b::OnEnable";
@@ -266,7 +266,7 @@ Onstop:
end;
}
-bat_b01,10,294,3 script Battle Therapist#b01_a 95,{
+bat_b01,10,294,3 script Battle Therapist#b01_a 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -300,7 +300,7 @@ Onstop:
end;
}
-bat_b01,10,290,0 script bat_b01_rp1_a_warp 45,10,10,{
+bat_b01,10,290,0 script bat_b01_rp1_a_warp WARPNPC,10,10,{
OnInit:
disablenpc "bat_b01_rp1_a_warp";
end;
@@ -311,7 +311,7 @@ OnTouch:
end;
}
-bat_b01,389,14,3 script Battle Therapist#b01_b 95,{
+bat_b01,389,14,3 script Battle Therapist#b01_b 4_F_SISTER,{
specialeffect2 EF_HEAL;
mes "[Battle Therapist]";
mes "Just close your eyes,";
@@ -345,7 +345,7 @@ Onstop:
end;
}
-bat_b01,389,10,0 script bat_b01_rp1_b_warp 45,9,9,{
+bat_b01,389,10,0 script bat_b01_rp1_b_warp WARPNPC,9,9,{
OnInit:
disablenpc "bat_b01_rp1_a_warp";
end;
@@ -370,7 +370,7 @@ OnTouch:
end;
}
-bat_b01,10,294,3 script Guillaume Vintenar#b01_a 934,{
+bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{
if ($@FlaviusBG1_id1 == getcharid(4)) {
if ($@FlaviusBG1_Victory == 1) {
set .@your_medal,countitem(7829);
@@ -422,7 +422,7 @@ OnInit:
end;
}
-bat_b01,389,14,3 script Croix Vintenar#b01_b 934,{
+bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{
if ($@FlaviusBG1_id2 == getcharid(4)) {
if ($@FlaviusBG1_Victory == 2) {
set .@your_medal,countitem(7829);
@@ -474,7 +474,7 @@ OnInit:
end;
}
-bat_b01,1,5,3 script countdown#bat_b01 844,{
+bat_b01,1,5,3 script countdown#bat_b01 CLEAR_NPC,{
OnInit:
stopnpctimer;
end;
@@ -531,31 +531,31 @@ OnTimer1900000:
end;
}
-bat_b01,81,83,3 script Guillaume Camp#flag21 973,{ end; }
-bat_b01,94,83,3 script Guillaume Camp#flag22 973,{ end; }
-bat_b01,81,66,3 script Guillaume Camp#flag23 973,{ end; }
-bat_b01,94,66,3 script Guillaume Camp#flag24 973,{ end; }
-bat_b01,139,142,3 script Guillaume Camp#flag25 973,{ end; }
-bat_b01,139,158,3 script Guillaume Camp#flag26 973,{ end; }
-bat_b01,110,161,3 script Guillaume Camp#flag27 973,{ end; }
-bat_b01,110,137,3 script Guillaume Camp#flag28 973,{ end; }
-bat_b01,63,135,3 script Guillaume Camp#flag29 973,{ end; }
-bat_b01,63,165,3 script Guillaume Camp#flag30 973,{ end; }
-bat_b01,10,296,3 script Guillaume Camp#flag31 973,{ end; }
-
-bat_b01,306,233,3 script Croix Camp#flag21 974,{ end; }
-bat_b01,317,233,3 script Croix Camp#flag22 974,{ end; }
-bat_b01,306,216,3 script Croix Camp#flag23 974,{ end; }
-bat_b01,317,216,3 script Croix Camp#flag24 974,{ end; }
-bat_b01,257,158,3 script Croix Camp#flag25 974,{ end; }
-bat_b01,257,141,3 script Croix Camp#flag26 974,{ end; }
-bat_b01,297,164,3 script Croix Camp#flag27 974,{ end; }
-bat_b01,297,136,3 script Croix Camp#flag28 974,{ end; }
-bat_b01,336,161,3 script Croix Camp#flag29 974,{ end; }
-bat_b01,336,139,3 script Croix Camp#flag30 974,{ end; }
-bat_b01,389,16,3 script Croix Camp#flag31 974,{ end; }
-
-bat_b01,10,294,3 script Vintenar#bat_b01_aover 419,{
+bat_b01,81,83,3 script Guillaume Camp#flag21 1_FLAG_LION,{ end; }
+bat_b01,94,83,3 script Guillaume Camp#flag22 1_FLAG_LION,{ end; }
+bat_b01,81,66,3 script Guillaume Camp#flag23 1_FLAG_LION,{ end; }
+bat_b01,94,66,3 script Guillaume Camp#flag24 1_FLAG_LION,{ end; }
+bat_b01,139,142,3 script Guillaume Camp#flag25 1_FLAG_LION,{ end; }
+bat_b01,139,158,3 script Guillaume Camp#flag26 1_FLAG_LION,{ end; }
+bat_b01,110,161,3 script Guillaume Camp#flag27 1_FLAG_LION,{ end; }
+bat_b01,110,137,3 script Guillaume Camp#flag28 1_FLAG_LION,{ end; }
+bat_b01,63,135,3 script Guillaume Camp#flag29 1_FLAG_LION,{ end; }
+bat_b01,63,165,3 script Guillaume Camp#flag30 1_FLAG_LION,{ end; }
+bat_b01,10,296,3 script Guillaume Camp#flag31 1_FLAG_LION,{ end; }
+
+bat_b01,306,233,3 script Croix Camp#flag21 1_FLAG_EAGLE,{ end; }
+bat_b01,317,233,3 script Croix Camp#flag22 1_FLAG_EAGLE,{ end; }
+bat_b01,306,216,3 script Croix Camp#flag23 1_FLAG_EAGLE,{ end; }
+bat_b01,317,216,3 script Croix Camp#flag24 1_FLAG_EAGLE,{ end; }
+bat_b01,257,158,3 script Croix Camp#flag25 1_FLAG_EAGLE,{ end; }
+bat_b01,257,141,3 script Croix Camp#flag26 1_FLAG_EAGLE,{ end; }
+bat_b01,297,164,3 script Croix Camp#flag27 1_FLAG_EAGLE,{ end; }
+bat_b01,297,136,3 script Croix Camp#flag28 1_FLAG_EAGLE,{ end; }
+bat_b01,336,161,3 script Croix Camp#flag29 1_FLAG_EAGLE,{ end; }
+bat_b01,336,139,3 script Croix Camp#flag30 1_FLAG_EAGLE,{ end; }
+bat_b01,389,16,3 script Croix Camp#flag31 1_FLAG_EAGLE,{ end; }
+
+bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
if ($@FlaviusBG1_id1 == getcharid(4)) {
if (.@A_B_gap > 0) {
@@ -633,7 +633,7 @@ OnInit:
end;
}
-bat_b01,389,14,3 script Vintenar#bat_b01_bover 415,{
+bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{
set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1;
if ($@FlaviusBG1_id2 == getcharid(4)) {
if (.@A_B_gap > 0) {
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index a3d8c7a93..3eef8af0a 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -10,7 +10,7 @@
//= Fixed 'close' issues. [Joseph]
//============================================================
-prontera,124,201,1 script Universal Rental NPC 726,{
+prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{
if (ismounting()) {
message strcharinfo(0),"You must first remove your mount.";
end;
diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt
index 9424827bb..6c8a1b8b5 100644
--- a/npc/custom/card_remover.txt
+++ b/npc/custom/card_remover.txt
@@ -12,7 +12,7 @@
//= 1.2a Added 'disable_items' command. [Euphy]
//============================================================
-prt_in,28,73,4 script Wise Old Woman#eAcustom 78,{
+prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{
set .zenycost,200000; // Set base cost in zeny of the card remover services
set .percardcost,25000; // set cost per card of the card remover services
diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt
index 637d38e61..ebf626b98 100644
--- a/npc/custom/etc/airplane.txt
+++ b/npc/custom/etc/airplane.txt
@@ -264,84 +264,84 @@ Itin:
callfunc "F_Itin";
}
-airport,153,43,5 script Airport Porter 774,{
+airport,153,43,5 script Airport Porter 4_M_TWBOY,{
callfunc "F_Porter",0;
}
-prt_fild08,206,279,5 script Porter#01 774,{
+prt_fild08,206,279,5 script Porter#01 4_M_TWBOY,{
callfunc "F_Porter",1;
}
-gef_fild00,50,364,5 script Porter#02 774,{
+gef_fild00,50,364,5 script Porter#02 4_M_TWBOY,{
callfunc "F_Porter",5;
}
-moc_fild10,163,173,5 script Porter#03 774,{
+moc_fild10,163,173,5 script Porter#03 4_M_TWBOY,{
callfunc "F_Porter",6;
}
-mjolnir_12,61,380,5 script Porter#04 774,{
+mjolnir_12,61,380,5 script Porter#04 4_M_TWBOY,{
callfunc "F_Porter",3;
}
-pay_fild08,159,91,5 script Porter#05 774,{
+pay_fild08,159,91,5 script Porter#05 4_M_TWBOY,{
callfunc "F_Porter",2;
}
-pay_fild03,194,181,5 script Porter#06 774,{
+pay_fild03,194,181,5 script Porter#06 4_M_TWBOY,{
callfunc "F_Porter",4;
}
-glast_01,196,326,1 script Porter#07 774,{
+glast_01,196,326,1 script Porter#07 4_M_TWBOY,{
callfunc "F_Porter",7;
}
-umbala,188,98,3 script Porter#08 774,{
+umbala,188,98,3 script Porter#08 4_M_TWBOY,{
callfunc "F_Porter",8;
}
-comodo,203,75,8 script Porter#09 774,{
+comodo,203,75,8 script Porter#09 4_M_TWBOY,{
callfunc "F_Porter",9;
}
-amatsu,115,78,8 script Porter#10 774,{
+amatsu,115,78,8 script Porter#10 4_M_TWBOY,{
callfunc "F_Porter",10;
}
-niflheim,132,242,5 script Porter#11 774,{
+niflheim,132,242,5 script Porter#11 4_M_TWBOY,{
callfunc "F_Porter",11;
}
-xmas,232,309,5 script Porter#12 774,{
+xmas,232,309,5 script Porter#12 4_M_TWBOY,{
callfunc "F_Porter",12;
}
-louyang,35,279,8 script Porter#13 774,{
+louyang,35,279,8 script Porter#13 4_M_TWBOY,{
callfunc "F_Porter",13;
}
-gonryun,82,95,7 script Porter#14 774,{
+gonryun,82,95,7 script Porter#14 4_M_TWBOY,{
callfunc "F_Porter",14;
}
-yuno,58,195,4 script Porter#15 774,{
+yuno,58,195,4 script Porter#15 4_M_TWBOY,{
callfunc "F_Porter",15;
}
-moc_fild04,210,326,2 script Porter#16 774,{
+moc_fild04,210,326,2 script Porter#16 4_M_TWBOY,{
callfunc "F_Porter",16;
}
-jawaii,247,174,7 script Porter#17 774,{
+jawaii,247,174,7 script Porter#17 4_M_TWBOY,{
callfunc "F_Porter",17;
}
-gef_fild10,159,95,2 script Porter#18 774,{
+gef_fild10,159,95,2 script Porter#18 4_M_TWBOY,{
callfunc "F_Porter",18;
}
-mjolnir_02,76,364,5 script Porter#19 774,{
+mjolnir_02,76,364,5 script Porter#19 4_M_TWBOY,{
callfunc "F_Porter",19;
}
-gefenia01,97,22,6 script Porter#20 774,{
+gefenia01,97,22,6 script Porter#20 4_M_TWBOY,{
callfunc "F_Porter",20;
}
-ayothaya,182,105,5 script Porter#21 774,{
+ayothaya,182,105,5 script Porter#21 4_M_TWBOY,{
callfunc "F_Porter",21;
}
-lighthalzen,99,241,4 script Porter#22 774,{
+lighthalzen,99,241,4 script Porter#22 4_M_TWBOY,{
callfunc "F_Porter",22;
}
-jupe_gate,46,18,7 script Porter#23 774,{
+jupe_gate,46,18,7 script Porter#23 4_M_TWBOY,{
callfunc "F_Porter",23;
}
-airport,141,43,5 script Itinerary Schedule 837,{
+airport,141,43,5 script Itinerary Schedule 2_BULLETIN_BOARD,{
mes "^FF0000[Itinerary]^000000";
callfunc "F_Itin";
}
-airplane,102,68,5 script Docker 852,{
+airplane,102,68,5 script Docker 4_M_EIN_SOLDIER,{
if($destination == 250) goto Nowhere;
mes "^FF0000[Airplane Attendant]^000000";
if($destination == 250)goto Notime;
diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt
index b004aacf3..51e3e7e74 100644
--- a/npc/custom/etc/bank.txt
+++ b/npc/custom/etc/bank.txt
@@ -13,7 +13,7 @@
//= Version 2.0: Optimized and brought the script up to standard. [Jguy]
//============================================================
-prontera,132,217,5 script Banker 109,{
+prontera,132,217,5 script Banker 4_M_MANAGER,{
set @cost,500;
mes "[Banker]";
mes "Welcome to the First Bank of Prontera. How can I help you today?";
diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt
index 12f35aff5..e2020155f 100644
--- a/npc/custom/etc/bank_kafra.txt
+++ b/npc/custom/etc/bank_kafra.txt
@@ -18,7 +18,7 @@
// 1.2a Corrected bad duplicate names. (bugreport:921) [Samuray22]
//============================================================
-- script Bank Clerk::bankg 833,{
+- script Bank Clerk::bankg 4_M_ZONDAOYAJI,{
mes"[Maniss]";
mes strcharinfo(0)+", welcome to the 2nd Bank of Prontera!";
@@ -108,7 +108,7 @@ B_EXIT2:
close;
}
-prontera,131,190,1 duplicate(bankg) Bank Clerk#1-1 833
-geffen,125,73,3 duplicate(bankg) Bank Clerk#2-1 833
-izlude,145,107,1 duplicate(bankg) Bank Clerk#3-1 833
-morocc,147,84,7 duplicate(bankg) Bank Clerk#4-1 833
+prontera,131,190,1 duplicate(bankg) Bank Clerk#1-1 4_M_ZONDAOYAJI
+geffen,125,73,3 duplicate(bankg) Bank Clerk#2-1 4_M_ZONDAOYAJI
+izlude,145,107,1 duplicate(bankg) Bank Clerk#3-1 4_M_ZONDAOYAJI
+morocc,147,84,7 duplicate(bankg) Bank Clerk#4-1 4_M_ZONDAOYAJI
diff --git a/npc/custom/etc/blackjack.txt b/npc/custom/etc/blackjack.txt
index 15e74865c..8fe70ad72 100644
--- a/npc/custom/etc/blackjack.txt
+++ b/npc/custom/etc/blackjack.txt
@@ -15,7 +15,7 @@
//=
//============================================================
-cmd_in02,188,89,1 script Black Jack Dealer 57,{
+cmd_in02,188,89,1 script Black Jack Dealer 1_M_LIBRARYMASTER,{
mes "[Dealer]";
mes "Hello there! Would you like to play a game of Black Jack?";
M_Menu:
diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt
index 3988a7d7b..eec2efd0d 100644
--- a/npc/custom/etc/lottery.txt
+++ b/npc/custom/etc/lottery.txt
@@ -86,7 +86,7 @@ L_Rigged_Draw:
goto L_Broadcast;
}
-prontera,141,182,5 script Lottery 76,{
+prontera,141,182,5 script Lottery 1_F_ORIENT_02,{
L_Begin:
mes "[Lottery]";
mes "Winning Lotto Numbers ("+$LID2+"):";
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 5f94eef88..0549502cd 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -52,7 +52,7 @@ OnInit:
// $@divorcee id of the partner, who has to accept the divorce and pay.
//The Priest - official iRO sprite & in-dialog name (on-map name not confirmed)
-prt_church,100,123,4 script Vomars 60,{
+prt_church,100,123,4 script Vomars 1_M_PASTOR,{
set @name$,"Vomars";
function SF_wed_end;
@@ -433,7 +433,7 @@ OnInit:
}
//Registration & Status
-prt_church,106,99,3 script Happy Marry 67,{
+prt_church,106,99,3 script Happy Marry 1_F_02,{
set @name$,"Marry";
if (getpartnerid() > 0) {
mes "["+@name$+"]";
@@ -809,7 +809,7 @@ function SF_Procedure {
}
}
-prt_church,94,99,4 script Sister Lisa 79,{
+prt_church,94,99,4 script Sister Lisa 1_F_PRIEST,{
set @name$,"Lisa";
function SF_DivorceEnd;
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 2d2f76324..51304c1a0 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -22,7 +22,7 @@
//============================================================
// Entrance //
-prontera,158,193,6 script Monster Arena 702,{
+prontera,158,193,6 script Monster Arena 4_F_GON,{
mes "[Monster Arena]";
mes "Would you like to enter the Monster Arena?";
mes "Currently ^FF0000" + getmapusers("gon_test") + "^000000 players";
@@ -96,7 +96,7 @@ function script monstersummon {
}
// Referee //
-- script monsterreferee 61,{
+- script monsterreferee 1_M_PUBMASTER,{
if (@fighting == 1) end;
if (@battle == 1) goto L_Start;
end;
@@ -193,11 +193,11 @@ L_Exit:
mes "Alright";
close;
}
-gon_test,56,91,6 duplicate(monsterreferee) Referee#01 61
+gon_test,56,91,6 duplicate(monsterreferee) Referee#01 1_M_PUBMASTER
// Usher //
-gon_test,58,94,6 script Usher 86,{
+gon_test,58,94,6 script Usher 4_M_04,{
set @marena,1;
mes "[Usher]";
mes "What would you like to do?";
@@ -274,7 +274,7 @@ L_Cancel:
}
// Monster Trainer //
-gon_test,52,103,6 script Monster Trainer 87,{
+gon_test,52,103,6 script Monster Trainer 4_M_BARBER,{
mes "[Monster Trainer]";
if (#monster != 0) goto L_Mon;
@@ -731,7 +731,7 @@ function script illegalkill {
}
// Healer //
-gon_test,55,103,6 script Nurse 90,{
+gon_test,55,103,6 script Nurse 4_F_01,{
if (@battle == 1 || #heal == 0) goto L_NoHeal;
if (#heal == 1 && @healing < 100) goto L_Heal; //Total healing required
set @fighting,0;
@@ -752,14 +752,14 @@ L_NoHeal:
}
// Warps players //
-gon_test,57,86,5 script Summon Pad 1::SummonPad 111,2,2,{
+gon_test,57,86,5 script Summon Pad 1::SummonPad HIDDEN_NPC,2,2,{
end;
OnTouch:
set @marena,1;
warp "gon_test",57,99;
}
-gon_test,43,87,5 duplicate(SummonPad) Summon Pad 2 111,2,2
-gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 111,2,2
+gon_test,43,87,5 duplicate(SummonPad) Summon Pad 2 HIDDEN_NPC,2,2
+gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 HIDDEN_NPC,2,2
@@ -767,7 +767,7 @@ gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 111,2,2
gon_test mapflag noskill
// Duel Arena //
-gon_test,58,103,5 script Duel Master#01 92,{
+gon_test,58,103,5 script Duel Master#01 4_F_03,{
if ($@duelist1$ == "") set @duel,0;
if ($@monster1 == "") set @duel,0;
set @marena,1;
@@ -859,7 +859,7 @@ L_NeedHeal:
}
// Duel Exit //
-gon_test,42,8,5 script Duel Master#02 92,{
+gon_test,42,8,5 script Duel Master#02 4_F_03,{
mes "[Duel Master]";
mes "Would you like to return?";
menu "Yes",L_Leave,"No",-;
@@ -891,5 +891,5 @@ L_Leave2:
goto L_Leave3;
}
-gon_test,49,5,5 duplicate(SummonPad) Summon Pad 4 111,2,2
-gon_test,55,8,6 duplicate(monsterreferee) Referee#02 61
+gon_test,49,5,5 duplicate(SummonPad) Summon Pad 4 HIDDEN_NPC,2,2
+gon_test,55,8,6 duplicate(monsterreferee) Referee#02 1_M_PUBMASTER
diff --git a/npc/custom/etc/morroc_raceway.txt b/npc/custom/etc/morroc_raceway.txt
index 7edd069e0..48ee8e47e 100644
--- a/npc/custom/etc/morroc_raceway.txt
+++ b/npc/custom/etc/morroc_raceway.txt
@@ -19,7 +19,7 @@
//============================================================
//Warps you into race way
-morocc,166,105,6 script Race Girl#01 116,{
+morocc,166,105,6 script Race Girl#01 4_F_KAFRA2,{
mes "[Race Girl]";
mes "Would you like to visit ^0000FFMorroc Raceway^000000?";
next;
@@ -33,7 +33,7 @@ L_Warp:
}
//Warps you out of raceway
-pvp_y_1-5,169,265,5 script Race Girl#02 116,{
+pvp_y_1-5,169,265,5 script Race Girl#02 4_F_KAFRA2,{
mes "[Race Girl]";
mes "Welcome to Morroc Raceway!";
next;
@@ -56,7 +56,7 @@ L_Cancel:
}
//Counts down and starts race
-pvp_y_1-5,145,269,5 script Starter 733,{
+pvp_y_1-5,145,269,5 script Starter 4_M_JOB_KNIGHT1,{
if ($@race != 0) goto L_Started;
if ($@counting != 0) goto L_Started;
if ($@racecount == 1) goto L_Started;
@@ -110,7 +110,7 @@ OnInit:
}
//Checkpoint 1
-pvp_y_1-5,144,262,5 script Check Point 1 111,0,5,{
+pvp_y_1-5,144,262,5 script Check Point 1 HIDDEN_NPC,0,5,{
end;
OnTouch:
if (@raceid != $@raceid) goto L_Started;
@@ -128,7 +128,7 @@ L_Finished:
}
//Checkpoint 2
-pvp_y_1-5,73,247,5 script Check Point 2 111,6,6,{
+pvp_y_1-5,73,247,5 script Check Point 2 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 1) goto L_Miss;
@@ -141,7 +141,7 @@ L_Miss:
}
//Checkpoint 3
-pvp_y_1-5,77,44,5 script Check Point 3 111,6,6,{
+pvp_y_1-5,77,44,5 script Check Point 3 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 2) goto L_Miss;
@@ -154,7 +154,7 @@ L_Miss:
}
//Checkpoint 3
-pvp_y_1-5,249,60,5 script Check Point 4 111,6,6,{
+pvp_y_1-5,249,60,5 script Check Point 4 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 3) goto L_Miss;
@@ -167,7 +167,7 @@ L_Miss:
}
//Checkpoint 4
-pvp_y_1-5,255,256,5 script Check Point 5 111,6,6,{
+pvp_y_1-5,255,256,5 script Check Point 5 HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@race != 4) goto L_Miss;
@@ -180,7 +180,7 @@ L_Miss:
}
//Finish Line
-pvp_y_1-5,174,244,5 script Finish Line 111,6,6,{
+pvp_y_1-5,174,244,5 script Finish Line HIDDEN_NPC,6,6,{
end;
OnTouch:
if (@raceid != $@raceid) goto L_WrongRace;
@@ -198,39 +198,39 @@ L_WrongRace:
}
//Check Point Marker Flags
-pvp_y_1-5,144,267,4 script Check Point 1#01 722,{
+pvp_y_1-5,144,267,4 script Check Point 1#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,144,257,4 script Check Point 1#02 722,{
+pvp_y_1-5,144,257,4 script Check Point 1#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,70,252,3 script Check Point 2#01 722,{
+pvp_y_1-5,70,252,3 script Check Point 2#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,77,243,3 script Check Point 2#02 722,{
+pvp_y_1-5,77,243,3 script Check Point 2#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,81,48,1 script Check Point 3#01 722,{
+pvp_y_1-5,81,48,1 script Check Point 3#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,72,40,1 script Check Point 3#02 722,{
+pvp_y_1-5,72,40,1 script Check Point 3#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,244,65,7 script Check Point 4#01 722,{
+pvp_y_1-5,244,65,7 script Check Point 4#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,252,57,7 script Check Point 4#02 722,{
+pvp_y_1-5,252,57,7 script Check Point 4#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,259,260,5 script Check Point 5#01 722,{
+pvp_y_1-5,259,260,5 script Check Point 5#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,251,252,5 script Check Point 5#02 722,{
+pvp_y_1-5,251,252,5 script Check Point 5#02 GUILD_FLAG,{
end;
}
-pvp_y_1-5,174,249,4 script Finish Line#01 722,{
+pvp_y_1-5,174,249,4 script Finish Line#01 GUILD_FLAG,{
end;
}
-pvp_y_1-5,174,238,4 script Finish Line#02 722,{
+pvp_y_1-5,174,238,4 script Finish Line#02 GUILD_FLAG,{
end;
}
diff --git a/npc/custom/etc/mvp_arena.txt b/npc/custom/etc/mvp_arena.txt
index b06e5025d..3a1249274 100644
--- a/npc/custom/etc/mvp_arena.txt
+++ b/npc/custom/etc/mvp_arena.txt
@@ -15,7 +15,7 @@
//============================================================
// Entrance
-prontera,154,197,3 script MVP Warper 768,{
+prontera,154,197,3 script MVP Warper 8_M_JPNMASTER,{
mes "[ ^0065DFMVP Warper^000000 ]";
mes "Would you like to enter";
mes "the MVP Arena?";
@@ -25,7 +25,7 @@ prontera,154,197,3 script MVP Warper 768,{
}
// Information
-quiz_00,49,31,4 script MVP Arena Guide 778,{
+quiz_00,49,31,4 script MVP Arena Guide 4_M_TWTEAMAN,{
mes "[ ^0065DFMVP Arena Guide^000000 ]";
mes "Welcome and behold this sacred place. Here you will find out if you truly have what it takes to call yourself a warrior.";
next;
@@ -64,10 +64,10 @@ function script Keeper {
warp "pvp_n_"+.@i+"-"+getarg(0),102,102;
close;
}
-quiz_00,56,31,4 script Alpha MVP 770,{ callfunc "Keeper",2; }
-quiz_00,58,31,4 script Beta MVP 773,{ callfunc "Keeper",3; }
-quiz_00,60,31,4 script Theta MVP 774,{ callfunc "Keeper",4; }
-quiz_00,62,31,4 script Epsilon MVP 776,{ callfunc "Keeper",5; }
+quiz_00,56,31,4 script Alpha MVP 4_F_TWGIRL,{ callfunc "Keeper",2; }
+quiz_00,58,31,4 script Beta MVP 4_F_TWMIDWOMAN,{ callfunc "Keeper",3; }
+quiz_00,60,31,4 script Theta MVP 4_M_TWBOY,{ callfunc "Keeper",4; }
+quiz_00,62,31,4 script Epsilon MVP 4_M_TWMIDMAN,{ callfunc "Keeper",5; }
// Protectors
function script Protector {
@@ -85,38 +85,38 @@ function script Protector {
end;
}
}
-pvp_n_1-2,100,100,4 script MVP-Protector#01 727,{ callfunc "Protector","pvp_n_2-2"; }
-pvp_n_2-2,100,100,4 script MVP-Protector#02 727,{ callfunc "Protector","pvp_n_3-2"; }
-pvp_n_3-2,100,100,4 script MVP-Protector#03 727,{ callfunc "Protector","pvp_n_4-2"; }
-pvp_n_4-2,100,100,4 script MVP-Protector#04 727,{ callfunc "Protector","pvp_n_5-2"; }
-pvp_n_5-2,100,100,4 script MVP-Protector#05 727,{ callfunc "Protector","pvp_n_6-2"; }
-pvp_n_6-2,100,100,4 script MVP-Protector#06 727,{ callfunc "Protector","pvp_n_7-2"; }
-pvp_n_7-2,100,100,4 script MVP-Protector#07 727,{ callfunc "Protector","pvp_n_8-2"; }
-pvp_n_8-2,100,100,4 script MVP-Protector#08 727,{ callfunc "Protector",""; }
-pvp_n_1-3,100,100,4 script MVP-Protector#09 727,{ callfunc "Protector","pvp_n_2-3"; }
-pvp_n_2-3,100,100,4 script MVP-Protector#10 727,{ callfunc "Protector","pvp_n_3-3"; }
-pvp_n_3-3,100,100,4 script MVP-Protector#11 727,{ callfunc "Protector","pvp_n_4-3"; }
-pvp_n_4-3,100,100,4 script MVP-Protector#12 727,{ callfunc "Protector","pvp_n_5-3"; }
-pvp_n_5-3,100,100,4 script MVP-Protector#13 727,{ callfunc "Protector","pvp_n_6-3"; }
-pvp_n_6-3,100,100,4 script MVP-Protector#14 727,{ callfunc "Protector","pvp_n_7-3"; }
-pvp_n_7-3,100,100,4 script MVP-Protector#15 727,{ callfunc "Protector","pvp_n_8-3"; }
-pvp_n_8-3,100,100,4 script MVP-Protector#16 727,{ callfunc "Protector",""; }
-pvp_n_1-4,100,100,4 script MVP-Protector#17 727,{ callfunc "Protector","pvp_n_2-4"; }
-pvp_n_2-4,100,100,4 script MVP-Protector#18 727,{ callfunc "Protector","pvp_n_3-4"; }
-pvp_n_3-4,100,100,4 script MVP-Protector#19 727,{ callfunc "Protector","pvp_n_4-4"; }
-pvp_n_4-4,100,100,4 script MVP-Protector#20 727,{ callfunc "Protector","pvp_n_5-4"; }
-pvp_n_5-4,100,100,4 script MVP-Protector#21 727,{ callfunc "Protector","pvp_n_6-4"; }
-pvp_n_6-4,100,100,4 script MVP-Protector#22 727,{ callfunc "Protector","pvp_n_7-4"; }
-pvp_n_7-4,100,100,4 script MVP-Protector#23 727,{ callfunc "Protector","pvp_n_8-4"; }
-pvp_n_8-4,100,100,4 script MVP-Protector#24 727,{ callfunc "Protector",""; }
-pvp_n_1-5,100,100,4 script MVP-Protector#25 727,{ callfunc "Protector","pvp_n_2-5"; }
-pvp_n_2-5,100,100,4 script MVP-Protector#26 727,{ callfunc "Protector","pvp_n_3-5"; }
-pvp_n_3-5,100,100,4 script MVP-Protector#27 727,{ callfunc "Protector","pvp_n_4-5"; }
-pvp_n_4-5,100,100,4 script MVP-Protector#28 727,{ callfunc "Protector","pvp_n_5-5"; }
-pvp_n_5-5,100,100,4 script MVP-Protector#29 727,{ callfunc "Protector","pvp_n_6-5"; }
-pvp_n_6-5,100,100,4 script MVP-Protector#30 727,{ callfunc "Protector","pvp_n_7-5"; }
-pvp_n_7-5,100,100,4 script MVP-Protector#31 727,{ callfunc "Protector","pvp_n_8-5"; }
-pvp_n_8-5,100,100,4 script MVP-Protector#32 727,{ callfunc "Protector",""; }
+pvp_n_1-2,100,100,4 script MVP-Protector#01 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-2"; }
+pvp_n_2-2,100,100,4 script MVP-Protector#02 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-2"; }
+pvp_n_3-2,100,100,4 script MVP-Protector#03 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-2"; }
+pvp_n_4-2,100,100,4 script MVP-Protector#04 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-2"; }
+pvp_n_5-2,100,100,4 script MVP-Protector#05 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-2"; }
+pvp_n_6-2,100,100,4 script MVP-Protector#06 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-2"; }
+pvp_n_7-2,100,100,4 script MVP-Protector#07 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-2"; }
+pvp_n_8-2,100,100,4 script MVP-Protector#08 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-3,100,100,4 script MVP-Protector#09 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-3"; }
+pvp_n_2-3,100,100,4 script MVP-Protector#10 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-3"; }
+pvp_n_3-3,100,100,4 script MVP-Protector#11 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-3"; }
+pvp_n_4-3,100,100,4 script MVP-Protector#12 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-3"; }
+pvp_n_5-3,100,100,4 script MVP-Protector#13 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-3"; }
+pvp_n_6-3,100,100,4 script MVP-Protector#14 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-3"; }
+pvp_n_7-3,100,100,4 script MVP-Protector#15 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-3"; }
+pvp_n_8-3,100,100,4 script MVP-Protector#16 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-4,100,100,4 script MVP-Protector#17 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-4"; }
+pvp_n_2-4,100,100,4 script MVP-Protector#18 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-4"; }
+pvp_n_3-4,100,100,4 script MVP-Protector#19 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-4"; }
+pvp_n_4-4,100,100,4 script MVP-Protector#20 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-4"; }
+pvp_n_5-4,100,100,4 script MVP-Protector#21 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-4"; }
+pvp_n_6-4,100,100,4 script MVP-Protector#22 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-4"; }
+pvp_n_7-4,100,100,4 script MVP-Protector#23 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-4"; }
+pvp_n_8-4,100,100,4 script MVP-Protector#24 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
+pvp_n_1-5,100,100,4 script MVP-Protector#25 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_2-5"; }
+pvp_n_2-5,100,100,4 script MVP-Protector#26 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_3-5"; }
+pvp_n_3-5,100,100,4 script MVP-Protector#27 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_4-5"; }
+pvp_n_4-5,100,100,4 script MVP-Protector#28 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_5-5"; }
+pvp_n_5-5,100,100,4 script MVP-Protector#29 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_6-5"; }
+pvp_n_6-5,100,100,4 script MVP-Protector#30 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_7-5"; }
+pvp_n_7-5,100,100,4 script MVP-Protector#31 4_F_JOB_HUNTER,{ callfunc "Protector","pvp_n_8-5"; }
+pvp_n_8-5,100,100,4 script MVP-Protector#32 4_F_JOB_HUNTER,{ callfunc "Protector",""; }
// Alpha
pvp_n_1-2,0,0,0,0 monster Eddga 1115,3,60000,66000
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt
index 7cfc55ee1..61dd80676 100644
--- a/npc/custom/etc/penal_servitude.txt
+++ b/npc/custom/etc/penal_servitude.txt
@@ -14,7 +14,7 @@
// 1.2 Stricted the conditions a bit
//============================================================
-sec_pri,36,58,1 script Chief Warder 105,{
+sec_pri,36,58,1 script Chief Warder 8W_SOLDIER,{
mes "[Saddeus]";
emotion 1;
if(sex) {
@@ -127,7 +127,7 @@ M_NO_THANKS:
close;
}
-sec_in02,137,57,1 script Overseer 708,{
+sec_in02,137,57,1 script Overseer 4_M_PAY_SOLDIER,{
mes "[Oliver]";
delitem 4002,countitem(4002);//Items: Fabre_Card,
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index da9b6b0c9..0caa9b82c 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -678,7 +678,7 @@ function script QWS_MMarray {
// QWS_Make_Town_Menu 0; // Use a free number (last used is 30, Eclage)
//
// Adding a warpra:
-// map,x,y,facing script Warpra#example 113,{
+// map,x,y,facing script Warpra#example 4_F_KAFRA5,{
// callfunc "QWS_Town_Warpra",<town number>,"Your Town";
// close;
// }
@@ -1022,7 +1022,7 @@ menu_item:
// QWS_Make_Dungeon_Menu 0; // Use a free number (last used is 28, Kiel Dungeon)
//
// Adding a warpra:
-// map,x,y,facing script Warpra Helper#example 112,{
+// map,x,y,facing script Warpra Helper#example 4_F_KAFRA6,{
// callfunc "QWS_Dungeon_Warpra",<dungeon number>,"Your Dungeon";
// close;
// }
@@ -1612,79 +1612,79 @@ binget:
//============================Warpras==============================
- script Warpra#0 -1,{ callfunc "Q_Warpra",1; }
-alb2trea,73,101,4 duplicate(Warpra#0) Warpra#1 113
-ama_fild01,178,325,1 duplicate(Warpra#0) Warpra#2 113
-gef_fild10,71,339,4 duplicate(Warpra#0) Warpra#3 113
-izlu2dun,104,82,4 duplicate(Warpra#0) Warpra#4 113
-mjolnir_02,85,363,4 duplicate(Warpra#0) Warpra#5 113
-moc_fild04,207,331,4 duplicate(Warpra#0) Warpra#6 113
-moc_fild19,106,97,4 duplicate(Warpra#0) Warpra#7 113
-moc_ruins,64,166,4 duplicate(Warpra#0) Warpra#8 113
-niflheim,197,192,3 duplicate(Warpra#0) Warpra#9 113
-pay_arche,39,135,4 duplicate(Warpra#0) Warpra#10 113
-prt_fild05,273,215,4 duplicate(Warpra#0) Warpra#11 113
-tur_dun01,148,239,4 duplicate(Warpra#0) Warpra#12 113
-valkyrie,48,35,8 duplicate(Warpra#0) Warpra#13 113
-yuno_fild03,37,135,4 duplicate(Warpra#0) Warpra#14 113
-
-alberta,32,240,4 script Warpra#15 113,{ callfunc "QWS_Town_Warpra",1,"Alberta Town"; close; }
-aldebaran,146,118,4 script Warpra#16 113,{ callfunc "QWS_Town_Warpra",2,"Aldebaran Town"; close; }
-ayothaya,216,171,5 script Warpra#17 113,{ callfunc "QWS_Town_Warpra",4,"Ayotaya Town"; close; }
-amatsu,193,81,1 script Warpra#18 113,{ callfunc "QWS_Town_Warpra",3,"Amatsu Town"; close; }
-comodo,195,158,4 script Warpra#19 113,{ callfunc "QWS_Town_Warpra",5,"Comodo Town"; close; }
-einbroch,229,196,5 script Warpra#20 113,{ callfunc "QWS_Town_Warpra",7,"Einbroch Town"; close; }
-einbech,173,131,5 script Warpra#21 113,{ callfunc "QWS_Town_Warpra",6,"Einbech Town"; close; }
-geffen,116,66,4 script Warpra#22 113,{ callfunc "QWS_Town_Warpra",8,"Geffen Town"; close; }
-gonryun,152,130,4 script Warpra#23 113,{ callfunc "QWS_Town_Warpra",9,"Gonryun Town"; close; }
-hugel,90,127,5 script Warpra#24 113,{ callfunc "QWS_Town_Warpra",10,"Hugel Town"; close; }
-jawaii,107,182,5 script Warpra#25 113,{ callfunc "QWS_Town_Warpra",12,"Jawaii Town"; close; }
-izlude,132,116,4 script Warpra#26 113,{ callfunc "QWS_Town_Warpra",11,"Izlude Town"; close; }
-lighthalzen,153,100,5 script Warpra#27 113,{ callfunc "QWS_Town_Warpra",13,"Lighthalzen Town"; close; }
-louyang,211,106,4 script Warpra#28 113,{ callfunc "QWS_Town_Warpra",14,"Louyang Town"; close; }
-morocc,157,95,4 script Warpra#29 113,{ callfunc "QWS_Town_Warpra",16,"Morroc Town"; close; }
-nif_fild01,319,77,1 script Warpra#30 113,{ callfunc "QWS_Town_Warpra",17,"Niflheim Town"; close; }
-payon,183,110,4 script Warpra#31 113,{ callfunc "QWS_Town_Warpra",18,"Payon Town"; close; }
-prontera,147,172,5 script Warpra#32 113,{ callfunc "QWS_Town_Warpra",0,"Prontera Town"; close; }
-umbala,133,130,4 script Warpra#33 113,{ callfunc "QWS_Town_Warpra",19,"Umbala Town"; close; }
-xmas,151,136,4 script Warpra#34 113,{ callfunc "QWS_Town_Warpra",15,"Lutie Town"; close; }
-yuno,138,162,4 script Warpra#35 113,{ callfunc "QWS_Town_Warpra",20,"Yuno Town"; close; }
-brasilis,201,222,4 script Warpra#36 113,{ callfunc "QWS_Town_Warpra",21,"Brasilis Town"; close; }
-dicastes01,194,194,6 script Warpra#37 113,{ callfunc "QWS_Town_Warpra",22,"El Dicastes Town"; close; }
-manuk,262,177,4 script Warpra#38 113,{ callfunc "QWS_Town_Warpra",23,"Manuk Town"; close; }
-mora,110,100,4 script Warpra#39 113,{ callfunc "QWS_Town_Warpra",24,"Mora Town"; close; }
-moscovia,216,196,6 script Warpra#40 113,{ callfunc "QWS_Town_Warpra",25,"Moscovia Town"; close; }
-rachel,135,116,4 script Warpra#41 113,{ callfunc "QWS_Town_Warpra",26,"Rachel Town"; close; }
-splendide,205,153,4 script Warpra#42 113,{ callfunc "QWS_Town_Warpra",27,"Splendide Town"; close; }
-veins,214,123,4 script Warpra#43 113,{ callfunc "QWS_Town_Warpra",28,"Veins Town"; close; }
-dewata,194,178,6 script Warpra#44 113,{ callfunc "QWS_Town_Warpra",29,"Dewata Town"; close; }
-eclage,107,37,4 script Warpra#45 113,{ callfunc "QWS_Town_Warpra",30,"Eclage Town"; close; }
-
-abyss_02,274,266,1 script Warpra Helper#0 112,{ callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake"; close; }
-ama_dun02,192,118,5 script Warpra Helper#1 112,{ callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon"; close; }
-anthell02,170,165,3 script Warpra Helper#2 112,{ callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon"; close; }
-ayo_dun02,258,193,5 script Warpra Helper#3 112,{ callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon"; close; }
-ein_dun02,292,282,1 script Warpra Helper#4 112,{ callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon"; close; }
-iz_dun03,202,47,2 script Warpra Helper#5 112,{ callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon"; close; }
-c_tower3,129,106,4 script Warpra Helper#6 112,{ callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon"; close; }
-mjo_dun02,39,25,4 script Warpra Helper#7 112,{ callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon"; close; }
-prt_sewb2,176,30,3 script Warpra Helper#8 112,{ callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon"; close; }
-gefenia03,137,34,0 script Warpra Helper#9 112,{ callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon"; close; }
-gef_dun02,218,61,2 script Warpra Helper#10 112,{ callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon"; close; }
-glast_01,371,308,3 script Warpra Helper#11 112,{ callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon"; close; }
-gon_dun01,167,273,4 script Warpra Helper#12 112,{ callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon"; close; }
-juperos_02,127,154,5 script Warpra Helper#13 112,{ callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave"; close; }
-kh_dun01,14,224,3 script Warpra Helper#14 112,{ callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon"; close; }
-lhz_dun02,156,151,5 script Warpra Helper#15 112,{ callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab"; close; }
-lou_dun02,168,264,4 script Warpra Helper#16 112,{ callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon"; close; }
-mag_dun02,46,41,3 script Warpra Helper#17 112,{ callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon"; close; }
-odin_tem01,115,148,3 script Warpra Helper#18 112,{ callfunc "QWS_Dungeon_Warpra",18,"Odin Temple"; close; }
-orcsdun01,185,11,3 script Warpra Helper#19 112,{ callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon"; close; }
-pay_dun03,162,143,3 script Warpra Helper#20 112,{ callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon"; close; }
-moc_pryd02,101,95,3 script Warpra Helper#21 112,{ callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon"; close; }
-in_sphinx2,274,268,1 script Warpra Helper#22 112,{ callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon"; close; }
-tha_t07,111,162,3 script Warpra Helper#23 112,{ callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower"; close; }
-treasure02,104,40,3 script Warpra Helper#24 112,{ callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon"; close; }
-xmas_dun02,124,131,3 script Warpra Helper#25 112,{ callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon"; close; }
-um_dun02,44,28,3 script Warpra Helper#26 112,{ callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon"; close; }
-tur_dun02,162,23,3 script Warpra Helper#27 112,{ callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon"; close; }
-prt_maze02,102,69,4 script Warpra Helper#28 112,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; }
+alb2trea,73,101,4 duplicate(Warpra#0) Warpra#1 4_F_KAFRA5
+ama_fild01,178,325,1 duplicate(Warpra#0) Warpra#2 4_F_KAFRA5
+gef_fild10,71,339,4 duplicate(Warpra#0) Warpra#3 4_F_KAFRA5
+izlu2dun,104,82,4 duplicate(Warpra#0) Warpra#4 4_F_KAFRA5
+mjolnir_02,85,363,4 duplicate(Warpra#0) Warpra#5 4_F_KAFRA5
+moc_fild04,207,331,4 duplicate(Warpra#0) Warpra#6 4_F_KAFRA5
+moc_fild19,106,97,4 duplicate(Warpra#0) Warpra#7 4_F_KAFRA5
+moc_ruins,64,166,4 duplicate(Warpra#0) Warpra#8 4_F_KAFRA5
+niflheim,197,192,3 duplicate(Warpra#0) Warpra#9 4_F_KAFRA5
+pay_arche,39,135,4 duplicate(Warpra#0) Warpra#10 4_F_KAFRA5
+prt_fild05,273,215,4 duplicate(Warpra#0) Warpra#11 4_F_KAFRA5
+tur_dun01,148,239,4 duplicate(Warpra#0) Warpra#12 4_F_KAFRA5
+valkyrie,48,35,8 duplicate(Warpra#0) Warpra#13 4_F_KAFRA5
+yuno_fild03,37,135,4 duplicate(Warpra#0) Warpra#14 4_F_KAFRA5
+
+alberta,32,240,4 script Warpra#15 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",1,"Alberta Town"; close; }
+aldebaran,146,118,4 script Warpra#16 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",2,"Aldebaran Town"; close; }
+ayothaya,216,171,5 script Warpra#17 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",4,"Ayotaya Town"; close; }
+amatsu,193,81,1 script Warpra#18 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",3,"Amatsu Town"; close; }
+comodo,195,158,4 script Warpra#19 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",5,"Comodo Town"; close; }
+einbroch,229,196,5 script Warpra#20 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",7,"Einbroch Town"; close; }
+einbech,173,131,5 script Warpra#21 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",6,"Einbech Town"; close; }
+geffen,116,66,4 script Warpra#22 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",8,"Geffen Town"; close; }
+gonryun,152,130,4 script Warpra#23 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",9,"Gonryun Town"; close; }
+hugel,90,127,5 script Warpra#24 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",10,"Hugel Town"; close; }
+jawaii,107,182,5 script Warpra#25 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",12,"Jawaii Town"; close; }
+izlude,132,116,4 script Warpra#26 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",11,"Izlude Town"; close; }
+lighthalzen,153,100,5 script Warpra#27 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",13,"Lighthalzen Town"; close; }
+louyang,211,106,4 script Warpra#28 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",14,"Louyang Town"; close; }
+morocc,157,95,4 script Warpra#29 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",16,"Morroc Town"; close; }
+nif_fild01,319,77,1 script Warpra#30 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",17,"Niflheim Town"; close; }
+payon,183,110,4 script Warpra#31 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",18,"Payon Town"; close; }
+prontera,147,172,5 script Warpra#32 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",0,"Prontera Town"; close; }
+umbala,133,130,4 script Warpra#33 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",19,"Umbala Town"; close; }
+xmas,151,136,4 script Warpra#34 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",15,"Lutie Town"; close; }
+yuno,138,162,4 script Warpra#35 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",20,"Yuno Town"; close; }
+brasilis,201,222,4 script Warpra#36 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",21,"Brasilis Town"; close; }
+dicastes01,194,194,6 script Warpra#37 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",22,"El Dicastes Town"; close; }
+manuk,262,177,4 script Warpra#38 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",23,"Manuk Town"; close; }
+mora,110,100,4 script Warpra#39 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",24,"Mora Town"; close; }
+moscovia,216,196,6 script Warpra#40 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",25,"Moscovia Town"; close; }
+rachel,135,116,4 script Warpra#41 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",26,"Rachel Town"; close; }
+splendide,205,153,4 script Warpra#42 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",27,"Splendide Town"; close; }
+veins,214,123,4 script Warpra#43 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",28,"Veins Town"; close; }
+dewata,194,178,6 script Warpra#44 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",29,"Dewata Town"; close; }
+eclage,107,37,4 script Warpra#45 4_F_KAFRA5,{ callfunc "QWS_Town_Warpra",30,"Eclage Town"; close; }
+
+abyss_02,274,266,1 script Warpra Helper#0 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",0,"Abyss Lake"; close; }
+ama_dun02,192,118,5 script Warpra Helper#1 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",1,"Amatsu Dungeon"; close; }
+anthell02,170,165,3 script Warpra Helper#2 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",2,"Ant Hell Dungeon"; close; }
+ayo_dun02,258,193,5 script Warpra Helper#3 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",3,"Ayotaya Dungeon"; close; }
+ein_dun02,292,282,1 script Warpra Helper#4 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",8,"Einbech Dungeon"; close; }
+iz_dun03,202,47,2 script Warpra Helper#5 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",4,"Byalan Dungeon"; close; }
+c_tower3,129,106,4 script Warpra Helper#6 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",5,"Clock Tower Dungeon"; close; }
+mjo_dun02,39,25,4 script Warpra Helper#7 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",6,"Coal Mine Dungeon"; close; }
+prt_sewb2,176,30,3 script Warpra Helper#8 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",7,"Culvert Dungeon"; close; }
+gefenia03,137,34,0 script Warpra Helper#9 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",9,"Gefenia Dungeon"; close; }
+gef_dun02,218,61,2 script Warpra Helper#10 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",10,"Gefen Dungeon"; close; }
+glast_01,371,308,3 script Warpra Helper#11 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",11,"Glast Heim Dungeon"; close; }
+gon_dun01,167,273,4 script Warpra Helper#12 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",12,"Gonryun Dungeon"; close; }
+juperos_02,127,154,5 script Warpra Helper#13 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",14,"Juperos Cave"; close; }
+kh_dun01,14,224,3 script Warpra Helper#14 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",28,"Kiel Dungeon"; close; }
+lhz_dun02,156,151,5 script Warpra Helper#15 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",15,"Lighthalzen Bio Lab"; close; }
+lou_dun02,168,264,4 script Warpra Helper#16 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",16,"Louyang Dungeon"; close; }
+mag_dun02,46,41,3 script Warpra Helper#17 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",17,"Magma Dungeon"; close; }
+odin_tem01,115,148,3 script Warpra Helper#18 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",18,"Odin Temple"; close; }
+orcsdun01,185,11,3 script Warpra Helper#19 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",19,"Orc Dungeon"; close; }
+pay_dun03,162,143,3 script Warpra Helper#20 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",20,"Payon Dungeon"; close; }
+moc_pryd02,101,95,3 script Warpra Helper#21 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",21,"Pyramides Dungeon"; close; }
+in_sphinx2,274,268,1 script Warpra Helper#22 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",22,"Sphinx Dungeon"; close; }
+tha_t07,111,162,3 script Warpra Helper#23 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",24,"Thanatos Tower"; close; }
+treasure02,104,40,3 script Warpra Helper#24 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",23,"Sunken Ship Dungeon"; close; }
+xmas_dun02,124,131,3 script Warpra Helper#25 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",25,"Toy Factory Dungeon"; close; }
+um_dun02,44,28,3 script Warpra Helper#26 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",27,"Umbala Dungeon"; close; }
+tur_dun02,162,23,3 script Warpra Helper#27 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",26,"Turtle Island Dungeon"; close; }
+prt_maze02,102,69,4 script Warpra Helper#28 4_F_KAFRA6,{ callfunc "QWS_Dungeon_Warpra",13,"Hidden Dungeon"; close; }
diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt
index 1755bba21..fccb365ef 100644
--- a/npc/custom/etc/rpsroulette.txt
+++ b/npc/custom/etc/rpsroulette.txt
@@ -11,7 +11,7 @@
//= 1.2 Fixes by Blackthunder and me [Poki#3]
//============================================================
-cmd_in02,182,126,2 script Crazy Boris 85,{
+cmd_in02,182,126,2 script Crazy Boris 4_M_03,{
mes "Crazy Boris";
set @counter,1;
mes "Hey you! Up for Rock Scissors Roulette?";
diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt
index c60a565d5..4a4f7338d 100644
--- a/npc/custom/etc/shifty_assassin.txt
+++ b/npc/custom/etc/shifty_assassin.txt
@@ -11,7 +11,7 @@
//= 1.1.2 Updated WoE Check. [Paradox924X]
//============================================================
-morocc,148,86,5 script Shifty Assassin 725,{
+morocc,148,86,5 script Shifty Assassin 4_F_JOB_ASSASSIN,{
set $ninja_price,250000;
// STARTS THE MENU //
diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt
index 122524063..b805d7895 100644
--- a/npc/custom/etc/stock_market.txt
+++ b/npc/custom/etc/stock_market.txt
@@ -170,7 +170,7 @@ S_Fluc:
end;
}
-prontera,140,181,5 script Stock Market::stockmarket 109,{
+prontera,140,181,5 script Stock Market::stockmarket 4_M_MANAGER,{
// Ensures no trading when default prices have not been set //
set @stotal,$S1+$S2+$S3+$S4+$S5+$S6+$S7+$S8+$S9+$S10;
if (@stotal > 0) goto S_Start;
diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt
index 7f3dd598f..1db4c2251 100644
--- a/npc/custom/events/cluckers.txt
+++ b/npc/custom/events/cluckers.txt
@@ -16,7 +16,7 @@
//= 1.2a Switched 'atcommand' to 'unitskilluseid'.
//============================================================
-prontera,156,219,4 script Cluckers 800,{
+prontera,156,219,4 script Cluckers 4_NFCOCK,{
set .@GMAccess,80; // GM level required to access NPC
diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt
index a091281ef..1b46e9b16 100644
--- a/npc/custom/events/disguise.txt
+++ b/npc/custom/events/disguise.txt
@@ -10,7 +10,7 @@
//= 5.1 Cleaned and standardized, mostly. [Euphy]
//============================================================
-prontera,160,155,4 script Disguise Event 795,{
+prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{
// Currently set to run every two hours.
// To change times, edit the OnClock labels below.
diff --git a/npc/custom/events/hallow06.txt b/npc/custom/events/hallow06.txt
index 71b63e983..01a122320 100644
--- a/npc/custom/events/hallow06.txt
+++ b/npc/custom/events/hallow06.txt
@@ -11,7 +11,7 @@
//= 1.2 fixed bugs, optimized. Now uses 1 var instead of 3 [Lupus]
//============================================================
-prontera,151,190,5 script Hallows' Eve Event 807,{
+prontera,151,190,5 script Hallows' Eve Event 1_M_SIGNMCNT,{
mes "[Hallows' Eve Event]";
if(Class == Job_Novice){
mes "I am sorry but you have to got a job to complete the event.";
diff --git a/npc/custom/events/uneasy_cemetery.txt b/npc/custom/events/uneasy_cemetery.txt
index d026792b0..ac8124bd1 100644
--- a/npc/custom/events/uneasy_cemetery.txt
+++ b/npc/custom/events/uneasy_cemetery.txt
@@ -64,7 +64,7 @@ L_Start_Undead:
mapannounce "prontera","[Mother Mathana]: The cememtery has become restless! In the name of Odin, hurry to the Sanctuary! Save the city of Prontera!",0;
}
-prontera,257,313,5 script Mother Mathana 79,{
+prontera,257,313,5 script Mother Mathana 1_F_PRIEST,{
mes "[Mother Mathana]";
if ($UNEASY_DL <= 0) goto L_Undead_Walk;
mes "I'm afraid there's something wrong with our old cemetery...";
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index ec8464338..c60c6f3a6 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -14,7 +14,7 @@
//============================================================
// Tine - Valentine Event Chocolate Even Guide ------------------
-prontera,156,172,4 script Tine 58,{
+prontera,156,172,4 script Tine 1_M_MERCHANT,{
// Debug info for item effects and tricky conditions 8)
// mes "@dsv: "+@dsv;
// mes "ispartneron()=="+ispartneron();
@@ -72,7 +72,7 @@ OnInit:
}
// Stephen - Valentine Event Chocolate seller ------------------
-alberta,26,243,4 script Stephen#val1 58,{
+alberta,26,243,4 script Stephen#val1 1_M_MERCHANT,{
mes "[Stephen]";
mes "Guess what I've got?";
mes "A tasty treat not easily found in Rune-Midgard....";
@@ -127,7 +127,7 @@ L_NOTENO:
}
// Jainie -- Gives information about Valentine Event ------------------------
-alberta,29,243,4 script Jainie#val1 53,{
+alberta,29,243,4 script Jainie#val1 1_M_INNKEEPER,{
mes "[Jainie]";
mes "You know what? The chocolate that my boyfriend sells are from me!";
mes "I made them by myself. Now I need some Milk for my special White Chocolate.";
@@ -195,7 +195,7 @@ L_NOMILK:
}
// Carl Orleans -- Valentine Event Chocolate maker ------------------
-prt_castle,54,34,4 script Carl Orleans#val1 47,{
+prt_castle,54,34,4 script Carl Orleans#val1 1_M_01,{
mes "[Carl Orleans]";
mes "Yes? What can I cook for you?";
next;
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index 959e3a1a9..8d8be443b 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -12,7 +12,7 @@
//= 1.2 Fixed double quotes not being escaped [brianluau]
//============================================================
-prontera,156,174,4 script Snower 713,{
+prontera,156,174,4 script Snower 4_M_06,{
mes "[Snower]";
if(Q_XMSRINGS==2){
mes "Oh.. is it true? You've helped my sis Sneewy? Thank you.";
@@ -97,7 +97,7 @@ OnInit:
end;
}
-louyang,224,249,4 script Sneewy 717,{
+louyang,224,249,4 script Sneewy 4_F_KID3,{
mes "[Sneewy]";
if(Q_XMSRINGS==0){
mes "Hi! I'm waithing for my sister's birdy with mail...";
@@ -140,7 +140,7 @@ M_END:
close;
}
-izlu2dun,133,160,2 script Snoowy 714,{
+izlu2dun,133,160,2 script Snoowy 4_F_06,{
mes "[Snoowy]";
if(Q_XMSRINGS==0){
mes "Helloooou! Do you know my bro and sis? How so? My brother Snower's well known in Prontera!! Just ask any child there.";
diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt
index 4aee802d8..1b1d94d91 100644
--- a/npc/custom/healer.txt
+++ b/npc/custom/healer.txt
@@ -36,42 +36,42 @@
// Duplicates
//============================================================
-alberta,25,240,6 duplicate(Healer) Healer#alb 909
-aldebaran,135,118,6 duplicate(Healer) Healer#alde 909
-amatsu,200,79,4 duplicate(Healer) Healer#ama 909
-ayothaya,207,169,6 duplicate(Healer) Healer#ayo 909
-comodo,184,158,6 duplicate(Healer) Healer#com 909
-einbech,57,36,6 duplicate(Healer) Healer#einbe 909
-einbroch,57,202,6 duplicate(Healer) Healer#einbr 909
-geffen,115,72,6 duplicate(Healer) Healer#gef 909
-gonryun,156,122,6 duplicate(Healer) Healer#gon 909
-hugel,89,150,6 duplicate(Healer) Healer#hug 909
-izlude,125,118,5 duplicate(Healer) Healer#izl 909
-jawaii,250,139,4 duplicate(Healer) Healer#jaw 909
-lighthalzen,152,100,6 duplicate(Healer) Healer#lhz 909
-louyang,226,103,4 duplicate(Healer) Healer#lou 909
-manuk,272,144,6 duplicate(Healer) Healer#man 909
-mid_camp,203,289,6 duplicate(Healer) Healer#mid 909
-moc_ruins,72,164,4 duplicate(Healer) Healer#moc 909
-morocc,153,97,6 duplicate(Healer) Healer#mor 909
-moscovia,220,191,4 duplicate(Healer) Healer#mos 909
-niflheim,212,182,5 duplicate(Healer) Healer#nif 909
-payon,179,106,4 duplicate(Healer) Healer#pay 909
-prontera,162,193,4 duplicate(Healer) Healer#prt 909
-rachel,125,116,6 duplicate(Healer) Healer#rac 909
-splendide,201,153,4 duplicate(Healer) Healer#spl 909
-thor_camp,249,74,4 duplicate(Healer) Healer#thor 909
-umbala,105,148,3 duplicate(Healer) Healer#umb 909
-veins,217,121,4 duplicate(Healer) Healer#ve 909
-xmas,143,136,4 duplicate(Healer) Healer#xmas 909
-yuno,164,45,4 duplicate(Healer) Healer#yuno 909
+alberta,25,240,6 duplicate(Healer) Healer#alb 4_PORING
+aldebaran,135,118,6 duplicate(Healer) Healer#alde 4_PORING
+amatsu,200,79,4 duplicate(Healer) Healer#ama 4_PORING
+ayothaya,207,169,6 duplicate(Healer) Healer#ayo 4_PORING
+comodo,184,158,6 duplicate(Healer) Healer#com 4_PORING
+einbech,57,36,6 duplicate(Healer) Healer#einbe 4_PORING
+einbroch,57,202,6 duplicate(Healer) Healer#einbr 4_PORING
+geffen,115,72,6 duplicate(Healer) Healer#gef 4_PORING
+gonryun,156,122,6 duplicate(Healer) Healer#gon 4_PORING
+hugel,89,150,6 duplicate(Healer) Healer#hug 4_PORING
+izlude,125,118,5 duplicate(Healer) Healer#izl 4_PORING
+jawaii,250,139,4 duplicate(Healer) Healer#jaw 4_PORING
+lighthalzen,152,100,6 duplicate(Healer) Healer#lhz 4_PORING
+louyang,226,103,4 duplicate(Healer) Healer#lou 4_PORING
+manuk,272,144,6 duplicate(Healer) Healer#man 4_PORING
+mid_camp,203,289,6 duplicate(Healer) Healer#mid 4_PORING
+moc_ruins,72,164,4 duplicate(Healer) Healer#moc 4_PORING
+morocc,153,97,6 duplicate(Healer) Healer#mor 4_PORING
+moscovia,220,191,4 duplicate(Healer) Healer#mos 4_PORING
+niflheim,212,182,5 duplicate(Healer) Healer#nif 4_PORING
+payon,179,106,4 duplicate(Healer) Healer#pay 4_PORING
+prontera,162,193,4 duplicate(Healer) Healer#prt 4_PORING
+rachel,125,116,6 duplicate(Healer) Healer#rac 4_PORING
+splendide,201,153,4 duplicate(Healer) Healer#spl 4_PORING
+thor_camp,249,74,4 duplicate(Healer) Healer#thor 4_PORING
+umbala,105,148,3 duplicate(Healer) Healer#umb 4_PORING
+veins,217,121,4 duplicate(Healer) Healer#ve 4_PORING
+xmas,143,136,4 duplicate(Healer) Healer#xmas 4_PORING
+yuno,164,45,4 duplicate(Healer) Healer#yuno 4_PORING
// Duplicates (Renewal)
//============================================================
-brasilis,194,221,6 duplicate(Healer) Healer#bra 909
-dewata,195,187,4 duplicate(Healer) Healer#dew 909
-dicastes01,201,194,4 duplicate(Healer) Healer#dic 909
-ecl_in01,45,60,4 duplicate(Healer) Healer#ecl 909
-malangdo,132,114,6 duplicate(Healer) Healer#mal 909
-malaya,205,205,6 duplicate(Healer) Healer#ma 909
-mora,55,152,4 duplicate(Healer) Healer#mora 909
+brasilis,194,221,6 duplicate(Healer) Healer#bra 4_PORING
+dewata,195,187,4 duplicate(Healer) Healer#dew 4_PORING
+dicastes01,201,194,4 duplicate(Healer) Healer#dic 4_PORING
+ecl_in01,45,60,4 duplicate(Healer) Healer#ecl 4_PORING
+malangdo,132,114,6 duplicate(Healer) Healer#mal 4_PORING
+malaya,205,205,6 duplicate(Healer) Healer#ma 4_PORING
+mora,55,152,4 duplicate(Healer) Healer#mora 4_PORING
diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt
index 41bddb1f4..fad2f92f9 100644
--- a/npc/custom/item_signer.txt
+++ b/npc/custom/item_signer.txt
@@ -11,7 +11,7 @@
//= 1.1a Added 'disable_items' command. [Euphy]
//============================================================
-prt_in,24,61,7 script Perchik 47,{
+prt_in,24,61,7 script Perchik 1_M_01,{
setarray .@Item[0],644,3; // Item requirements: <ID>,<Count>{,...} (0 to disable)
setarray .@Cost[0],0,5000; // Zeny requirements: <base price>,<price per refine>
diff --git a/npc/custom/itemmall.txt b/npc/custom/itemmall.txt
index 954b69621..7e1aa1199 100644
--- a/npc/custom/itemmall.txt
+++ b/npc/custom/itemmall.txt
@@ -8,35 +8,35 @@
//= Street shops in Prontera.
//============================================================
-prontera,147,240,5 shop Armor 99,2304:10000,2306:20000,2308:20000,2310:50000,2311:50000,2313:50000,2315:75000,2317:100000,2322:20000,2326:60000,2331:75000,2342:100000,2353:75000,2364:150000,2367:100000,2399:50000
-prontera,147,242,5 shop Shield 99,2102:10000,2106:60000,2108:60000,2110:85000,2114:30000,2116:30000,2123:50000,2124:50000
-prontera,147,244,5 shop Footgear 99,2404:10000,2406:20000,2409:30000,2412:50000,2417:50000,2418:50000,2424:50000,2425:20000
-prontera,147,246,5 shop Mace 99,1502:10000,1505:20000,1511:20000,1514:-1,1517:-1,1520:50000,1522:100000,1523:25000,1528:50000,1529:50000,1531:50000
-prontera,147,248,5 shop Knuckle 494,1802:20000,1804:50000,1806:60000,1808:75000,1810:70000,1812:60000,1813:100000,1814:100000,1822:150000
-prontera,147,250,5 shop Whips 494,1951:10000,1953:20000,1955:30000,1962:20000,1963:50000,1972:10000,1974:10000,1976:50000
-prontera,147,252,5 shop Instruments 494,1902:10000,1904:20000,1906:-1,1908:50000,1913:50000,1914:50000,1915:50000,1916:50000,1917:50000
-prontera,147,254,5 shop Books 494,1550:30000,1551:60000,1552:51000,1559:25000,1561:75000,1564:25000,1568:70000,1569:70000,1570:70000,1571:70000,1572:50000
-prontera,147,256,5 shop Guns 497,13103:60000,13105:100000,13106:200000,13101:10000,13150:6000,13152:30000,13153:50000,13155:60000,13156:100000,13154:30000,13159:250000,13157:150000,13161:300000,13162:500000
-prontera,147,258,5 shop Fuuma Shuriken 497,7522:500,7521:500,7523:500
-prontera,147,260,5 shop One-Handed Swords 497,1108:10000,1117:10000,1120:100000,1124:50000,1130:100000,1131:50000,1133:50000,1138:200000,1139:200000,1145:-1,1149:50000
-prontera,147,262,5 shop Two-Handed Swords 497,1155:50000,1158:90000,1163:120000,1164:50000,1165:50000,1166:75000,1168:50000,1169:500000,1172:200000,1175:75000
-prontera,147,264,5 shop Spears 731,1405:20000,1408:50000,1415:100000,1417:75000,1421:75000,1422:25000
-prontera,147,238,1 shop Dagger 731,1208:20000,1211:20000,1217:20000,1223:50000,1231:75000,1235:75000,1236:75000,1237:75000
-prontera,164,264,4 shop Axes 731,1302:10000,1306:20000,1307:45000,1309:75000,1352:20000,1355:30000,1358:75000,1363:50000,1364:50000,1365:50000,1366:50000,1371:100000
-prontera,164,262,4 shop Accessories 731,2621:-1,2622:-1,2624:30000,2618:10000,2625:30000,2626:30000,2674:10000,2648:50000,2649:50000,2627:-1,2701:75000
-prontera,164,260,4 shop Bows 731,1702:20000,1705:50000,1708:20000,1720:50000,1723:75000,1724:75000,1725:75000
-prontera,164,258,4 shop Staffs / Rods 731,1602:20000,1605:20000,1608:20000,1611:45000,1618:85000,1620:85000,1622:50000,1624:50000,1625:50000,1626:50000
-prontera,164,256,4 shop Garments 405,2504:10000,2506:40000,2507:82000,2508:56000,2514:50000,2518:60000,2519:60000,2528:85000,2531:10000,2553:10000
-prontera,164,254,4 shop Katars 405,1251:50000,1253:100000,1255:75000,1261:125000,1262:20000,1263:20000,1265:100000,1275:100000,1276:100000,1277:100000,1278:100000
-prontera,164,252,4 shop Lower Headgear 405,2218:10000,5054:30000,2267:5000,5107:100000,2265:5000,2266:50000,2269:50000,2270:50000
-prontera,164,250,4 shop Middle Headgear 405,2201:5000,2203:4000,2205:3500,2212:5000,2225:10000,2229:50000,2231:50000,2234:50000,2235:50000,2281:25000,2292:50000,2296:50000
-prontera,164,248,4 shop Upper Headgear 405,2210:1000,2211:1000,2213:10000,2214:20000,2217:10000,2221:5000,2223:10000,2246:75000,2256:75000,2264:100000,2280:20000,2299:30000
-prontera,164,246,4 shop Headgear 01 832,5380:40000,5382:40000,2269:5000,2270:5000,5107:15000,5110:15000,2247:30000:5206:10000,2245:30000,2286:35000,2296:15000,2258:45000,5161:200000,5104:40000,2295:20000,5026:30000,5032:100000,5038:30000,5229:65000,5227:65000,5228:65000,5198:50000,5058:300000,5253:80000,5252:60000,5296:100000,5231:300000,5232:300000,5233:300000,5230:300000,5234:300000,5076:50000
-prontera,164,244,4 shop Headgear 02 832,5059:100000,5235:75000,5236:75000,5237:75000,5293:150000,5303:35000,5304:65000,5312:65000,5315:45000,5317:45000,5319:75000,5320:120000,5323:588888,5336:50000,5337:50000,5338:50000,5339:50000,5346:50000
-prontera,164,242,4 shop Headgear 03 832,5181:300000,5102:500000,5016:75000,5349:150000,5013:700000,5022:500000,5171:1250000,5135:500000,5029:50000,5033:65000,5040:100000,5047:35000,5065:65000,5068:50000,5074:50000,5084:75000,5086:150000,5108:350000,5121:100000,5133:50000,5137:100000,5138:150000,5140:55000,5146:75000,5151:75000,5152:150000,5170:150000,5173:75000,5174:75000,5175:75000,5184:50000,5185:45000,5187:75000,5188:50000,5191:25000,5192:25000,5193:25000,5194:25000,5195:25000,5196:25000,5197:25000
-prontera,164,240,4 shop Headgear 04 832,5200:75000,5205:100000,5211:75000,5226:50000,5238:75000,5239:75000,5240:75000,5241:75000,5242:75000,5243:50000,5325:75000,5254:100000,5255:65000,5257:50000,5297:100000,2202:45000,5258:35000,5298:50000,5276:50000,5273:50000,5275:50000,5274:50000,5259:50000,5271:250000,5272:50000,5284:50000,5286:75000,5288:50000,5289:50000,5291:55000,5292:55000,5294:55000,5352:50000,5324:100000,5359:50000,5360:50000
-prontera,164,238,4 shop Headgear 05 832,5340:50000,5341:50000,5342:50000,5343:50000,5344:50000,5345:50000,5354:50000,5355:50000,5361:65000,5365:50000,5373:75000,5374:350000,5379:50000,5383:60000,5384:88888,5390:88888,5388:50000,5411:50000,5393:75000,5397:35000,5399:50000,5800:175000,5801:300000,5802:150000
-prontera,151,284,4 shop Ammunition 880,1766:50,1755:20,1750:10,1754:20,1761:20,1752:20,1760:20,1759:20,1772:100,1757:30,1770:20,1769:30,1765:40,1763:30,1762:30,1767:30,1764:30,1751:20,1768:30,1753:30,1756:30,1758:30,1771:1000,13200:50,13202:100,13201:300,13206:500,13203:500,13207:500,13204:500,13205:500,13252:50,13254:500,13251:100,13253:300,13250:50,13256:50,13259:50,13258:50,13255:50,13257:50
-prontera,153,284,4 shop Alchemist Dealer 880,715:600,716:600,717:600,1025:200,7136:500,7135:500,7137:500,7138:500,7139:500
-prontera,155,284,4 shop Street Dealer 880,678:5000,505:-1,506:40,610:4000,545:150,546:600,547:1650
-prontera,157,284,4 shop Sheepy Gonzales 895,12028:1000,12262:500,12016:750
+prontera,147,240,5 shop Armor 4W_M_03,2304:10000,2306:20000,2308:20000,2310:50000,2311:50000,2313:50000,2315:75000,2317:100000,2322:20000,2326:60000,2331:75000,2342:100000,2353:75000,2364:150000,2367:100000,2399:50000
+prontera,147,242,5 shop Shield 4W_M_03,2102:10000,2106:60000,2108:60000,2110:85000,2114:30000,2116:30000,2123:50000,2124:50000
+prontera,147,244,5 shop Footgear 4W_M_03,2404:10000,2406:20000,2409:30000,2412:50000,2417:50000,2418:50000,2424:50000,2425:20000
+prontera,147,246,5 shop Mace 4W_M_03,1502:10000,1505:20000,1511:20000,1514:-1,1517:-1,1520:50000,1522:100000,1523:25000,1528:50000,1529:50000,1531:50000
+prontera,147,248,5 shop Knuckle 4_M_ROKI,1802:20000,1804:50000,1806:60000,1808:75000,1810:70000,1812:60000,1813:100000,1814:100000,1822:150000
+prontera,147,250,5 shop Whips 4_M_ROKI,1951:10000,1953:20000,1955:30000,1962:20000,1963:50000,1972:10000,1974:10000,1976:50000
+prontera,147,252,5 shop Instruments 4_M_ROKI,1902:10000,1904:20000,1906:-1,1908:50000,1913:50000,1914:50000,1915:50000,1916:50000,1917:50000
+prontera,147,254,5 shop Books 4_M_ROKI,1550:30000,1551:60000,1552:51000,1559:25000,1561:75000,1564:25000,1568:70000,1569:70000,1570:70000,1571:70000,1572:50000
+prontera,147,256,5 shop Guns 4_M_CATMAN1,13103:60000,13105:100000,13106:200000,13101:10000,13150:6000,13152:30000,13153:50000,13155:60000,13156:100000,13154:30000,13159:250000,13157:150000,13161:300000,13162:500000
+prontera,147,258,5 shop Fuuma Shuriken 4_M_CATMAN1,7522:500,7521:500,7523:500
+prontera,147,260,5 shop One-Handed Swords 4_M_CATMAN1,1108:10000,1117:10000,1120:100000,1124:50000,1130:100000,1131:50000,1133:50000,1138:200000,1139:200000,1145:-1,1149:50000
+prontera,147,262,5 shop Two-Handed Swords 4_M_CATMAN1,1155:50000,1158:90000,1163:120000,1164:50000,1165:50000,1166:75000,1168:50000,1169:500000,1172:200000,1175:75000
+prontera,147,264,5 shop Spears 4_M_JOB_BLACKSMITH,1405:20000,1408:50000,1415:100000,1417:75000,1421:75000,1422:25000
+prontera,147,238,1 shop Dagger 4_M_JOB_BLACKSMITH,1208:20000,1211:20000,1217:20000,1223:50000,1231:75000,1235:75000,1236:75000,1237:75000
+prontera,164,264,4 shop Axes 4_M_JOB_BLACKSMITH,1302:10000,1306:20000,1307:45000,1309:75000,1352:20000,1355:30000,1358:75000,1363:50000,1364:50000,1365:50000,1366:50000,1371:100000
+prontera,164,262,4 shop Accessories 4_M_JOB_BLACKSMITH,2621:-1,2622:-1,2624:30000,2618:10000,2625:30000,2626:30000,2674:10000,2648:50000,2649:50000,2627:-1,2701:75000
+prontera,164,260,4 shop Bows 4_M_JOB_BLACKSMITH,1702:20000,1705:50000,1708:20000,1720:50000,1723:75000,1724:75000,1725:75000
+prontera,164,258,4 shop Staffs / Rods 4_M_JOB_BLACKSMITH,1602:20000,1605:20000,1608:20000,1611:45000,1618:85000,1620:85000,1622:50000,1624:50000,1625:50000,1626:50000
+prontera,164,256,4 shop Garments 4_M_YOUNGKNIGHT,2504:10000,2506:40000,2507:82000,2508:56000,2514:50000,2518:60000,2519:60000,2528:85000,2531:10000,2553:10000
+prontera,164,254,4 shop Katars 4_M_YOUNGKNIGHT,1251:50000,1253:100000,1255:75000,1261:125000,1262:20000,1263:20000,1265:100000,1275:100000,1276:100000,1277:100000,1278:100000
+prontera,164,252,4 shop Lower Headgear 4_M_YOUNGKNIGHT,2218:10000,5054:30000,2267:5000,5107:100000,2265:5000,2266:50000,2269:50000,2270:50000
+prontera,164,250,4 shop Middle Headgear 4_M_YOUNGKNIGHT,2201:5000,2203:4000,2205:3500,2212:5000,2225:10000,2229:50000,2231:50000,2234:50000,2235:50000,2281:25000,2292:50000,2296:50000
+prontera,164,248,4 shop Upper Headgear 4_M_YOUNGKNIGHT,2210:1000,2211:1000,2213:10000,2214:20000,2217:10000,2221:5000,2223:10000,2246:75000,2256:75000,2264:100000,2280:20000,2299:30000
+prontera,164,246,4 shop Headgear 01 4_M_REIDIN_KURS,5380:40000,5382:40000,2269:5000,2270:5000,5107:15000,5110:15000,2247:30000:5206:10000,2245:30000,2286:35000,2296:15000,2258:45000,5161:200000,5104:40000,2295:20000,5026:30000,5032:100000,5038:30000,5229:65000,5227:65000,5228:65000,5198:50000,5058:300000,5253:80000,5252:60000,5296:100000,5231:300000,5232:300000,5233:300000,5230:300000,5234:300000,5076:50000
+prontera,164,244,4 shop Headgear 02 4_M_REIDIN_KURS,5059:100000,5235:75000,5236:75000,5237:75000,5293:150000,5303:35000,5304:65000,5312:65000,5315:45000,5317:45000,5319:75000,5320:120000,5323:588888,5336:50000,5337:50000,5338:50000,5339:50000,5346:50000
+prontera,164,242,4 shop Headgear 03 4_M_REIDIN_KURS,5181:300000,5102:500000,5016:75000,5349:150000,5013:700000,5022:500000,5171:1250000,5135:500000,5029:50000,5033:65000,5040:100000,5047:35000,5065:65000,5068:50000,5074:50000,5084:75000,5086:150000,5108:350000,5121:100000,5133:50000,5137:100000,5138:150000,5140:55000,5146:75000,5151:75000,5152:150000,5170:150000,5173:75000,5174:75000,5175:75000,5184:50000,5185:45000,5187:75000,5188:50000,5191:25000,5192:25000,5193:25000,5194:25000,5195:25000,5196:25000,5197:25000
+prontera,164,240,4 shop Headgear 04 4_M_REIDIN_KURS,5200:75000,5205:100000,5211:75000,5226:50000,5238:75000,5239:75000,5240:75000,5241:75000,5242:75000,5243:50000,5325:75000,5254:100000,5255:65000,5257:50000,5297:100000,2202:45000,5258:35000,5298:50000,5276:50000,5273:50000,5275:50000,5274:50000,5259:50000,5271:250000,5272:50000,5284:50000,5286:75000,5288:50000,5289:50000,5291:55000,5292:55000,5294:55000,5352:50000,5324:100000,5359:50000,5360:50000
+prontera,164,238,4 shop Headgear 05 4_M_REIDIN_KURS,5340:50000,5341:50000,5342:50000,5343:50000,5344:50000,5345:50000,5354:50000,5355:50000,5361:65000,5365:50000,5373:75000,5374:350000,5379:50000,5383:60000,5384:88888,5390:88888,5388:50000,5411:50000,5393:75000,5397:35000,5399:50000,5800:175000,5801:300000,5802:150000
+prontera,151,284,4 shop Ammunition 4_M_MASKMAN,1766:50,1755:20,1750:10,1754:20,1761:20,1752:20,1760:20,1759:20,1772:100,1757:30,1770:20,1769:30,1765:40,1763:30,1762:30,1767:30,1764:30,1751:20,1768:30,1753:30,1756:30,1758:30,1771:1000,13200:50,13202:100,13201:300,13206:500,13203:500,13207:500,13204:500,13205:500,13252:50,13254:500,13251:100,13253:300,13250:50,13256:50,13259:50,13258:50,13255:50,13257:50
+prontera,153,284,4 shop Alchemist Dealer 4_M_MASKMAN,715:600,716:600,717:600,1025:200,7136:500,7135:500,7137:500,7138:500,7139:500
+prontera,155,284,4 shop Street Dealer 4_M_MASKMAN,678:5000,505:-1,506:40,610:4000,545:150,546:600,547:1650
+prontera,157,284,4 shop Sheepy Gonzales 4_F_KHELLY,12028:1000,12262:500,12016:750
diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt
index cd07cf443..ed55b4d87 100644
--- a/npc/custom/jobmaster.txt
+++ b/npc/custom/jobmaster.txt
@@ -12,7 +12,7 @@
//= 1.3 Kagerou/Oboro added. [Euphy]
//============================================================
-prontera,153,193,6 script Job Master 123,{
+prontera,153,193,6 script Job Master 2_F_MAGICMASTER,{
function Job_Menu; function A_An;
mes "[Job Master]";
diff --git a/npc/custom/platinum_skills.txt b/npc/custom/platinum_skills.txt
index 9295d122f..da35da389 100644
--- a/npc/custom/platinum_skills.txt
+++ b/npc/custom/platinum_skills.txt
@@ -18,7 +18,7 @@
//= 2.8 Clustered conditionals replaced with switch to include all Upper types. [Euphy]
//============================================================
-prontera,128,200,6 script Platinum Skill NPC 94,{
+prontera,128,200,6 script Platinum Skill NPC 4_F_MAID,{
mes "[Platinum Skill NPC]";
mes "I can give you the special skills available to your job.";
mes "Would you like these skills now?";
diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index 6cf47ef25..ebb74afc7 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -15,7 +15,7 @@
//= 1.3 Removed duplicates [L0ne_W0lf]
//============================================================
-umbala,126,129,4 script Bearded Man#bandit 120,{
+umbala,126,129,4 script Bearded Man#bandit 2_M_PHARMACIST,{
if(BEARD_QUEST == 4 ) goto L_MAKE;
if(BEARD_QUEST >= 5 ) goto L_DONE;
if(BEARD_QUEST >= 1 ) goto L_THREAD;
@@ -100,7 +100,7 @@ L_NOITEMS:
}
//Master Tailor----------
-izlude_in,123,175,4 script Master Tailor#bandit 50,{
+izlude_in,123,175,4 script Master Tailor#bandit 1_M_04,{
mes "[Master Tailor]";
mes "Good evening! I am the Master Tailor!";
if(BEARD_QUEST != 1 ) close;
@@ -117,7 +117,7 @@ izlude_in,123,175,4 script Master Tailor#bandit 50,{
close;
}
// Karfa Thread Clerk---
-aldeba_in,70,179,5 script Karfa Clerk#bandit 113,{
+aldeba_in,70,179,5 script Karfa Clerk#bandit 4_F_KAFRA5,{
mes "[Karfa Clerk]";
if(BEARD_QUEST == 3 ) goto L_REPEAT;
if(BEARD_QUEST > 3 ) goto L_DONE;
@@ -155,7 +155,7 @@ L_DONE:
}
//Thread Merchant ------
-alberta,65,123,6 script Man#bandit 85,{
+alberta,65,123,6 script Man#bandit 4_M_03,{
if(BEARD_QUEST == 3 && $@beardMobD) goto L_KILLED;
if(BEARD_QUEST > 3) goto L_DONE;
diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt
index 6f58870eb..8827329d9 100644
--- a/npc/custom/quests/berzebub.txt
+++ b/npc/custom/quests/berzebub.txt
@@ -11,7 +11,7 @@
//= 1.2 Optimized. [Euphy]
//============================================================
-prontera,165,178,8 script Old Woman 103,{
+prontera,165,178,8 script Old Woman 8_F_GRANDMOTHER,{
setarray .@Items[0],714,25,1061,100,1095,200,618,10,1551,2,1614,1,727,20;
set .@n$,"[Old Woman]";
diff --git a/npc/custom/quests/dead_branch.txt b/npc/custom/quests/dead_branch.txt
index 13daa244b..95f0a95b7 100644
--- a/npc/custom/quests/dead_branch.txt
+++ b/npc/custom/quests/dead_branch.txt
@@ -12,7 +12,7 @@
//= 1.1 Optimized, added Bloody Branch with 0.01% chance [Lupus]
//============================================================
-niflheim,204,179,3 script Mister Mobry 121,{
+niflheim,204,179,3 script Mister Mobry 2_M_MOLGENSTEIN,{
mes "[Mister Mobry]";
mes "Trees possess spirits you know...";
diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt
index e412fcb67..25eb12080 100644
--- a/npc/custom/quests/elvenear.txt
+++ b/npc/custom/quests/elvenear.txt
@@ -11,7 +11,7 @@
//= 1.2 Fixed exploit [Lupus]
//============================================================
-geffen,127,49,5 script Elven Ears Quest 84,{
+geffen,127,49,5 script Elven Ears Quest 4_M_02,{
mes "[Elven Ears Quest]";
mes "Hi, today's quest is....";
mes "Ah, the ^61B031Elven Ears ^000000Quest!";
diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt
index ce3885be3..7352beef1 100644
--- a/npc/custom/quests/event_6_new_hats.txt
+++ b/npc/custom/quests/event_6_new_hats.txt
@@ -22,7 +22,7 @@
//= 1.4 Fixed exploits. 1.4a fixed wrong item ID [Lupus]
//============================================================
-prt_in,130,66,5 script Zac 704,{
+prt_in,130,66,5 script Zac 4_M_BIBI,{
mes "[Zac]";
mes "I am the oldest and strongest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
next;
@@ -82,7 +82,7 @@ L3:
close;
}
-prt_in,162,131,5 script Blac 732,{
+prt_in,162,131,5 script Blac 4_M_JOB_HUNTER,{
mes "[Blac]";
mes "I am the youngest and sexiest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
next;
@@ -136,7 +136,7 @@ L3:
close;
}
-prt_in,53,56,5 script Jac 107,{
+prt_in,53,56,5 script Jac 1_M_PAY_ELDER,{
mes "[Jac]";
mes "I am the 2nd oldest and calmest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat, so I can make them.";
next;
@@ -220,7 +220,7 @@ L3:
close;
}
-prt_in,45,113,5 script Pac 705,{
+prt_in,45,113,5 script Pac 4_M_GEF_SOLDIER,{
mes "[Pac]";
mes "I am 3rd oldest and wisest of the 4 brothers that makes all the newer hats. You will need to bring me the correct items for each hat so I can make them.";
next;
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index c1b2b62e2..d07ebb0d0 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -16,7 +16,7 @@
//= 1.3a Added mission reset options.
//============================================================
-prontera,152,187,6 script Hunting Missions 951,{
+prontera,152,187,6 script Hunting Missions 4_F_EDEN_MASTER,{
function Chk; function Cm;
mes "[Hunting Missions]";
mes "Hello, "+strcharinfo(0)+"!";
diff --git a/npc/custom/quests/jewel_case.txt b/npc/custom/quests/jewel_case.txt
index 27770cb6b..d725a33f1 100644
--- a/npc/custom/quests/jewel_case.txt
+++ b/npc/custom/quests/jewel_case.txt
@@ -9,7 +9,7 @@
//= with Jewel Case as a reward.
//============================================================
-lighthalzen,108,229,2 script La Fenn 766,{
+lighthalzen,108,229,2 script La Fenn 4_M_JPNOJI,{
mes "[La Fenn]";
if(BaseLevel<99) {
if(Q_99LVL) {
diff --git a/npc/custom/quests/kaho_balmung.txt b/npc/custom/quests/kaho_balmung.txt
index 4da28bc38..fac8b85ff 100644
--- a/npc/custom/quests/kaho_balmung.txt
+++ b/npc/custom/quests/kaho_balmung.txt
@@ -11,7 +11,7 @@
//= 1.1 Cleaned and optimized. [Euphy]
//============================================================
-prontera,158,356,4 script Royal Messenger 105,{
+prontera,158,356,4 script Royal Messenger 8W_SOLDIER,{
setarray .@Req1[0],1161,999,120,984,10,996,10,994,10,995,10,997,10;
setarray .@Req2[0],5013,2298,1,1001,10,996,10,994,10,995,10,997,10;
diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt
index 4677dea8c..ea1916e50 100644
--- a/npc/custom/quests/kahohorn.txt
+++ b/npc/custom/quests/kahohorn.txt
@@ -10,7 +10,7 @@
//= 1.1 Optimized, and fixed some requirements. [Euphy]
//============================================================
-geffen,115,107,5 script Lord Kaho's Servant 61,{
+geffen,115,107,5 script Lord Kaho's Servant 1_M_PUBMASTER,{
setarray .@Items[0],7005, 968, 923, 734, 724,2268,7036,7020,5053,7018,741,742,743,750,751,752,753,754;
setarray .@Drops[0],1272,1087,1039,1260,1046,1115,1252,1147,1038,1059;
diff --git a/npc/custom/quests/kings_items.txt b/npc/custom/quests/kings_items.txt
index de908ab9e..b8c7a5538 100644
--- a/npc/custom/quests/kings_items.txt
+++ b/npc/custom/quests/kings_items.txt
@@ -11,7 +11,7 @@
//= 1.1 Optimized. [Euphy]
//============================================================
-prt_castle,80,170,4 script King of Prontera 108,{
+prt_castle,80,170,4 script King of Prontera 1_M_PRON_KING,{
mes "[King of Prontera]";
mes "Hello, can you help me?";
next;
@@ -62,7 +62,7 @@ prt_castle,80,170,4 script King of Prontera 108,{
}
}
-prt_castle,84,170,4 script King's Daughter 62,{
+prt_castle,84,170,4 script King's Daughter 1_M_SIZ,{
mes "[King's Daughter]";
mes "Hmph, I hate my dad right now!!";
next;
diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt
index c354c6ae9..eda6b2aa6 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -12,7 +12,7 @@
//= 1.01 translated the rest of dialogues
//============================================================
-gonryun,187,140,4 script Yakima 850,{
+gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{
mes "[Yakima]";
mes callfunc("F_Hi");
mes "I can make some items for you.";
diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt
index c4794c341..9398826ba 100644
--- a/npc/custom/quests/quest_shop.txt
+++ b/npc/custom/quests/quest_shop.txt
@@ -21,7 +21,7 @@
// Shop NPCs -- supplying no argument displays entire menu.
// callfunc "qshop"{,<shop ID>{,<shop ID>{,...}}};
//============================================================
-prontera,164,203,6 script Quest Shop#1 998,{ callfunc "qshop"; }
+prontera,164,203,6 script Quest Shop#1 4_M_MOCASS2,{ callfunc "qshop"; }
// Script Core
diff --git a/npc/custom/quests/questboard.txt b/npc/custom/quests/questboard.txt
index 265b24c60..28a25cc28 100644
--- a/npc/custom/quests/questboard.txt
+++ b/npc/custom/quests/questboard.txt
@@ -15,7 +15,7 @@
// 1.4.4 Added Quest delay
//============================================================
-prontera,129,215,5 script Questboard 857,{
+prontera,129,215,5 script Questboard 4_BOARD3,{
if(c_run==1){
mes "[^FF7700Questboard^000000]";
diff --git a/npc/custom/quests/sphinx_mask.txt b/npc/custom/quests/sphinx_mask.txt
index 2d4cc8f94..b4e9c118c 100644
--- a/npc/custom/quests/sphinx_mask.txt
+++ b/npc/custom/quests/sphinx_mask.txt
@@ -11,7 +11,7 @@
//= 1.3 Optimized, and coordinates moved. [Euphy]
//============================================================
-morocc,208,90,6 script Turban Thief 58,{
+morocc,208,90,6 script Turban Thief 1_M_MERCHANT,{
mes "[Turban Thief]";
if(event_umbala < 2) {
mes "What do you wan te withz me? Be gone!";
diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt
index e58639cb1..a4c828457 100644
--- a/npc/custom/quests/sunglasses.txt
+++ b/npc/custom/quests/sunglasses.txt
@@ -15,7 +15,7 @@
//= 1.8 Cleaning. [Euphy]
//============================================================
-alberta,88,193,5 script Sunglasses Trader 73,{
+alberta,88,193,5 script Sunglasses Trader 1_F_MERCHANT_01,{
mes "[Sunglasses Trader]";
if(SG_QUEST1 == 1) {
mes "There is nothing more I can tell you.";
@@ -67,7 +67,7 @@ alberta,88,193,5 script Sunglasses Trader 73,{
close;
}
-moc_fild07,334,186,5 script Maseph 702,{
+moc_fild07,334,186,5 script Maseph 4_F_GON,{
mes "[Maseph]";
if(SG_QUEST1 != 1) {
mes "Lovely day, isn't it ?";
diff --git a/npc/custom/quests/tha_statues.txt b/npc/custom/quests/tha_statues.txt
index d072179f3..283615be9 100644
--- a/npc/custom/quests/tha_statues.txt
+++ b/npc/custom/quests/tha_statues.txt
@@ -13,7 +13,7 @@
//Statue (NPC)(U: UP, D: DOWN, R: RIGHT, L: LEFT) :
// Explain Npc
-tha_t08,69,106,4 script Statue 111,{
+tha_t08,69,106,4 script Statue HIDDEN_NPC,{
mes "You can read on the back of the statue:";
mes "'By the spirit of olds, the walls are closed";
mes "Upper floors or foreign taboo";
@@ -28,7 +28,7 @@ tha_t08,69,106,4 script Statue 111,{
//(Mediane)(D,R)-->tha_t09,84,99,4
//Script:
-tha_t09,17,158,4 script Thalos 111,{
+tha_t09,17,158,4 script Thalos HIDDEN_NPC,{
if(TSQ_CHK == 1) goto done;
mes "[Thalos]";
mes "You must find the 2nd Statue now.";
@@ -41,7 +41,7 @@ done:
}
-tha_t09,84,99,4 script Mediane 111,{
+tha_t09,84,99,4 script Mediane HIDDEN_NPC,{
if(TSQ_CHK != 1) goto nook;
mes "[Mediane]";
mes "Okay, i am warping you to the next floor now.";
@@ -61,7 +61,7 @@ nook:
//(Veriaelle)(D,L)-->tha_t10,99,97,4
//Script:
-tha_t10,130,159,4 script Melkor 111,{
+tha_t10,130,159,4 script Melkor HIDDEN_NPC,{
if(TSQ_CHK == 1) goto done;
mes "[Melkor]";
mes "You must find the other Spirits now.";
@@ -74,7 +74,7 @@ done:
close;
}
-tha_t10,160,98,4 script Zebrus 111,{
+tha_t10,160,98,4 script Zebrus HIDDEN_NPC,{
if(TSQ_CHK != 1) goto nook;
mes "[Zebrus]";
mes "Keep on this way, There is one Spirit left";
@@ -88,7 +88,7 @@ nook:
close;
}
-tha_t10,99,97,4 script Veriaelle 111,{
+tha_t10,99,97,4 script Veriaelle HIDDEN_NPC,{
if(TSQ_CHK != 2) goto nook;
mes "[Veriaelle]";
mes "Okay, i am warping you to the next floor.";
@@ -111,7 +111,7 @@ nook:
//(Seranes)(U,R)-->tha_t11,85,85,4
//Script:
-tha_t11,16,85,4 script Throtre 111,{
+tha_t11,16,85,4 script Throtre HIDDEN_NPC,{
if(TSQ_CHK == 1) goto done;
mes "[Throtre]";
mes "You got my authorization for the next floor";
@@ -124,7 +124,7 @@ done:
close;
}
-tha_t11,85,16,4 script Klermaz 111,{
+tha_t11,85,16,4 script Klermaz HIDDEN_NPC,{
if(TSQ_CHK != 1) goto nook;
mes "[Klermaz]";
mes "Hmm it seems that Throtre allowed you to pass.";
@@ -139,7 +139,7 @@ nook:
close;
}
-tha_t11,16,16,4 script Mihane 111,{
+tha_t11,16,16,4 script Mihane HIDDEN_NPC,{
if(TSQ_CHK != 2) goto nook;
mes "[Mihane]";
mes "Keep on this way, Only 1 Left.";
@@ -153,7 +153,7 @@ nook:
close;
}
-tha_t11,85,85,4 script Seranes 111,{
+tha_t11,85,85,4 script Seranes HIDDEN_NPC,{
if(TSQ_CHK != 3 ) goto nook;
mes "[Seranes]";
mes "Perfect, it seems that the other spirits grants you the access.";
@@ -178,7 +178,7 @@ nook:
//(Sox)(U)-->tha_t12,128,88,4
//Script:
-tha_t12,103,18,4 script Nox 111,{
+tha_t12,103,18,4 script Nox HIDDEN_NPC,{
if(TSQ_CHK == 1 ) goto done;
mes "[Nox]";
mes "Fine, 4 Spirits left.";
@@ -190,7 +190,7 @@ done:
close;
}
-tha_t12,162,58,4 script Vox 111,{
+tha_t12,162,58,4 script Vox HIDDEN_NPC,{
if(TSQ_CHK != 1 ) goto nook;
mes "[Vox]";
mes "Keep on this way, 3 Spirits remaining !";
@@ -204,7 +204,7 @@ nook:
close;
}
-tha_t12,96,57,4 script Hox 111,{
+tha_t12,96,57,4 script Hox HIDDEN_NPC,{
if(TSQ_CHK != 2 ) goto nook;
mes "[Hox]";
mes "You are on the good way, 2 Spirits remaining !";
@@ -218,7 +218,7 @@ nook:
close;
}
-tha_t12,153,17,4 script Dox 111,{
+tha_t12,153,17,4 script Dox HIDDEN_NPC,{
if(TSQ_CHK != 3 ) goto nook;
mes "[Dox]";
mes "Perfect, 1 Spirit left.";
@@ -232,7 +232,7 @@ nook:
close;
}
-tha_t12,128,88,4 script Sox 111,{
+tha_t12,128,88,4 script Sox HIDDEN_NPC,{
if(TSQ_CHK != 4 ) goto nook;
mes "[Sox]";
mes "You have just passed the test successfully.";
diff --git a/npc/custom/quests/thq/THQS_ChatingNPC.txt b/npc/custom/quests/thq/THQS_ChatingNPC.txt
index 5fce4d13d..a8cb49b9f 100644
--- a/npc/custom/quests/thq/THQS_ChatingNPC.txt
+++ b/npc/custom/quests/thq/THQS_ChatingNPC.txt
@@ -12,7 +12,7 @@
//============================================================
//Entrance Flags
-yuno,48,101,6 script Notice 722,{
+yuno,48,101,6 script Notice GUILD_FLAG,{
mes "^FF0000[ Treasure Hunter Guild House ]^000000";
mes " ";
mes "Welcome to the Treasure Hunter's Guild House.";
@@ -24,7 +24,7 @@ yuno,48,101,6 script Notice 722,{
close;
}
//Saver Girl;
-yuno_in01,32,178,3 script Ahlma 94,{
+yuno_in01,32,178,3 script Ahlma 4_F_MAID,{
mes "[Ahlma]";
if (Event_THQS == 0) goto N_Member;
mes "Welcome to The Treasure Hunter Guild.";
@@ -44,7 +44,7 @@ N_Member:
close;
}
//Retired Smile mask girl;
-yuno_in01,33,162,3 script Smile Helper 92,{
+yuno_in01,33,162,3 script Smile Helper 4_F_03,{
mes "[Smile Gal]";
mes "Oh man...I am so sick of";
mes "trading Mr. Smile masks for crap.";
@@ -53,7 +53,7 @@ yuno_in01,33,162,3 script Smile Helper 92,{
close;
}
//Usless Female Assasin;
-yuno_in01,22,162,6 script Female Assasin 725,{
+yuno_in01,22,162,6 script Female Assasin 4_F_JOB_ASSASSIN,{
mes "[Sharlet]";
if (Event_THQS > 0) goto N_Member;
mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!";
@@ -74,7 +74,7 @@ N_Chat2:
close;
}
//another usless member
-yuno_in01,25,162,6 script Female Wizard 123,{
+yuno_in01,25,162,6 script Female Wizard 2_F_MAGICMASTER,{
mes "[Sasha]";
if (Event_THQS > 0) goto N_Member;
mes "Umm sorry I'm not gona waste my time talking to you if you arn't even a member!";
diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt
index 0e13645b7..a49c92ed3 100644
--- a/npc/custom/quests/thq/THQS_GuildNPC.txt
+++ b/npc/custom/quests/thq/THQS_GuildNPC.txt
@@ -11,7 +11,7 @@
//= #Treasure_Token - used to keep track of tokens
//============================================================
-yuno_in01,124,164,6 script Guild Leader 108,{
+yuno_in01,124,164,6 script Guild Leader 1_M_PRON_KING,{
mes "[Keegan]";
mes "What brings you here? Have something to say?";
next;
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 0bd234be2..b89279aec 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -16,7 +16,7 @@
//= 1.4 Fixed typos. (bugreport:2607) [Kisuka]
//============================================================
-yuno_in01,112,151,6 script Quest Manager 62,{
+yuno_in01,112,151,6 script Quest Manager 1_M_SIZ,{
mes "[Guy]";
mes "Welcome to the Treasure Hunters Guild "+strcharinfo(0)+".";
next;
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt
index 114a6bea5..40e89c18b 100644
--- a/npc/custom/quests/thq/THQS_Quests.txt
+++ b/npc/custom/quests/thq/THQS_Quests.txt
@@ -19,7 +19,7 @@
///////Job list 1///////
//1-1
-mjolnir_09,187,189,6 script Old Man 107,{
+mjolnir_09,187,189,6 script Old Man 1_M_PAY_ELDER,{
if (one_qset==1) goto N_QuestStart;
mes "[Old Man]";
mes "Eh! Can't and old man walk in peace anymore?!";
@@ -37,7 +37,7 @@ N_QuestStart:
close;
}
//1-2;
-pay_arche,86,129,6 script Archer 732,{
+pay_arche,86,129,6 script Archer 4_M_JOB_HUNTER,{
if (one_qset == 2) goto N_QuestStart;
mes "[Kieth]";
mes "Sorry can't talk, I'm a busy man, I'm waiting for my package.";
@@ -58,7 +58,7 @@ N_QuestStart:
close;
}
//1-3
-prt_fild06,37,192,6 script Farmer 125,{
+prt_fild06,37,192,6 script Farmer 4_M_TELEPORTER,{
if (one_qset == 3 && countitem(909) > 19 && countitem(955) > 19 && countitem(914) > 19 && countitem(705) > 19) goto N_QuestComp;
if (one_qset==3) goto N_QuestStart;
mes "[Billy-Bob]";
@@ -85,7 +85,7 @@ N_QuestStart:
close;
}
//1-4
-prontera,264,353,6 script Old Lady#thq 103,{
+prontera,264,353,6 script Old Lady#thq 8_F_GRANDMOTHER,{
if (one_qset == 4 && countitem(934) > 14) goto N_QuestComp;
if (one_qset == 4) goto N_QuestStart;
mes "[Old Lady]";
@@ -114,7 +114,7 @@ N_QuestStart:
}
///////Job list 2///////
//2-1;
-morocc,59,109,6 script Erika 700,{
+morocc,59,109,6 script Erika 8_F_GIRL,{
if (two_qset == 1 && countitem(1072) > 0) goto N_QuestComp;
if (two_qset == 1) goto N_QuestStart;
mes "[Erika]";
@@ -149,7 +149,7 @@ N_QuestStart:
close;
}
//2-2;
-in_moc_16,15,30,6 script Jeramiah 730,{
+in_moc_16,15,30,6 script Jeramiah 4_M_JOB_ASSASSIN,{
if (two_qset == 2 && countitem(1998) > 0) goto N_QuestComp;
if (two_qset == 2) goto N_QuestStart;
mes "[Jeramiah]";
@@ -172,7 +172,7 @@ N_QuestStart:
close;
}
//2-3;
-prt_fild07,316,263,6 script Marsh Man 84,{
+prt_fild07,316,263,6 script Marsh Man 4_M_02,{
if (two_qset == 3 && countitem(518) > 19) goto N_QuestComp;
if (two_qset == 3) goto N_QuestStart;
mes "[Lenith]";
@@ -197,7 +197,7 @@ N_QuestStart:
close;
}
//2-4;
-payon,161,72,6 script Molly 714,{
+payon,161,72,6 script Molly 4_F_06,{
if (two_qset == 4 && countitem(7005) > 0) goto N_QuestComp;
if (two_qset == 4) goto N_QuestStart;
mes "[Molly]";
@@ -227,7 +227,7 @@ N_QuestStart:
}
///////Job list 3///////
//3-1;
-moc_fild04,208,322,6 script Clark 65,{
+moc_fild04,208,322,6 script Clark 1_M_YOUNGKNIGHT,{
if (three_qset == 1 && countitem(1040) > 29) goto N_QuestComp;
if (three_qset == 1) goto N_QuestStart;
mes "[Clark]";
@@ -256,7 +256,7 @@ N_QuestStart:
close;
}
//3-2;
-yuno_fild01,186,162,6 script Flank 73,{
+yuno_fild01,186,162,6 script Flank 1_F_MERCHANT_01,{
if (three_qset == 2 && countitem(1082) > 0) goto N_QuestComp;
if (three_qset == 2) goto N_QuestStart;
mes "[Flank]";
@@ -281,7 +281,7 @@ N_QuestStart:
close;
}
//3-3 Goes to 7-3 using callfunc
-prt_sewb1,120,245,6 script Sewer Managment Knight 705,{
+prt_sewb1,120,245,6 script Sewer Managment Knight 4_M_GEF_SOLDIER,{
if (three_qset == 3 && countitem(955) > 149) goto N_QuestComp;
if (three_qset == 3) goto N_QuestStart;
if (seven_qset == 3) goto N_QuestStart2;
@@ -309,7 +309,7 @@ N_QuestStart2:
close;
}
//3-4
-mjolnir_02,87,357,6 script Man#01 51,{
+mjolnir_02,87,357,6 script Man#01 1_M_BARD,{
if (three_qset == 4 && countitem(1041) > 49) goto N_QuestComp;
if (three_qset == 4) goto N_QuestStart;
mes "[Rudolfo]";
@@ -337,7 +337,7 @@ N_QuestStart:
}
///////Job list 4///////
//4-1;
-pay_arche,45,138,6 script Flora 724,{
+pay_arche,45,138,6 script Flora 4_F_07,{
if (four_qset == 1 && countitem(957) > 49) goto N_QuestComp;
if (four_qset == 1) goto N_QuestStart;
mes "[Flora]";
@@ -371,7 +371,7 @@ OnMobDead:
end;
}
//4-2;
-yuno,45,138,6 script Zed 735,{
+yuno,45,138,6 script Zed 4_M_JOB_WIZARD,{
if (four_qset == 2 && countitem(1999) > 0) goto N_QuestComp;
if (four_qset == 2) goto N_QuestStart;
mes "[Zed]";
@@ -396,7 +396,7 @@ N_QuestStart:
close;
}
//4-3;
-prontera,176,204,6 script Dassy 95,{
+prontera,176,204,6 script Dassy 4_F_SISTER,{
if (four_qset == 3 && countitem(711) > 19) goto N_QuestComp;
if (four_qset == 3) goto N_QuestStart;
mes "[Dassy]";
@@ -422,7 +422,7 @@ N_QuestStart:
close;
}
//4-4;
-prt_gld,157,99,6 script Czhore 752,{
+prt_gld,157,99,6 script Czhore 4_M_CRU_OLD,{
if (four_qset == 4 && countitem(714) > 0) goto N_QuestComp;
if (four_qset == 4) goto N_QuestStart;
mes "[Czhore]";
@@ -455,7 +455,7 @@ N_QuestStart:
}
///////Job list 5///////
//5-1;
-prt_maze01,18,184,6 script Lithin#01 752,{
+prt_maze01,18,184,6 script Lithin#01 4_M_CRU_OLD,{
if (five_qset == 1 && countitem(1028) > 14) goto N_QuestComp;
if (five_qset == 1) goto N_QuestStart;
mes "[Lithin]";
@@ -482,7 +482,7 @@ N_QuestStart:
close;
}
//5-2 goes to 6-2 using callfunc;
-moc_ruins,75,167,6 script Lithin#02 87,{
+moc_ruins,75,167,6 script Lithin#02 4_M_BARBER,{
if (five_qset == 2 && countitem(932) > 29) goto N_QuestComp;
if (five_qset == 2) goto N_QuestStart;
if (six_qset == 2) goto N_QuestStart2;
@@ -510,7 +510,7 @@ N_QuestStart2:
callfunc "six_qset2";
}
//5-3;
-geffen,57,130,6 script Blonde Girl 724,{
+geffen,57,130,6 script Blonde Girl 4_F_07,{
if (five_qset == 3 && countitem(744) > 0) goto N_QuestComp;
if (five_qset == 3) goto N_QuestStart;
mes "[Blonde Girl]";
@@ -534,7 +534,7 @@ N_QuestStart:
close;
}
//5-4;
-gef_tower,49,27,6 script Wizard#01 735,{
+gef_tower,49,27,6 script Wizard#01 4_M_JOB_WIZARD,{
if (five_qset == 4 && countitem(1059) > 49) goto N_QuestComp;
if (five_qset == 4) goto N_QuestStart;
mes "[Wizard]";
@@ -562,7 +562,7 @@ N_QuestStart:
}
///////Job list 6///////
//6-1;
-moc_prydb1,47,132,6 script Thief 48,{
+moc_prydb1,47,132,6 script Thief 1_M_02,{
if (six_qset == 1 && countitem(1083) > 0) goto N_QuestComp;
if (six_qset == 1) goto N_QuestStart;
mes "[Thief]";
@@ -608,7 +608,7 @@ N_QuestComp2:
close;
}
//6-3;
-xmas,144,136,6 script Chirach 48,{
+xmas,144,136,6 script Chirach 1_M_02,{
if (six_qset == 3 && countitem(1083) > 0) goto N_QuestComp;
if (six_qset == 3) goto N_QuestStart;
mes "[Chirach]";
@@ -631,7 +631,7 @@ N_QuestStart:
close;
}
//6-4;
-gef_tower,52,87,6 script Wizard#02 735,{
+gef_tower,52,87,6 script Wizard#02 4_M_JOB_WIZARD,{
if (six_qset == 4 && countitem(944) > 19) goto N_QuestComp;
if (six_qset == 4) goto N_QuestStart;
mes "[Zuuzuu]";
@@ -663,7 +663,7 @@ N_QuestStart:
}
///////Job list 7///////
//7-1 goes to 8-1 using callfunc;
-prontera,123,208,6 script Little Girl#thq 717,{
+prontera,123,208,6 script Little Girl#thq 4_F_KID3,{
if (seven_qset == 1 && countitem(531) > 4) goto N_QuestComp;
if (seven_qset == 1) goto N_QuestStart;
if (eight_qset == 1) goto N_QuestStart2;
@@ -690,7 +690,7 @@ N_QuestStart2:
callfunc "eight_qset1";
}
//7-2;
-alberta,101,84,6 script Charles 48,{
+alberta,101,84,6 script Charles 1_M_02,{
if (seven_qset == 2 && countitem(1082) > 0) goto N_QuestComp;
if (seven_qset == 2) goto N_QuestStart;
mes "[Charles]";
@@ -733,7 +733,7 @@ N_QuestComp2:
close;
}
//7-4;
-alb2trea,94,102,6 script Scarlet 725,{
+alb2trea,94,102,6 script Scarlet 4_F_JOB_ASSASSIN,{
if (seven_qset == 4 && countitem(1127) > 0) goto N_QuestComp;
if (seven_qset == 4) goto N_QuestStart;
mes "[Scarlet]";
@@ -778,7 +778,7 @@ N_QuestComp2:
close;
}
//8-2;
-morocc,165,55,6 script Klye 48,{
+morocc,165,55,6 script Klye 1_M_02,{
if (eight_qset == 2 && countitem(1081) > 0) goto N_QuestComp;
if (eight_qset == 2) goto N_QuestStart;
mes "[Klye]";
@@ -802,7 +802,7 @@ N_QuestStart:
}
//8-3;
-prt_maze02,103,86,6 script Zack 751,{
+prt_maze02,103,86,6 script Zack 4_M_CRU,{
if (eight_qset == 3 && countitem(923) > 0) goto N_QuestComp;
if (eight_qset == 3) goto N_QuestStart;
mes "[Zack]";
@@ -828,7 +828,7 @@ N_QuestStart:
close;
}
//8-4;
-payon,136,129,6 script Flower 703,{
+payon,136,129,6 script Flower 4_F_KID2,{
if (eight_qset == 4 && countitem(746) > 9) goto N_QuestComp;
if (eight_qset == 4) goto N_QuestStart;
mes "[Flower]";
@@ -854,7 +854,7 @@ N_QuestStart:
}
///////Job list 9///////
//9-1;
-geffen_in,168,124,6 script Mage 48,{
+geffen_in,168,124,6 script Mage 1_M_02,{
if (nine_qset == 1 && countitem(1082) > 0) goto N_QuestComp;
if (nine_qset == 1) goto N_QuestStart;
mes "[Mage]";
@@ -877,7 +877,7 @@ N_QuestStart:
close;
}
//9-2;
-pay_arche,98,74,6 script School Girl 703,{
+pay_arche,98,74,6 script School Girl 4_F_KID2,{
if (nine_qset == 2 && countitem(1020) > 19) goto N_QuestComp;
if (nine_qset == 2) goto N_QuestStart;
mes "[School Girl]";
@@ -905,7 +905,7 @@ N_QuestStart:
close;
}
//9-3
-payon_in02,19,33,6 script Jack 740,{
+payon_in02,19,33,6 script Jack 2_M_ALCHE,{
if (nine_qset == 3 && countitem(1022) > 0) goto N_QuestComp;
if (nine_qset == 3) goto N_QuestStart;
if (nine_qset == 4) goto N_QuestStart2;
@@ -951,7 +951,7 @@ N_QuestComp2:
}
///////Job list 10///////
//10-1
-morocc,193,51,6 script Kreg 48,{
+morocc,193,51,6 script Kreg 1_M_02,{
if (ten_qset == 1 && countitem(1082) > 0) goto N_QuestComp;
if (ten_qset == 1) goto N_QuestStart;
mes "[Kreg]";
@@ -974,7 +974,7 @@ N_QuestStart:
close;
}
//10-2;
-pay_fild10,145,252,6 script Man#02 122,{
+pay_fild10,145,252,6 script Man#02 2_M_DYEINGER,{
if (ten_qset == 2 && countitem(1029) > 0) goto N_QuestComp;
if (ten_qset == 2) goto N_QuestStart;
mes "[Man]";
@@ -999,7 +999,7 @@ N_QuestStart:
close;
}
//10-3;
-cmd_fild08,328,349,4 script Caral 119,{
+cmd_fild08,328,349,4 script Caral 2_M_SWORDMASTER,{
if (ten_qset == 3 && countitem(1015) > 0) goto N_QuestComp;
if (ten_qset == 3) goto N_QuestStart;
mes "[Caral]";
@@ -1024,7 +1024,7 @@ N_QuestStart:
close;
}
//10-4
-moc_fild15,250,251,6 script Jeni 727,{
+moc_fild15,250,251,6 script Jeni 4_F_JOB_HUNTER,{
if (ten_qset == 4 && countitem(1096) > 0) goto N_QuestComp;
if (ten_qset == 4) goto N_QuestStart;
mes "[Jeni]";
diff --git a/npc/custom/quests/thq/THQS_TTShop.txt b/npc/custom/quests/thq/THQS_TTShop.txt
index 39038671e..c764de852 100644
--- a/npc/custom/quests/thq/THQS_TTShop.txt
+++ b/npc/custom/quests/thq/THQS_TTShop.txt
@@ -16,7 +16,7 @@
prt_in,159,172,0 warp thqwrp 3,3,yuno_in01,123,155
-prt_in,164,174,1 script Treasure Hunter's Shop 65,{
+prt_in,164,174,1 script Treasure Hunter's Shop 1_M_YOUNGKNIGHT,{
mes "[Ash]";
mes "Ahh, "+strcharinfo(0)+"! Welcome to the Offical Treasure Hunter's Guild Shop.";
mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!";
diff --git a/npc/custom/quests/umbalian_language.txt b/npc/custom/quests/umbalian_language.txt
index 6552f2b78..70ae07d28 100644
--- a/npc/custom/quests/umbalian_language.txt
+++ b/npc/custom/quests/umbalian_language.txt
@@ -8,7 +8,7 @@
//= 1.1 Removed it from offical Umbala Quests [Lupus]
//============================================================
-prontera,145,290,5 script Mason 742,{
+prontera,145,290,5 script Mason 2_M_SAGE_B,{
mes "[Mason]";
if(umb_lang==0) goto L_NOT_GOT_QUEST;
if(umb_lang==2 || umb_mason==1) goto L_AGAIN;
@@ -89,7 +89,7 @@ M_NO:
close;
}
-aldebaran,153,212,1 script Mojo 740,{
+aldebaran,153,212,1 script Mojo 2_M_ALCHE,{
mes "[Mojo]";
if(umb_lang!=1) goto L_NOT_GOT_QUEST;
mes "Oh no! I lost my teacher's ^FF0000old magic book^000000!";
@@ -102,7 +102,7 @@ L_NOT_GOT_QUEST:
close;
}
-amatsu,267,189,4 script Marie 744,{
+amatsu,267,189,4 script Marie 4_F_ALCHE,{
mes "[Marie]";
if(umb_lang==0) goto L_NOT_GOT_QUEST;
if(umb_lang==2 || umb_marie==1) goto L_AGAIN;
@@ -152,7 +152,7 @@ L_AGAIN:
close;
}
-yuno,157,366,2 script Wise Man Fabius 743,{
+yuno,157,366,2 script Wise Man Fabius 2_M_SAGE_OLD,{
mes "[Fabius]";
if(event_umbala >= 3) set umb_lang,2; //You already learnt Umbalian language from Umbalian Chief. So this Quest is disabled
if(umb_lang<2) goto L_QUEST;
diff --git a/npc/custom/quests/valhallen.txt b/npc/custom/quests/valhallen.txt
index b32b03acf..bb84e73e5 100644
--- a/npc/custom/quests/valhallen.txt
+++ b/npc/custom/quests/valhallen.txt
@@ -11,7 +11,7 @@
//= 1.1 Optimized. [Euphy]
//============================================================
-prontera,147,171,5 script Lenneth 811,{
+prontera,147,171,5 script Lenneth 4_F_VALKYRIE,{
mes "[Lenneth]";
mes "I come from Valhalla to aid you.";
mes "I can transmute for you many of the Valhallen items,";
diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt
index cbb633e6a..757f0da66 100644
--- a/npc/custom/resetnpc.txt
+++ b/npc/custom/resetnpc.txt
@@ -13,7 +13,7 @@
//= 1.3 All statuses removed upon skill reset. [Euphy]
//============================================================
-prontera,150,193,4 script Reset Girl 124,{
+prontera,150,193,4 script Reset Girl 4_F_TELEPORTER,{
set .@ResetStat,5000; // Zeny for stat reset
set .@ResetSkill,5000; // Zeny for skill reset
diff --git a/npc/custom/stylist.txt b/npc/custom/stylist.txt
index 23f65b22d..387c876c2 100644
--- a/npc/custom/stylist.txt
+++ b/npc/custom/stylist.txt
@@ -10,7 +10,7 @@
//= 1.1 Switched to 'getbattleflag', credits to Saithis. [Euphy]
//============================================================
-prontera,170,180,1 script Stylist#custom_stylist 122,{
+prontera,170,180,1 script Stylist#custom_stylist 2_M_DYEINGER,{
setarray .@Styles[1],getbattleflag("max_cloth_color"),getbattleflag("max_hair_style"),getbattleflag("max_hair_color");
setarray .@Look[1],7,1,6;
diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt
index 7c2b3b75e..b2cabd1fc 100644
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -445,51 +445,51 @@ S8: Go("turbo_room",99,114);
// --------------------------------------------------
// Duplicates:
// --------------------------------------------------
-alb2trea,57,70,6 duplicate(Warper) Warper#tre 811
-alberta,28,240,4 duplicate(Warper) Warper#alb 811
-aldebaran,145,118,4 duplicate(Warper) Warper#alde 811
-amatsu,203,87,4 duplicate(Warper) Warper#ama 811
-ayothaya,209,169,6 duplicate(Warper) Warper#ayo 811
-comodo,194,158,4 duplicate(Warper) Warper#com 811
-einbech,59,38,6 duplicate(Warper) Warper#einbe 811
-einbroch,69,202,4 duplicate(Warper) Warper#einbr 811
-gef_fild10,71,339,4 duplicate(Warper) Warper#orc 811
-geffen,124,72,4 duplicate(Warper) Warper#gef 811
-glast_01,372,308,4 duplicate(Warper) Warper#glh 811
-gonryun,162,122,4 duplicate(Warper) Warper#gon 811
-hugel,101,151,4 duplicate(Warper) Warper#hug 811
-izlu2dun,110,92,4 duplicate(Warper) Warper#izd 811
-izlude,132,120,4 duplicate(Warper) Warper#izl 811
-jawaii,253,138,4 duplicate(Warper) Warper#jaw 811
-lighthalzen,162,102,4 duplicate(Warper) Warper#lhz 811
-louyang,208,103,6 duplicate(Warper) Warper#lou 811
-manuk,274,146,6 duplicate(Warper) Warper#man 811
-mid_camp,216,288,4 duplicate(Warper) Warper#mid 811
-mjolnir_02,85,364,4 duplicate(Warper) Warper#mjo 811
-moc_ruins,64,164,4 duplicate(Warper) Warper#moc 811
-morocc,159,97,4 duplicate(Warper) Warper#mor 811
-moscovia,229,191,4 duplicate(Warper) Warper#mos 811
-nameless_n,259,213,4 duplicate(Warper) Warper#nam 811
-niflheim,205,179,4 duplicate(Warper) Warper#nif 811
-pay_arche,42,134,4 duplicate(Warper) Warper#arc 811
-payon,182,108,4 duplicate(Warper) Warper#pay 811
-prontera,159,192,4 duplicate(Warper) Warper#prt 811
-prt_fild05,279,223,6 duplicate(Warper) Warper#cul 811
-rachel,135,116,4 duplicate(Warper) Warper#rac 811
-splendide,205,153,4 duplicate(Warper) Warper#spl 811
-thor_camp,249,76,4 duplicate(Warper) Warper#thor 811
-umbala,106,150,3 duplicate(Warper) Warper#umb 811
-veins,214,123,4 duplicate(Warper) Warper#ve 811
-xmas,150,136,6 duplicate(Warper) Warper#xmas 811
-yuno,162,47,4 duplicate(Warper) Warper#yuno 811
+alb2trea,57,70,6 duplicate(Warper) Warper#tre 4_F_VALKYRIE
+alberta,28,240,4 duplicate(Warper) Warper#alb 4_F_VALKYRIE
+aldebaran,145,118,4 duplicate(Warper) Warper#alde 4_F_VALKYRIE
+amatsu,203,87,4 duplicate(Warper) Warper#ama 4_F_VALKYRIE
+ayothaya,209,169,6 duplicate(Warper) Warper#ayo 4_F_VALKYRIE
+comodo,194,158,4 duplicate(Warper) Warper#com 4_F_VALKYRIE
+einbech,59,38,6 duplicate(Warper) Warper#einbe 4_F_VALKYRIE
+einbroch,69,202,4 duplicate(Warper) Warper#einbr 4_F_VALKYRIE
+gef_fild10,71,339,4 duplicate(Warper) Warper#orc 4_F_VALKYRIE
+geffen,124,72,4 duplicate(Warper) Warper#gef 4_F_VALKYRIE
+glast_01,372,308,4 duplicate(Warper) Warper#glh 4_F_VALKYRIE
+gonryun,162,122,4 duplicate(Warper) Warper#gon 4_F_VALKYRIE
+hugel,101,151,4 duplicate(Warper) Warper#hug 4_F_VALKYRIE
+izlu2dun,110,92,4 duplicate(Warper) Warper#izd 4_F_VALKYRIE
+izlude,132,120,4 duplicate(Warper) Warper#izl 4_F_VALKYRIE
+jawaii,253,138,4 duplicate(Warper) Warper#jaw 4_F_VALKYRIE
+lighthalzen,162,102,4 duplicate(Warper) Warper#lhz 4_F_VALKYRIE
+louyang,208,103,6 duplicate(Warper) Warper#lou 4_F_VALKYRIE
+manuk,274,146,6 duplicate(Warper) Warper#man 4_F_VALKYRIE
+mid_camp,216,288,4 duplicate(Warper) Warper#mid 4_F_VALKYRIE
+mjolnir_02,85,364,4 duplicate(Warper) Warper#mjo 4_F_VALKYRIE
+moc_ruins,64,164,4 duplicate(Warper) Warper#moc 4_F_VALKYRIE
+morocc,159,97,4 duplicate(Warper) Warper#mor 4_F_VALKYRIE
+moscovia,229,191,4 duplicate(Warper) Warper#mos 4_F_VALKYRIE
+nameless_n,259,213,4 duplicate(Warper) Warper#nam 4_F_VALKYRIE
+niflheim,205,179,4 duplicate(Warper) Warper#nif 4_F_VALKYRIE
+pay_arche,42,134,4 duplicate(Warper) Warper#arc 4_F_VALKYRIE
+payon,182,108,4 duplicate(Warper) Warper#pay 4_F_VALKYRIE
+prontera,159,192,4 duplicate(Warper) Warper#prt 4_F_VALKYRIE
+prt_fild05,279,223,6 duplicate(Warper) Warper#cul 4_F_VALKYRIE
+rachel,135,116,4 duplicate(Warper) Warper#rac 4_F_VALKYRIE
+splendide,205,153,4 duplicate(Warper) Warper#spl 4_F_VALKYRIE
+thor_camp,249,76,4 duplicate(Warper) Warper#thor 4_F_VALKYRIE
+umbala,106,150,3 duplicate(Warper) Warper#umb 4_F_VALKYRIE
+veins,214,123,4 duplicate(Warper) Warper#ve 4_F_VALKYRIE
+xmas,150,136,6 duplicate(Warper) Warper#xmas 4_F_VALKYRIE
+yuno,162,47,4 duplicate(Warper) Warper#yuno 4_F_VALKYRIE
// --------------------------------------------------
// Duplicates (Renewal):
// --------------------------------------------------
-brasilis,201,222,4 duplicate(Warper) Warper#bra 811
-dewata,204,186,6 duplicate(Warper) Warper#dew 811
-dicastes01,194,194,6 duplicate(Warper) Warper#dic 811
-ecl_in01,51,60,4 duplicate(Warper) Warper#ecl 811
-malangdo,134,117,6 duplicate(Warper) Warper#mal 811
-malaya,210,205,4 duplicate(Warper) Warper#ma 811
-mora,57,152,4 duplicate(Warper) Warper#mora 811
+brasilis,201,222,4 duplicate(Warper) Warper#bra 4_F_VALKYRIE
+dewata,204,186,6 duplicate(Warper) Warper#dew 4_F_VALKYRIE
+dicastes01,194,194,6 duplicate(Warper) Warper#dic 4_F_VALKYRIE
+ecl_in01,51,60,4 duplicate(Warper) Warper#ecl 4_F_VALKYRIE
+malangdo,134,117,6 duplicate(Warper) Warper#mal 4_F_VALKYRIE
+malaya,210,205,4 duplicate(Warper) Warper#ma 4_F_VALKYRIE
+mora,57,152,4 duplicate(Warper) Warper#mora 4_F_VALKYRIE
diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index e5fa84fa1..74faa45e0 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -17,7 +17,7 @@
// Information NPC
//============================================================
-prontera,149,193,4 script WOE Information 835,{
+prontera,149,193,4 script WOE Information 2_BOARD1,{
doevent "WOE_CONTROL::OnMenu";
end;
OnAgitStart:
diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt
index 684649917..2b60a8a82 100644
--- a/npc/events/MemorialDay_2008.txt
+++ b/npc/events/MemorialDay_2008.txt
@@ -14,7 +14,7 @@
// Lauds
//============================================================
-prontera,182,214,4 script Lauds#Memorial 58,{
+prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{
if (Memorial08 < 1) {
mes "[Mad Sago Lauds]";
mes "Hey, yo!";
@@ -194,7 +194,7 @@ prontera,182,214,4 script Lauds#Memorial 58,{
// Memorial Plaque
//============================================================
-prontera,153,286,4 script Memorial Plaque#Memorial 857,{
+prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{
if (Memorial08 < 8) {
mes "[" + strcharinfo(0) + "]";
mes "- It's a dusty old plaque.-";
@@ -251,7 +251,7 @@ prontera,153,286,4 script Memorial Plaque#Memorial 857,{
// Grast
//============================================================
-prontera,150,270,4 script Grast#Memorial 900,{
+prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{
if (Memorial08 < 3) {
mes "[Grast]";
mes "Memorial Day is a sad and yet glorious day.";
diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt
index 4f46020a8..992bd7bd3 100644
--- a/npc/events/RWC_2011.txt
+++ b/npc/events/RWC_2011.txt
@@ -12,7 +12,7 @@
//= 1.0 First Version. [Euphy]
//============================================================
-prontera,114,81,5 script RWC2011 Agent#2 407,{
+prontera,114,81,5 script RWC2011 Agent#2 4_M_ATEIL,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
mes "[New Agent]";
mes "You have too many items. Please make room in your inventory and come back.";
diff --git a/npc/events/RWC_2012.txt b/npc/events/RWC_2012.txt
index 3c2fdfe8f..33e3cec84 100644
--- a/npc/events/RWC_2012.txt
+++ b/npc/events/RWC_2012.txt
@@ -11,7 +11,7 @@
//= 1.0 First Version. [Euphy]
//============================================================
-prontera,147,61,3 script Driller#pron 87,{
+prontera,147,61,3 script Driller#pron 4_M_BARBER,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "You're carrying too many items in your inventory. Visit Kafra storage and try again.";
@@ -80,7 +80,7 @@ prontera,147,61,3 script Driller#pron 87,{
}
}
-prontera,147,59,3 script Goldberg#pron 878,{
+prontera,147,59,3 script Goldberg#pron 4_M_OILMAN,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "You are carrying too many items. Come back after you have organized your inventory.";
diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt
index 02e583ee6..92408c54a 100644
--- a/npc/events/StPatrick_2008.txt
+++ b/npc/events/StPatrick_2008.txt
@@ -30,7 +30,7 @@
//= 1.5 Revamped the script. [Kisuka]
//============================================================
-prt_fild05,170,286,4 script Anxious Leprechaun#8pday 954,{
+prt_fild05,170,286,4 script Anxious Leprechaun#8pday 4_M_PATRICK,{
if (StPatrick2008 < 1) {
mes "[O'Riley the Leprechaun]";
mes "Hmm...";
diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt
index 7211ebaa1..70f4fc21c 100644
--- a/npc/events/bossnia.txt
+++ b/npc/events/bossnia.txt
@@ -14,7 +14,7 @@
// Entrance NPCs
//============================================================
-prontera,132,125,4 script Bossnia Staff#1 908,{
+prontera,132,125,4 script Bossnia Staff#1 4_M_PHILMAN,{
mes "[Riss]";
mes "Hello?";
mes "I found some beautiful places";
@@ -81,11 +81,11 @@ prontera,132,125,4 script Bossnia Staff#1 908,{
mes "Come back when you have at least 5,000 zeny.";
close;
}
-geffen,124,169,4 duplicate(Bossnia Staff#1) Bossnia Staff#2 908
-payon,165,150,4 duplicate(Bossnia Staff#1) Bossnia Staff#3 908
-morocc,142,100,4 duplicate(Bossnia Staff#1) Bossnia Staff#4 908
-lighthalzen,203,140,4 duplicate(Bossnia Staff#1) Bossnia Staff#5 908
-rachel,132,144,4 duplicate(Bossnia Staff#1) Bossnia Staff#6 908
+geffen,124,169,4 duplicate(Bossnia Staff#1) Bossnia Staff#2 4_M_PHILMAN
+payon,165,150,4 duplicate(Bossnia Staff#1) Bossnia Staff#3 4_M_PHILMAN
+morocc,142,100,4 duplicate(Bossnia Staff#1) Bossnia Staff#4 4_M_PHILMAN
+lighthalzen,203,140,4 duplicate(Bossnia Staff#1) Bossnia Staff#5 4_M_PHILMAN
+rachel,132,144,4 duplicate(Bossnia Staff#1) Bossnia Staff#6 4_M_PHILMAN
// Warp Portals
//============================================================
diff --git a/npc/events/children_week.txt b/npc/events/children_week.txt
index ab834da51..48e9231d6 100644
--- a/npc/events/children_week.txt
+++ b/npc/events/children_week.txt
@@ -11,7 +11,7 @@
//= 1.1 First Beta. [Samuray22]
//============================================================
-prontera,146,91,5 script Pandit chacha#child07 61,{
+prontera,146,91,5 script Pandit chacha#child07 1_M_PUBMASTER,{
if (BaseLevel > 50) {
mes "[Pandit chacha]";
mes "Hahaha~";
diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index 5b8af009b..5236e5a54 100644
--- a/npc/events/christmas_2005.txt
+++ b/npc/events/christmas_2005.txt
@@ -24,7 +24,7 @@
//============================================================
// Louise's Santa Hat (Event 1)
-xmas_in,89,92,5 script Louise Kim#designer 714,{
+xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{
mes "[Designer Louise Kim]";
mes "Cone shaped red Santa hat is too ordinary.";
mes "It's old fashioned.";
@@ -189,7 +189,7 @@ xmas_in,89,92,5 script Louise Kim#designer 714,{
}
// Enjoy Happymerry Chistmas Event (Event 2)
-prontera,155,285,3 script Enjoy#enjoy 753,{
+prontera,155,285,3 script Enjoy#enjoy 4_M_MONK,{
if (!christ_solo05){
mes "[Enjoy]";
mes "Oh~~~";
@@ -506,7 +506,7 @@ OnTimer180000:
end;
}
-prontera,150,286,5 script Happymerry#happymerry02 869,{
+prontera,150,286,5 script Happymerry#happymerry02 4_M_LGTMAN,{
end;
OnInit:
@@ -535,7 +535,7 @@ OnTimer60000:
end;
}
-prontera,161,286,4 script Christ#christ02 875,{
+prontera,161,286,4 script Christ#christ02 4_M_PECOKNIGHT,{
end;
OnInit:
disablenpc "Christ#christ02";
@@ -552,7 +552,7 @@ OnCommandOff:
end;
}
-prontera,161,281,1 script Mas#mas02 748,{
+prontera,161,281,1 script Mas#mas02 4_M_ALCHE_A,{
end;
OnInit:
disablenpc "Mas#mas02";
@@ -569,7 +569,7 @@ OnCommandOff:
end;
}
-prontera,150,281,7 script Event#event02 881,{
+prontera,150,281,7 script Event#event02 4_M_SITDOWN,{
end;
OnInit:
disablenpc "Event#event02";
@@ -586,7 +586,7 @@ OnCommandOff:
end;
}
-prontera,188,177,4 script Happymerry#happymerry 869,{
+prontera,188,177,4 script Happymerry#happymerry 4_M_LGTMAN,{
if (christ_solo05==1) {
mes "[Happymerry]";
mes "Holgren~~!!";
@@ -666,7 +666,7 @@ prontera,188,177,4 script Happymerry#happymerry 869,{
}
}
-prontera,62,339,3 script Christ#christ 875,{
+prontera,62,339,3 script Christ#christ 4_M_PECOKNIGHT,{
if (christ_solo05 == 2) {
mes "[Christ]";
mes "Now~finally!!!";
@@ -754,7 +754,7 @@ prontera,62,339,3 script Christ#christ 875,{
}
}
-prontera,163,66,7 script Mas#mas 748,{
+prontera,163,66,7 script Mas#mas 4_M_ALCHE_A,{
if (christ_solo05 == 3) {
mes "[Mas]";
mes "Herds!!!!!How long does it take!";
@@ -836,7 +836,7 @@ prontera,163,66,7 script Mas#mas 748,{
}
}
-prontera,35,209,5 script Event#event 881,{
+prontera,35,209,5 script Event#event 4_M_SITDOWN,{
if (christ_solo05 == 4) {
mes "[Event]";
mes "........................";
@@ -933,7 +933,7 @@ prontera,35,209,5 script Event#event 881,{
}
// Oholy (Event 3)
-prontera,156,242,0 script Oholy#pron::OholyDup 79,{
+prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{
if (!christ_carol05) {
mes "[Oholy]";
mes "Joy to the world!";
@@ -1538,7 +1538,7 @@ function script F_carol_devi2 {
end;
}
-prontera,94,297,3 script Deviruchi#pron_01 738,3,3,{
+prontera,94,297,3 script Deviruchi#pron_01 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","prontera",155,230);
end;
@@ -1547,7 +1547,7 @@ OnTouch:
end;
}
-prontera,205,242,3 script Deviruchi#pron_02 738,3,3,{
+prontera,205,242,3 script Deviruchi#pron_02 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","prontera",155,230);
end;
@@ -1556,7 +1556,7 @@ OnTouch:
end;
}
-prontera,126,118,3 script Deviruchi#pron_03 738,3,3,{
+prontera,126,118,3 script Deviruchi#pron_03 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","prontera",155,230);
end;
@@ -1566,8 +1566,8 @@ OnTouch:
}
// Payon
-payon,165,153,3 duplicate(OholyDup) Oholy#payon 79
-payon,142,203,3 script Deviruchi#payon_01 738,3,3,{
+payon,165,153,3 duplicate(OholyDup) Oholy#payon 1_F_PRIEST
+payon,142,203,3 script Deviruchi#payon_01 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","payon",166,60);
end;
@@ -1576,7 +1576,7 @@ OnTouch:
end;
}
-payon,248,239,3 script Deviruchi#payon_02 738,3,3,{
+payon,248,239,3 script Deviruchi#payon_02 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","payon",166,60);
end;
@@ -1585,7 +1585,7 @@ OnTouch:
end;
}
-payon,140,56,3 script Deviruchi#payon_03 738,3,3,{
+payon,140,56,3 script Deviruchi#payon_03 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","payon",166,60);
end;
@@ -1594,8 +1594,8 @@ OnTouch:
end;
}
-morocc,161,85,0 duplicate(OholyDup) Oholy#morocc 79
-morocc,52,134,3 script Deviruchi#morocc_01 738,3,3,{
+morocc,161,85,0 duplicate(OholyDup) Oholy#morocc 1_F_PRIEST
+morocc,52,134,3 script Deviruchi#morocc_01 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","morocc",160,51);
end;
@@ -1604,7 +1604,7 @@ OnTouch:
end;
}
-morocc,210,264,3 script Deviruchi#morocc_02 738,3,3,{
+morocc,210,264,3 script Deviruchi#morocc_02 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","morocc",160,51);
end;
@@ -1613,7 +1613,7 @@ OnTouch:
end;
}
-morocc,223,74,3 script Deviruchi#morocc_03 738,3,3,{
+morocc,223,74,3 script Deviruchi#morocc_03 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","morocc",160,51);
end;
@@ -1623,8 +1623,8 @@ OnTouch:
}
// Geffen
-geffen,120,188,0 duplicate(OholyDup) Oholy#geffen 79
-geffen,173,163,3 script Deviruchi#geffen_01 738,3,3,{
+geffen,120,188,0 duplicate(OholyDup) Oholy#geffen 1_F_PRIEST
+geffen,173,163,3 script Deviruchi#geffen_01 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","geffen",120,34);
end;
@@ -1633,7 +1633,7 @@ OnTouch:
end;
}
-geffen,49,95,3 script Deviruchi#geffen_02 738,3,3,{
+geffen,49,95,3 script Deviruchi#geffen_02 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","geffen",120,34);
end;
@@ -1642,7 +1642,7 @@ OnTouch:
end;
}
-geffen,111,101,3 script Deviruchi#geffen_03 738,3,3,{
+geffen,111,101,3 script Deviruchi#geffen_03 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","geffen",120,34);
end;
@@ -1652,8 +1652,8 @@ OnTouch:
}
// Alberta
-alberta,54,237,0 duplicate(OholyDup) Oholy#alberta 79
-alberta,97,86,3 script Deviruchi#alberta_01 738,3,3,{
+alberta,54,237,0 duplicate(OholyDup) Oholy#alberta 1_F_PRIEST
+alberta,97,86,3 script Deviruchi#alberta_01 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","alberta",28,235);
end;
@@ -1662,7 +1662,7 @@ OnTouch:
end;
}
-alberta,180,48,3 script Deviruchi#alberta_02 738,3,3,{
+alberta,180,48,3 script Deviruchi#alberta_02 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","alberta",28,235);
end;
@@ -1671,7 +1671,7 @@ OnTouch:
end;
}
-alberta,54,132,3 script Deviruchi#alberta_03 738,3,3,{
+alberta,54,132,3 script Deviruchi#alberta_03 4_DEVIRUCHI,3,3,{
callfunc("F_carol_devi2","alberta",28,235);
end;
diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt
index 5e9b26e86..11fd1dea1 100644
--- a/npc/events/christmas_2008.txt
+++ b/npc/events/christmas_2008.txt
@@ -18,7 +18,7 @@
// Caroller - Music Box
//============================================================
-prontera,226,306,4 script Caroller#iROxmas08 79,{
+prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{
if (iROxmas08carol < 1 || iROxmas08carol == 3) {
if (iROxmas08carol == 3) {
mes "[Caroller]";
@@ -434,7 +434,7 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
// Santa Claus - Card Game
//============================================================
-- script Santa Claus#iROxmas08::08santa 718,{
+- script Santa Claus#iROxmas08::08santa 4_M_SANTA,{
mes "[Santa Claus]";
mes "Wow! Were you naughty or nice this year?";
mes "All right, what comes to your mind when you think about Christmas?";
@@ -707,15 +707,15 @@ prontera,226,306,4 script Caroller#iROxmas08 79,{
}
}
-payon,171,109,4 duplicate(08santa) Santa Claus#0801 718
-prontera,156,285,4 duplicate(08santa) Santa Claus#0802 718
-alberta,117,66,4 duplicate(08santa) Santa Claus#0803 718
-geffen,119,70,4 duplicate(08santa) Santa Claus#0804 718
-morocc,158,104,4 duplicate(08santa) Santa Claus#0805 718
+payon,171,109,4 duplicate(08santa) Santa Claus#0801 4_M_SANTA
+prontera,156,285,4 duplicate(08santa) Santa Claus#0802 4_M_SANTA
+alberta,117,66,4 duplicate(08santa) Santa Claus#0803 4_M_SANTA
+geffen,119,70,4 duplicate(08santa) Santa Claus#0804 4_M_SANTA
+morocc,158,104,4 duplicate(08santa) Santa Claus#0805 4_M_SANTA
// Louise Kim - Santa Suit
//============================================================
-xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{
+xmas_in,89,92,4 script Louise Kim#iROxmas08 4_F_06,{
mes "[Louise Kim]";
mes "I always thought about how boring Santa Claus is wearing a too boring costume.";
mes "Too boring!";
diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt
index 44135389b..1c94548f9 100644
--- a/npc/events/dumplingfestival.txt
+++ b/npc/events/dumplingfestival.txt
@@ -11,7 +11,7 @@
//= 1.01 fixed bugs [Lupus]
//============================================================
-payon,93,81,4 script Exorcist Master Fahae 834,{
+payon,93,81,4 script Exorcist Master Fahae 4_M_BUDDHIST,{
mes "[Exorcist Master Fahae]";
mes "Greetings young warrior, I'm the Exorcist Master Fahae.";
diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt
index 92033782d..6b64df494 100644
--- a/npc/events/easter_2008.txt
+++ b/npc/events/easter_2008.txt
@@ -14,7 +14,7 @@
//============================================================
// Prontera
-prontera,111,99,5 script Egg Salesman#prt::EggVendor 98,{
+prontera,111,99,5 script Egg Salesman#prt::EggVendor 4W_M_02,{
mes "[Egg Salesman]";
mes "^FF0000Chicken Eggs^000000! Come and";
mes "buy as many Chicken Eggs";
@@ -138,7 +138,7 @@ prontera,111,99,5 script Egg Salesman#prt::EggVendor 98,{
}
}
-prontera,113,98,0 script Dowdy Matron#prt::EggMatron 701,{
+prontera,113,98,0 script Dowdy Matron#prt::EggMatron 4_F_GODEMOM,{
mes "[Dowdy Matron]";
mes "This festival is going";
mes "to be so much fun! Ooh!";
@@ -155,7 +155,7 @@ prontera,113,98,0 script Dowdy Matron#prt::EggMatron 701,{
close;
}
-prontera,108,96,5 script Cantankerous Geezer#prt::EggGeezer 709,{
+prontera,108,96,5 script Cantankerous Geezer#prt::EggGeezer 4_M_SEAMAN,{
mes "[Cantankerous Geezer]";
mes ".Hey, do you know how";
mes "Chicken Eggs got to be so";
@@ -179,27 +179,27 @@ prontera,108,96,5 script Cantankerous Geezer#prt::EggGeezer 709,{
}
// Payon
-payon,172,173,5 duplicate(EggVendor) Egg Salesman#pay 98
-payon,175,171,1 duplicate(EggMatron) Dowdy Matron#pay 701
-payon,170,171,5 duplicate(EggGeezer) Cantankerous Geezer#pay 709
+payon,172,173,5 duplicate(EggVendor) Egg Salesman#pay 4W_M_02
+payon,175,171,1 duplicate(EggMatron) Dowdy Matron#pay 4_F_GODEMOM
+payon,170,171,5 duplicate(EggGeezer) Cantankerous Geezer#pay 4_M_SEAMAN
// Geffen
-geffen,136,64,5 duplicate(EggVendor) Egg Salesman#gef 98
-geffen,138,63,1 duplicate(EggMatron) Dowdy Matron#gef 701
-geffen,133,63,5 duplicate(EggGeezer) Cantankerous Geezer#gef 709
+geffen,136,64,5 duplicate(EggVendor) Egg Salesman#gef 4W_M_02
+geffen,138,63,1 duplicate(EggMatron) Dowdy Matron#gef 4_F_GODEMOM
+geffen,133,63,5 duplicate(EggGeezer) Cantankerous Geezer#gef 4_M_SEAMAN
// Al De Baran
-aldebaran,133,119,5 duplicate(EggVendor) Egg Salesman#alde 98
-aldebaran,135,117,1 duplicate(EggMatron) Dowdy Matron#ald 701
-aldebaran,132,116,5 duplicate(EggGeezer) Cantankerous Geezer#ald 709
+aldebaran,133,119,5 duplicate(EggVendor) Egg Salesman#alde 4W_M_02
+aldebaran,135,117,1 duplicate(EggMatron) Dowdy Matron#ald 4_F_GODEMOM
+aldebaran,132,116,5 duplicate(EggGeezer) Cantankerous Geezer#ald 4_M_SEAMAN
// Alberta
-alberta,90,55,5 duplicate(EggVendor) Egg Salesman#alb 98
-alberta,92,53,1 duplicate(EggMatron) Dowdy Matron#alb 701
-alberta,88,52,5 duplicate(EggGeezer) Cantankerous Geezer#alb 709
+alberta,90,55,5 duplicate(EggVendor) Egg Salesman#alb 4W_M_02
+alberta,92,53,1 duplicate(EggMatron) Dowdy Matron#alb 4_F_GODEMOM
+alberta,88,52,5 duplicate(EggGeezer) Cantankerous Geezer#alb 4_M_SEAMAN
// Create Holy Eggs
-prontera,230,312,3 script Nerlen#es07 79,{
+prontera,230,312,3 script Nerlen#es07 1_F_PRIEST,{
mes "[Nerlen]";
mes "Hello! If you'd like,";
mes "I can take your Chicken";
@@ -312,7 +312,7 @@ prontera,230,312,3 script Nerlen#es07 79,{
}
// Easter Quest
-morocc,131,26,5 script Secret Corps#egg 880,{
+morocc,131,26,5 script Secret Corps#egg 4_M_MASKMAN,{
if (easter2008 == 1) {
mes "[Corps Member]";
mes "How are you doing?";
@@ -626,7 +626,7 @@ morocc,131,26,5 script Secret Corps#egg 880,{
}
}
-pay_dun00,22,127,0 script Trace#egg1 844,{
+pay_dun00,22,127,0 script Trace#egg1 CLEAR_NPC,{
if (easter2008 == 5) {
mes "[" + strcharinfo(0) + "]";
mes "Well...";
@@ -678,7 +678,7 @@ pay_dun00,22,127,0 script Trace#egg1 844,{
}
}
-iz_dun02,340,346,0 script Trace#egg 844,{
+iz_dun02,340,346,0 script Trace#egg CLEAR_NPC,{
if (easter2008 == 6) {
mes "[" + strcharinfo(0) + "]";
mes "Well...";
@@ -730,7 +730,7 @@ iz_dun02,340,346,0 script Trace#egg 844,{
}
}
-mjo_dun03,308,256,0 script Trace#egg2 844,{
+mjo_dun03,308,256,0 script Trace#egg2 CLEAR_NPC,{
if (easter2008 == 7) {
mes "[" + strcharinfo(0) + "]";
mes "Well...";
@@ -782,7 +782,7 @@ mjo_dun03,308,256,0 script Trace#egg2 844,{
}
}
-gl_prison,157,176,0 script Trace#egg3 844,{
+gl_prison,157,176,0 script Trace#egg3 CLEAR_NPC,{
if (easter2008 == 8) {
mes "[" + strcharinfo(0) + "]";
mes "Well...";
diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt
index b57963ad6..50a22aec8 100644
--- a/npc/events/easter_2010.txt
+++ b/npc/events/easter_2010.txt
@@ -10,7 +10,7 @@
//= 1.0 First version. [Euphy]
//============================================================
-prontera,202,297,3 script Rina#Easter 727,{
+prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{
disable_items;
if (BaseLevel < 40) {
mes "[Rina]";
@@ -293,7 +293,7 @@ prontera,202,297,3 script Rina#Easter 727,{
}
}
-geffen,207,114,4 script #Hiddne01Easter 844,{
+geffen,207,114,4 script #Hiddne01Easter CLEAR_NPC,{
if (oversea_event2 > 519) {
OnRelease:
specialeffect EF_PATTACK;
@@ -313,25 +313,25 @@ geffen,207,114,4 script #Hiddne01Easter 844,{
end;
}
-xmas,144,52,4 script #Hiddne02Easter 844,{
+xmas,144,52,4 script #Hiddne02Easter CLEAR_NPC,{
if (oversea_event3 > 269)
doevent "#Hiddne01Easter::OnRelease";
end;
}
-yuno,164,46,4 script #Hiddne03Easter 844,{
+yuno,164,46,4 script #Hiddne03Easter CLEAR_NPC,{
if (oversea_event6 > 244)
doevent "#Hiddne01Easter::OnRelease";
end;
}
-rachel,36,132,4 script #Hiddne04Easter 844,{
+rachel,36,132,4 script #Hiddne04Easter CLEAR_NPC,{
if (oversea_event9 > 196)
doevent "#Hiddne01Easter::OnRelease";
end;
}
-prontera,204,297,3 script Rina's Little Friend 463,{
+prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{
disable_items;
if (checkquest(9117) == -1) {
emotion e_swt2;
@@ -527,7 +527,7 @@ prontera,204,297,3 script Rina's Little Friend 463,{
close;
}
-prontera,116,82,5 script Traveler#01Easter 85,{
+prontera,116,82,5 script Traveler#01Easter 4_M_03,{
mes "[Traveler]";
mes "I'm a traveler";
mes "and I often visit ^8B4513Prontera^000000.";
@@ -588,7 +588,7 @@ OnTimer5000:
end;
}
-prontera,163,194,5 script Traveler#02Easter 92,{
+prontera,163,194,5 script Traveler#02Easter 4_F_03,{
mes "[Traveler]";
mes "A while ago,";
mes "I met a lady";
diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt
index 0e2e5da12..7248266ec 100644
--- a/npc/events/event_skill_reset.txt
+++ b/npc/events/event_skill_reset.txt
@@ -13,7 +13,7 @@
//= Skill Reset with payment, minimum BaseLv.60 to reset skill.
//= Each 1 BaseLv need 20.000 Zeny, so be careful to use skill.
//============================================================
-yuno,138,187,4 script Hypnotist Teacher 124,{
+yuno,138,187,4 script Hypnotist Teacher 4_F_TELEPORTER,{
set @npcname$,"[^D5A500Hypnotist^000000]";
mes @npcname$;
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index f1de9e6d9..e0098bf9b 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -13,7 +13,7 @@
//= 1.2 Added GM management function. [Euphy]
//============================================================
-arug_dun01,1,1,1 script Monster Controler#aru_gd 81,{
+arug_dun01,1,1,1 script Monster Controler#aru_gd 4_DOG01,{
OnInit:
donpcevent "Monster Controler1#aru::OnKill";
initnpctimer;
@@ -27,7 +27,7 @@ OnTimer3600000:
end;
}
-arug_dun01,1,2,1 script Monster Controler1#aru 81,{
+arug_dun01,1,2,1 script Monster Controler1#aru 4_DOG01,{
OnEnable:
set .@callwhere,rand(1,4);
if (.@callwhere == 1) {
@@ -57,7 +57,7 @@ OnMyMobDead:
end;
}
-arug_dun01,199,195,5 script Dwarf#aru_gd 826,{
+arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{
if (getcharid(2) == 0) {
mes "[Dwarf]";
mes "Hey did you see an ugly Goblin come by? He stole something from me!";
@@ -476,7 +476,7 @@ OnEnable:
end;
}
-arug_que01,100,81,3 script Pierrot Pier#aru_gd 715,{
+arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{
specialeffect EF_POISONHIT;
set .@sprchg_gd,rand(1,5);
if (.@sprchg_gd == 1) {
@@ -1019,7 +1019,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 715,{
}
}
-arug_que01,10,10,3 script Controller#gdevent_a 81,{
+arug_que01,10,10,3 script Controller#gdevent_a 4_DOG01,{
OnInit:
set $@gdeventv_a2,0;
end;
@@ -1089,7 +1089,7 @@ OnTimer63000:
end;
}
-arug_que01,87,93,0 script paper_sp_1_a 139,{
+arug_que01,87,93,0 script paper_sp_1_a HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1114,7 +1114,7 @@ OnBingo:
end;
}
-arug_que01,102,93,0 script paper_sp_2_a 139,{
+arug_que01,102,93,0 script paper_sp_2_a HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1139,7 +1139,7 @@ OnBingo:
end;
}
-arug_que01,117,93,0 script paper_sp_3_a 139,{
+arug_que01,117,93,0 script paper_sp_3_a HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1164,7 +1164,7 @@ OnBingo:
end;
}
-arug_que01,87,80,0 script paper_sp_4_a 139,{
+arug_que01,87,80,0 script paper_sp_4_a HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1189,7 +1189,7 @@ OnBingo:
end;
}
-arug_que01,102,80,0 script paper_sp_5_a 139,{
+arug_que01,102,80,0 script paper_sp_5_a HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1214,7 +1214,7 @@ OnBingo:
end;
}
-arug_que01,117,80,0 script paper_sp_6_a 139,{
+arug_que01,117,80,0 script paper_sp_6_a HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1239,7 +1239,7 @@ OnBingo:
end;
}
-arug_que01,87,65,0 script paper_sp_7_a 139,{
+arug_que01,87,65,0 script paper_sp_7_a HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1264,7 +1264,7 @@ OnBingo:
end;
}
-arug_que01,102,65,0 script paper_sp_8_a 139,{
+arug_que01,102,65,0 script paper_sp_8_a HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1289,7 +1289,7 @@ OnBingo:
end;
}
-arug_que01,117,65,0 script paper_sp_9_a 139,{
+arug_que01,117,65,0 script paper_sp_9_a HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1331,7 +1331,7 @@ OnTouch2:
end;
}
-arug_que01,6,6,1 script eff_mvp#aru_gd 844,{
+arug_que01,6,6,1 script eff_mvp#aru_gd CLEAR_NPC,{
end;
Onmvp:
@@ -1370,7 +1370,7 @@ OnTimer4000:
end;
}
-arug_que01,100,75,5 script Gergath#aru_gd 412,{
+arug_que01,100,75,5 script Gergath#aru_gd 4_M_OLDFRIAR,{
end;
OnInit:
@@ -1429,7 +1429,7 @@ OnTimer50000:
arug_que01,104,140,0 warp back#aru_gd 1,1,arug_dun01,199,192
/*
-arug_que01,104,140,1 script treg#aru_gd 844,{
+arug_que01,104,140,1 script treg#aru_gd CLEAR_NPC,{
end;
OnEnable:
@@ -1453,66 +1453,66 @@ OnMyMobDead:
}
*/
-arug_que01,98,105,3 script #aru_flower_01::GD_Ev_Flower 978,{
+arug_que01,98,105,3 script #aru_flower_01::GD_Ev_Flower 4_YELL_FLOWER,{
end;
}
-arug_que01,94,105,3 duplicate(GD_Ev_Flower) #aru_flower_02 977
-arug_que01,90,105,3 duplicate(GD_Ev_Flower) #aru_flower_03 978
-arug_que01,86,105,3 duplicate(GD_Ev_Flower) #aru_flower_04 977
-arug_que01,82,105,3 duplicate(GD_Ev_Flower) #aru_flower_05 978
-arug_que01,79,103,3 duplicate(GD_Ev_Flower) #aru_flower_06 977
-arug_que01,79,100,3 duplicate(GD_Ev_Flower) #aru_flower_07 978
-arug_que01,79,97,3 duplicate(GD_Ev_Flower) #aru_flower_08 977
-arug_que01,79,97,3 duplicate(GD_Ev_Flower) #aru_flower_09 978
-arug_que01,79,94,3 duplicate(GD_Ev_Flower) #aru_flower_10 977
-arug_que01,79,91,3 duplicate(GD_Ev_Flower) #aru_flower_11 978
-arug_que01,79,88,3 duplicate(GD_Ev_Flower) #aru_flower_12 977
-arug_que01,79,85,3 duplicate(GD_Ev_Flower) #aru_flower_13 978
-arug_que01,79,82,3 duplicate(GD_Ev_Flower) #aru_flower_14 977
-arug_que01,79,79,3 duplicate(GD_Ev_Flower) #aru_flower_15 978
-arug_que01,79,76,3 duplicate(GD_Ev_Flower) #aru_flower_16 977
-arug_que01,79,73,3 duplicate(GD_Ev_Flower) #aru_flower_17 978
-arug_que01,79,70,3 duplicate(GD_Ev_Flower) #aru_flower_18 977
-arug_que01,79,67,3 duplicate(GD_Ev_Flower) #aru_flower_19 978
-arug_que01,79,64,3 duplicate(GD_Ev_Flower) #aru_flower_20 977
-arug_que01,79,61,3 duplicate(GD_Ev_Flower) #aru_flower_21 978
-arug_que01,79,58,3 duplicate(GD_Ev_Flower) #aru_flower_22 977
-arug_que01,84,58,3 duplicate(GD_Ev_Flower) #aru_flower_23 978
-arug_que01,89,58,3 duplicate(GD_Ev_Flower) #aru_flower_24 977
-arug_que01,94,58,3 duplicate(GD_Ev_Flower) #aru_flower_25 978
-arug_que01,99,58,3 duplicate(GD_Ev_Flower) #aru_flower_26 977
-arug_que01,104,58,3 duplicate(GD_Ev_Flower) #aru_flower_27 978
-arug_que01,109,58,3 duplicate(GD_Ev_Flower) #aru_flower_28 977
-arug_que01,114,58,3 duplicate(GD_Ev_Flower) #aru_flower_29 978
-arug_que01,119,58,3 duplicate(GD_Ev_Flower) #aru_flower_30 977
-arug_que01,124,58,3 duplicate(GD_Ev_Flower) #aru_flower_31 978
-arug_que01,129,58,3 duplicate(GD_Ev_Flower) #aru_flower_32 977
-arug_que01,129,105,3 duplicate(GD_Ev_Flower) #aru_flower_33 978
-arug_que01,129,103,3 duplicate(GD_Ev_Flower) #aru_flower_34 977
-arug_que01,129,100,3 duplicate(GD_Ev_Flower) #aru_flower_35 978
-arug_que01,129,97,3 duplicate(GD_Ev_Flower) #aru_flower_36 977
-arug_que01,129,97,3 duplicate(GD_Ev_Flower) #aru_flower_37 978
-arug_que01,129,94,3 duplicate(GD_Ev_Flower) #aru_flower_38 977
-arug_que01,129,91,3 duplicate(GD_Ev_Flower) #aru_flower_39 978
-arug_que01,129,88,3 duplicate(GD_Ev_Flower) #aru_flower_40 977
-arug_que01,129,85,3 duplicate(GD_Ev_Flower) #aru_flower_41 978
-arug_que01,129,82,3 duplicate(GD_Ev_Flower) #aru_flower_42 977
-arug_que01,129,79,3 duplicate(GD_Ev_Flower) #aru_flower_43 978
-arug_que01,129,76,3 duplicate(GD_Ev_Flower) #aru_flower_44 977
-arug_que01,129,73,3 duplicate(GD_Ev_Flower) #aru_flower_45 978
-arug_que01,129,70,3 duplicate(GD_Ev_Flower) #aru_flower_46 977
-arug_que01,129,67,3 duplicate(GD_Ev_Flower) #aru_flower_47 978
-arug_que01,129,64,3 duplicate(GD_Ev_Flower) #aru_flower_48 977
-arug_que01,129,61,3 duplicate(GD_Ev_Flower) #aru_flower_49 978
-arug_que01,129,58,3 duplicate(GD_Ev_Flower) #aru_flower_50 977
-arug_que01,124,105,3 duplicate(GD_Ev_Flower) #aru_flower_51 978
-arug_que01,119,105,3 duplicate(GD_Ev_Flower) #aru_flower_52 977
-arug_que01,114,105,3 duplicate(GD_Ev_Flower) #aru_flower_53 978
-arug_que01,109,105,3 duplicate(GD_Ev_Flower) #aru_flower_54 977
-arug_que01,104,105,3 duplicate(GD_Ev_Flower) #aru_flower_55 976
-
-arug_dun01,5,5,1 script Event controller#aru_gd 81,{
+arug_que01,94,105,3 duplicate(GD_Ev_Flower) #aru_flower_02 4_RED_FLOWER
+arug_que01,90,105,3 duplicate(GD_Ev_Flower) #aru_flower_03 4_YELL_FLOWER
+arug_que01,86,105,3 duplicate(GD_Ev_Flower) #aru_flower_04 4_RED_FLOWER
+arug_que01,82,105,3 duplicate(GD_Ev_Flower) #aru_flower_05 4_YELL_FLOWER
+arug_que01,79,103,3 duplicate(GD_Ev_Flower) #aru_flower_06 4_RED_FLOWER
+arug_que01,79,100,3 duplicate(GD_Ev_Flower) #aru_flower_07 4_YELL_FLOWER
+arug_que01,79,97,3 duplicate(GD_Ev_Flower) #aru_flower_08 4_RED_FLOWER
+arug_que01,79,97,3 duplicate(GD_Ev_Flower) #aru_flower_09 4_YELL_FLOWER
+arug_que01,79,94,3 duplicate(GD_Ev_Flower) #aru_flower_10 4_RED_FLOWER
+arug_que01,79,91,3 duplicate(GD_Ev_Flower) #aru_flower_11 4_YELL_FLOWER
+arug_que01,79,88,3 duplicate(GD_Ev_Flower) #aru_flower_12 4_RED_FLOWER
+arug_que01,79,85,3 duplicate(GD_Ev_Flower) #aru_flower_13 4_YELL_FLOWER
+arug_que01,79,82,3 duplicate(GD_Ev_Flower) #aru_flower_14 4_RED_FLOWER
+arug_que01,79,79,3 duplicate(GD_Ev_Flower) #aru_flower_15 4_YELL_FLOWER
+arug_que01,79,76,3 duplicate(GD_Ev_Flower) #aru_flower_16 4_RED_FLOWER
+arug_que01,79,73,3 duplicate(GD_Ev_Flower) #aru_flower_17 4_YELL_FLOWER
+arug_que01,79,70,3 duplicate(GD_Ev_Flower) #aru_flower_18 4_RED_FLOWER
+arug_que01,79,67,3 duplicate(GD_Ev_Flower) #aru_flower_19 4_YELL_FLOWER
+arug_que01,79,64,3 duplicate(GD_Ev_Flower) #aru_flower_20 4_RED_FLOWER
+arug_que01,79,61,3 duplicate(GD_Ev_Flower) #aru_flower_21 4_YELL_FLOWER
+arug_que01,79,58,3 duplicate(GD_Ev_Flower) #aru_flower_22 4_RED_FLOWER
+arug_que01,84,58,3 duplicate(GD_Ev_Flower) #aru_flower_23 4_YELL_FLOWER
+arug_que01,89,58,3 duplicate(GD_Ev_Flower) #aru_flower_24 4_RED_FLOWER
+arug_que01,94,58,3 duplicate(GD_Ev_Flower) #aru_flower_25 4_YELL_FLOWER
+arug_que01,99,58,3 duplicate(GD_Ev_Flower) #aru_flower_26 4_RED_FLOWER
+arug_que01,104,58,3 duplicate(GD_Ev_Flower) #aru_flower_27 4_YELL_FLOWER
+arug_que01,109,58,3 duplicate(GD_Ev_Flower) #aru_flower_28 4_RED_FLOWER
+arug_que01,114,58,3 duplicate(GD_Ev_Flower) #aru_flower_29 4_YELL_FLOWER
+arug_que01,119,58,3 duplicate(GD_Ev_Flower) #aru_flower_30 4_RED_FLOWER
+arug_que01,124,58,3 duplicate(GD_Ev_Flower) #aru_flower_31 4_YELL_FLOWER
+arug_que01,129,58,3 duplicate(GD_Ev_Flower) #aru_flower_32 4_RED_FLOWER
+arug_que01,129,105,3 duplicate(GD_Ev_Flower) #aru_flower_33 4_YELL_FLOWER
+arug_que01,129,103,3 duplicate(GD_Ev_Flower) #aru_flower_34 4_RED_FLOWER
+arug_que01,129,100,3 duplicate(GD_Ev_Flower) #aru_flower_35 4_YELL_FLOWER
+arug_que01,129,97,3 duplicate(GD_Ev_Flower) #aru_flower_36 4_RED_FLOWER
+arug_que01,129,97,3 duplicate(GD_Ev_Flower) #aru_flower_37 4_YELL_FLOWER
+arug_que01,129,94,3 duplicate(GD_Ev_Flower) #aru_flower_38 4_RED_FLOWER
+arug_que01,129,91,3 duplicate(GD_Ev_Flower) #aru_flower_39 4_YELL_FLOWER
+arug_que01,129,88,3 duplicate(GD_Ev_Flower) #aru_flower_40 4_RED_FLOWER
+arug_que01,129,85,3 duplicate(GD_Ev_Flower) #aru_flower_41 4_YELL_FLOWER
+arug_que01,129,82,3 duplicate(GD_Ev_Flower) #aru_flower_42 4_RED_FLOWER
+arug_que01,129,79,3 duplicate(GD_Ev_Flower) #aru_flower_43 4_YELL_FLOWER
+arug_que01,129,76,3 duplicate(GD_Ev_Flower) #aru_flower_44 4_RED_FLOWER
+arug_que01,129,73,3 duplicate(GD_Ev_Flower) #aru_flower_45 4_YELL_FLOWER
+arug_que01,129,70,3 duplicate(GD_Ev_Flower) #aru_flower_46 4_RED_FLOWER
+arug_que01,129,67,3 duplicate(GD_Ev_Flower) #aru_flower_47 4_YELL_FLOWER
+arug_que01,129,64,3 duplicate(GD_Ev_Flower) #aru_flower_48 4_RED_FLOWER
+arug_que01,129,61,3 duplicate(GD_Ev_Flower) #aru_flower_49 4_YELL_FLOWER
+arug_que01,129,58,3 duplicate(GD_Ev_Flower) #aru_flower_50 4_RED_FLOWER
+arug_que01,124,105,3 duplicate(GD_Ev_Flower) #aru_flower_51 4_YELL_FLOWER
+arug_que01,119,105,3 duplicate(GD_Ev_Flower) #aru_flower_52 4_RED_FLOWER
+arug_que01,114,105,3 duplicate(GD_Ev_Flower) #aru_flower_53 4_YELL_FLOWER
+arug_que01,109,105,3 duplicate(GD_Ev_Flower) #aru_flower_54 4_RED_FLOWER
+arug_que01,104,105,3 duplicate(GD_Ev_Flower) #aru_flower_55 4_BLUE_FLOWER
+
+arug_dun01,5,5,1 script Event controller#aru_gd 4_DOG01,{
if (callfunc("F_GM_NPC",1854,0) < 1) {
mes "Incorrect password.";
close;
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 5ff30aa67..19ef7b8c3 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -13,7 +13,7 @@
//= 1.2 Added GM management function. [Euphy]
//============================================================
-schg_dun01,1,1,1 script Monster Controler#sch_gd 81,{
+schg_dun01,1,1,1 script Monster Controler#sch_gd 4_DOG01,{
OnInit:
donpcevent "Monster Controler1#sch::OnKill";
initnpctimer;
@@ -27,7 +27,7 @@ OnTimer3600000:
end;
}
-schg_dun01,1,2,1 script Monster Controler1#sch 81,{
+schg_dun01,1,2,1 script Monster Controler1#sch 4_DOG01,{
OnEnable:
set .@callwhere,rand(1,4);
if (.@callwhere == 1) {
@@ -57,7 +57,7 @@ OnMyMobDead:
end;
}
-schg_dun01,194,148,5 script Dwarf#sch_gd 826,{
+schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{
if (getcharid(2) == 0) {
mes "[Dwarf]";
mes "Hey did you see an ugly Goblin come by? He stole something from me!";
@@ -475,7 +475,7 @@ OnEnable:
end;
}
-schg_que01,100,81,3 script Pierrot Pier#sch_gd 715,{
+schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{
specialeffect EF_POISONHIT;
set .@sprchg_gd,rand(1,5);
if (.@sprchg_gd == 1) {
@@ -1018,7 +1018,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 715,{
}
}
-schg_que01,10,10,3 script Controller#gdevent_s 81,{
+schg_que01,10,10,3 script Controller#gdevent_s 4_DOG01,{
OnInit:
set $@gdeventv_s2,0;
end;
@@ -1088,7 +1088,7 @@ OnTimer63000:
end;
}
-schg_que01,87,93,0 script paper_sp_1_s 139,{
+schg_que01,87,93,0 script paper_sp_1_s HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1113,7 +1113,7 @@ OnBingo:
end;
}
-schg_que01,102,93,0 script paper_sp_2_s 139,{
+schg_que01,102,93,0 script paper_sp_2_s HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1138,7 +1138,7 @@ OnBingo:
end;
}
-schg_que01,117,93,0 script paper_sp_3_s 139,{
+schg_que01,117,93,0 script paper_sp_3_s HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1163,7 +1163,7 @@ OnBingo:
end;
}
-schg_que01,87,80,0 script paper_sp_4_s 139,{
+schg_que01,87,80,0 script paper_sp_4_s HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1188,7 +1188,7 @@ OnBingo:
end;
}
-schg_que01,102,80,0 script paper_sp_5_s 139,{
+schg_que01,102,80,0 script paper_sp_5_s HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1213,7 +1213,7 @@ OnBingo:
end;
}
-schg_que01,117,80,0 script paper_sp_6_s 139,{
+schg_que01,117,80,0 script paper_sp_6_s HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1238,7 +1238,7 @@ OnBingo:
end;
}
-schg_que01,87,65,0 script paper_sp_7_s 139,{
+schg_que01,87,65,0 script paper_sp_7_s HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1263,7 +1263,7 @@ OnBingo:
end;
}
-schg_que01,102,65,0 script paper_sp_8_s 139,{
+schg_que01,102,65,0 script paper_sp_8_s HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1288,7 +1288,7 @@ OnBingo:
end;
}
-schg_que01,117,65,0 script paper_sp_9_s 139,{
+schg_que01,117,65,0 script paper_sp_9_s HIDDEN_WARP_NPC,{
end;
OnEnable:
@@ -1330,7 +1330,7 @@ OnTouch2:
end;
}
-schg_que01,6,6,1 script eff_mvp#sch_gd 844,{
+schg_que01,6,6,1 script eff_mvp#sch_gd CLEAR_NPC,{
end;
Onmvp:
@@ -1369,7 +1369,7 @@ OnTimer4000:
end;
}
-schg_que01,100,75,5 script Gergath#sch_gd 412,{
+schg_que01,100,75,5 script Gergath#sch_gd 4_M_OLDFRIAR,{
end;
OnInit:
@@ -1428,7 +1428,7 @@ OnTimer50000:
schg_que01,104,140,0 warp back#sch_gd 1,1,schg_dun01,199,192
/*
-schg_que01,104,140,1 script treg#sch_gd 844,{
+schg_que01,104,140,1 script treg#sch_gd CLEAR_NPC,{
end;
OnEnable:
@@ -1452,66 +1452,66 @@ OnMyMobDead:
}
*/
-schg_que01,98,105,3 script #sch_flower_01::GD_Ev_Flower2 978,{
+schg_que01,98,105,3 script #sch_flower_01::GD_Ev_Flower2 4_YELL_FLOWER,{
end;
}
-schg_que01,94,105,3 duplicate(GD_Ev_Flower2) #sch_flower_02 977
-schg_que01,90,105,3 duplicate(GD_Ev_Flower2) #sch_flower_03 978
-schg_que01,86,105,3 duplicate(GD_Ev_Flower2) #sch_flower_04 977
-schg_que01,82,105,3 duplicate(GD_Ev_Flower2) #sch_flower_05 978
-schg_que01,79,103,3 duplicate(GD_Ev_Flower2) #sch_flower_06 977
-schg_que01,79,100,3 duplicate(GD_Ev_Flower2) #sch_flower_07 978
-schg_que01,79,97,3 duplicate(GD_Ev_Flower2) #sch_flower_08 977
-schg_que01,79,97,3 duplicate(GD_Ev_Flower2) #sch_flower_09 978
-schg_que01,79,94,3 duplicate(GD_Ev_Flower2) #sch_flower_10 977
-schg_que01,79,91,3 duplicate(GD_Ev_Flower2) #sch_flower_11 978
-schg_que01,79,88,3 duplicate(GD_Ev_Flower2) #sch_flower_12 977
-schg_que01,79,85,3 duplicate(GD_Ev_Flower2) #sch_flower_13 978
-schg_que01,79,82,3 duplicate(GD_Ev_Flower2) #sch_flower_14 977
-schg_que01,79,79,3 duplicate(GD_Ev_Flower2) #sch_flower_15 978
-schg_que01,79,76,3 duplicate(GD_Ev_Flower2) #sch_flower_16 977
-schg_que01,79,73,3 duplicate(GD_Ev_Flower2) #sch_flower_17 978
-schg_que01,79,70,3 duplicate(GD_Ev_Flower2) #sch_flower_18 977
-schg_que01,79,67,3 duplicate(GD_Ev_Flower2) #sch_flower_19 978
-schg_que01,79,64,3 duplicate(GD_Ev_Flower2) #sch_flower_20 977
-schg_que01,79,61,3 duplicate(GD_Ev_Flower2) #sch_flower_21 978
-schg_que01,79,58,3 duplicate(GD_Ev_Flower2) #sch_flower_22 977
-schg_que01,84,58,3 duplicate(GD_Ev_Flower2) #sch_flower_23 978
-schg_que01,89,58,3 duplicate(GD_Ev_Flower2) #sch_flower_24 977
-schg_que01,94,58,3 duplicate(GD_Ev_Flower2) #sch_flower_25 978
-schg_que01,99,58,3 duplicate(GD_Ev_Flower2) #sch_flower_26 977
-schg_que01,104,58,3 duplicate(GD_Ev_Flower2) #sch_flower_27 978
-schg_que01,109,58,3 duplicate(GD_Ev_Flower2) #sch_flower_28 977
-schg_que01,114,58,3 duplicate(GD_Ev_Flower2) #sch_flower_29 978
-schg_que01,119,58,3 duplicate(GD_Ev_Flower2) #sch_flower_30 977
-schg_que01,124,58,3 duplicate(GD_Ev_Flower2) #sch_flower_31 978
-schg_que01,129,58,3 duplicate(GD_Ev_Flower2) #sch_flower_32 977
-schg_que01,129,105,3 duplicate(GD_Ev_Flower2) #sch_flower_33 978
-schg_que01,129,103,3 duplicate(GD_Ev_Flower2) #sch_flower_34 977
-schg_que01,129,100,3 duplicate(GD_Ev_Flower2) #sch_flower_35 978
-schg_que01,129,97,3 duplicate(GD_Ev_Flower2) #sch_flower_36 977
-schg_que01,129,97,3 duplicate(GD_Ev_Flower2) #sch_flower_37 978
-schg_que01,129,94,3 duplicate(GD_Ev_Flower2) #sch_flower_38 977
-schg_que01,129,91,3 duplicate(GD_Ev_Flower2) #sch_flower_39 978
-schg_que01,129,88,3 duplicate(GD_Ev_Flower2) #sch_flower_40 977
-schg_que01,129,85,3 duplicate(GD_Ev_Flower2) #sch_flower_41 978
-schg_que01,129,82,3 duplicate(GD_Ev_Flower2) #sch_flower_42 977
-schg_que01,129,79,3 duplicate(GD_Ev_Flower2) #sch_flower_43 978
-schg_que01,129,76,3 duplicate(GD_Ev_Flower2) #sch_flower_44 977
-schg_que01,129,73,3 duplicate(GD_Ev_Flower2) #sch_flower_45 978
-schg_que01,129,70,3 duplicate(GD_Ev_Flower2) #sch_flower_46 977
-schg_que01,129,67,3 duplicate(GD_Ev_Flower2) #sch_flower_47 978
-schg_que01,129,64,3 duplicate(GD_Ev_Flower2) #sch_flower_48 977
-schg_que01,129,61,3 duplicate(GD_Ev_Flower2) #sch_flower_49 978
-schg_que01,129,58,3 duplicate(GD_Ev_Flower2) #sch_flower_50 977
-schg_que01,124,105,3 duplicate(GD_Ev_Flower2) #sch_flower_51 978
-schg_que01,119,105,3 duplicate(GD_Ev_Flower2) #sch_flower_52 977
-schg_que01,114,105,3 duplicate(GD_Ev_Flower2) #sch_flower_53 978
-schg_que01,109,105,3 duplicate(GD_Ev_Flower2) #sch_flower_54 977
-schg_que01,104,105,3 duplicate(GD_Ev_Flower2) #sch_flower_55 976
-
-schg_dun01,5,5,1 script Event controller#sch_gd 81,{
+schg_que01,94,105,3 duplicate(GD_Ev_Flower2) #sch_flower_02 4_RED_FLOWER
+schg_que01,90,105,3 duplicate(GD_Ev_Flower2) #sch_flower_03 4_YELL_FLOWER
+schg_que01,86,105,3 duplicate(GD_Ev_Flower2) #sch_flower_04 4_RED_FLOWER
+schg_que01,82,105,3 duplicate(GD_Ev_Flower2) #sch_flower_05 4_YELL_FLOWER
+schg_que01,79,103,3 duplicate(GD_Ev_Flower2) #sch_flower_06 4_RED_FLOWER
+schg_que01,79,100,3 duplicate(GD_Ev_Flower2) #sch_flower_07 4_YELL_FLOWER
+schg_que01,79,97,3 duplicate(GD_Ev_Flower2) #sch_flower_08 4_RED_FLOWER
+schg_que01,79,97,3 duplicate(GD_Ev_Flower2) #sch_flower_09 4_YELL_FLOWER
+schg_que01,79,94,3 duplicate(GD_Ev_Flower2) #sch_flower_10 4_RED_FLOWER
+schg_que01,79,91,3 duplicate(GD_Ev_Flower2) #sch_flower_11 4_YELL_FLOWER
+schg_que01,79,88,3 duplicate(GD_Ev_Flower2) #sch_flower_12 4_RED_FLOWER
+schg_que01,79,85,3 duplicate(GD_Ev_Flower2) #sch_flower_13 4_YELL_FLOWER
+schg_que01,79,82,3 duplicate(GD_Ev_Flower2) #sch_flower_14 4_RED_FLOWER
+schg_que01,79,79,3 duplicate(GD_Ev_Flower2) #sch_flower_15 4_YELL_FLOWER
+schg_que01,79,76,3 duplicate(GD_Ev_Flower2) #sch_flower_16 4_RED_FLOWER
+schg_que01,79,73,3 duplicate(GD_Ev_Flower2) #sch_flower_17 4_YELL_FLOWER
+schg_que01,79,70,3 duplicate(GD_Ev_Flower2) #sch_flower_18 4_RED_FLOWER
+schg_que01,79,67,3 duplicate(GD_Ev_Flower2) #sch_flower_19 4_YELL_FLOWER
+schg_que01,79,64,3 duplicate(GD_Ev_Flower2) #sch_flower_20 4_RED_FLOWER
+schg_que01,79,61,3 duplicate(GD_Ev_Flower2) #sch_flower_21 4_YELL_FLOWER
+schg_que01,79,58,3 duplicate(GD_Ev_Flower2) #sch_flower_22 4_RED_FLOWER
+schg_que01,84,58,3 duplicate(GD_Ev_Flower2) #sch_flower_23 4_YELL_FLOWER
+schg_que01,89,58,3 duplicate(GD_Ev_Flower2) #sch_flower_24 4_RED_FLOWER
+schg_que01,94,58,3 duplicate(GD_Ev_Flower2) #sch_flower_25 4_YELL_FLOWER
+schg_que01,99,58,3 duplicate(GD_Ev_Flower2) #sch_flower_26 4_RED_FLOWER
+schg_que01,104,58,3 duplicate(GD_Ev_Flower2) #sch_flower_27 4_YELL_FLOWER
+schg_que01,109,58,3 duplicate(GD_Ev_Flower2) #sch_flower_28 4_RED_FLOWER
+schg_que01,114,58,3 duplicate(GD_Ev_Flower2) #sch_flower_29 4_YELL_FLOWER
+schg_que01,119,58,3 duplicate(GD_Ev_Flower2) #sch_flower_30 4_RED_FLOWER
+schg_que01,124,58,3 duplicate(GD_Ev_Flower2) #sch_flower_31 4_YELL_FLOWER
+schg_que01,129,58,3 duplicate(GD_Ev_Flower2) #sch_flower_32 4_RED_FLOWER
+schg_que01,129,105,3 duplicate(GD_Ev_Flower2) #sch_flower_33 4_YELL_FLOWER
+schg_que01,129,103,3 duplicate(GD_Ev_Flower2) #sch_flower_34 4_RED_FLOWER
+schg_que01,129,100,3 duplicate(GD_Ev_Flower2) #sch_flower_35 4_YELL_FLOWER
+schg_que01,129,97,3 duplicate(GD_Ev_Flower2) #sch_flower_36 4_RED_FLOWER
+schg_que01,129,97,3 duplicate(GD_Ev_Flower2) #sch_flower_37 4_YELL_FLOWER
+schg_que01,129,94,3 duplicate(GD_Ev_Flower2) #sch_flower_38 4_RED_FLOWER
+schg_que01,129,91,3 duplicate(GD_Ev_Flower2) #sch_flower_39 4_YELL_FLOWER
+schg_que01,129,88,3 duplicate(GD_Ev_Flower2) #sch_flower_40 4_RED_FLOWER
+schg_que01,129,85,3 duplicate(GD_Ev_Flower2) #sch_flower_41 4_YELL_FLOWER
+schg_que01,129,82,3 duplicate(GD_Ev_Flower2) #sch_flower_42 4_RED_FLOWER
+schg_que01,129,79,3 duplicate(GD_Ev_Flower2) #sch_flower_43 4_YELL_FLOWER
+schg_que01,129,76,3 duplicate(GD_Ev_Flower2) #sch_flower_44 4_RED_FLOWER
+schg_que01,129,73,3 duplicate(GD_Ev_Flower2) #sch_flower_45 4_YELL_FLOWER
+schg_que01,129,70,3 duplicate(GD_Ev_Flower2) #sch_flower_46 4_RED_FLOWER
+schg_que01,129,67,3 duplicate(GD_Ev_Flower2) #sch_flower_47 4_YELL_FLOWER
+schg_que01,129,64,3 duplicate(GD_Ev_Flower2) #sch_flower_48 4_RED_FLOWER
+schg_que01,129,61,3 duplicate(GD_Ev_Flower2) #sch_flower_49 4_YELL_FLOWER
+schg_que01,129,58,3 duplicate(GD_Ev_Flower2) #sch_flower_50 4_RED_FLOWER
+schg_que01,124,105,3 duplicate(GD_Ev_Flower2) #sch_flower_51 4_YELL_FLOWER
+schg_que01,119,105,3 duplicate(GD_Ev_Flower2) #sch_flower_52 4_RED_FLOWER
+schg_que01,114,105,3 duplicate(GD_Ev_Flower2) #sch_flower_53 4_YELL_FLOWER
+schg_que01,109,105,3 duplicate(GD_Ev_Flower2) #sch_flower_54 4_RED_FLOWER
+schg_que01,104,105,3 duplicate(GD_Ev_Flower2) #sch_flower_55 4_BLUE_FLOWER
+
+schg_dun01,5,5,1 script Event controller#sch_gd 4_DOG01,{
if (callfunc("F_GM_NPC",1854,0) < 1) {
mes "Incorrect password.";
close;
diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt
index 3b8e12bf7..c56563c86 100644
--- a/npc/events/god_se_festival.txt
+++ b/npc/events/god_se_festival.txt
@@ -14,7 +14,7 @@
//============================================================
// Original name: "Festival Manager#god_se_fes00"
-yuno,1,1,0 script Festival Manager#gq_fes0 891,{
+yuno,1,1,0 script Festival Manager#gq_fes0 4_F_HUGIRL,{
callfunc "F_GM_NPC";
mes "[Festival Manager]";
mes "I am the festival NPC manager for the God SE quest.";
@@ -44,7 +44,7 @@ yuno,1,1,0 script Festival Manager#gq_fes0 891,{
}
}
-yuno,118,192,5 script Rmimi Ravies#gq_fes01 891,{
+yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{
set .@GID, getcharid(2);
if (countitem(7840) > 0) {
mes "[Rmimi Ravies]";
@@ -392,7 +392,7 @@ OnTimer3900000:
// Original name: "Festival Manager#god_se_fes02"
-rachel,1,1,0 script Festival Manager#gq_fes2 891,{
+rachel,1,1,0 script Festival Manager#gq_fes2 4_F_HUGIRL,{
callfunc "F_GM_NPC";
mes "[Festival Manager]";
mes "I am the festival NPC manager for the God SE quest.";
@@ -422,7 +422,7 @@ rachel,1,1,0 script Festival Manager#gq_fes2 891,{
}
}
-rachel,132,117,3 script Rhehe Ravies#gq_fes03 891,{
+rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{
set .@GID, getcharid(2);
if (countitem(7840) > 0) {
mes "[Rhehe Ravies]";
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index 0ffaf959a..ba603b207 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -39,7 +39,7 @@ OnEffect2:
end;
}
-prontera,164,69,3 script Cool Devi#06_hw 738,{
+prontera,164,69,3 script Cool Devi#06_hw 4_DEVIRUCHI,{
if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -235,7 +235,7 @@ prontera,164,69,3 script Cool Devi#06_hw 738,{
}
-geffen,145,132,3 script Hoirin#06_hw 729,{
+geffen,145,132,3 script Hoirin#06_hw 4_F_NOVICE,{
if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -390,7 +390,7 @@ OnTouch:
close;
}
-nif_in,19,32,3 script Deviruchi#06_hw 738,{
+nif_in,19,32,3 script Deviruchi#06_hw 4_DEVIRUCHI,{
if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -482,7 +482,7 @@ nif_in,19,32,3 script Deviruchi#06_hw 738,{
// Creation of Pumpkin Pie (Event 2)
//============================================================
-nif_fild01,165,115,3 script Chicken Masta#06_hw 794,{
+nif_fild01,165,115,3 script Chicken Masta#06_hw 4_M_NFDEADMAN2,{
if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -641,7 +641,7 @@ nif_fild01,165,115,3 script Chicken Masta#06_hw 794,{
}
}
-nif_fild01,167,113,3 script Masta's chicken#06_hw01 800,{
+nif_fild01,167,113,3 script Masta's chicken#06_hw01 4_NFCOCK,{
mes "Drowsing chicken.";
close;
}
@@ -715,14 +715,14 @@ OnInit:
}
-nif_fild01,270,145,3 duplicate(HwChicken) Masta's chicken#06_hw02 800
-nif_fild01,219,267,4 duplicate(HwChicken) Masta's chicken#06_hw03 800
-nif_fild01,199,240,5 duplicate(HwChicken) Masta's chicken#06_hw04 800
-nif_fild01,316,97,6 duplicate(HwChicken) Masta's chicken#06_hw05 800
-nif_fild01,147,343,7 duplicate(HwChicken) Masta's chicken#06_hw06 800
-nif_fild01,185,325,8 duplicate(HwChicken) Masta's chicken#06_hw07 800
-nif_fild01,133,105,1 duplicate(HwChicken) Masta's chicken#06_hw08 800
-nif_fild01,331,329,2 duplicate(HwChicken) Masta's chicken#06_hw09 800
+nif_fild01,270,145,3 duplicate(HwChicken) Masta's chicken#06_hw02 4_NFCOCK
+nif_fild01,219,267,4 duplicate(HwChicken) Masta's chicken#06_hw03 4_NFCOCK
+nif_fild01,199,240,5 duplicate(HwChicken) Masta's chicken#06_hw04 4_NFCOCK
+nif_fild01,316,97,6 duplicate(HwChicken) Masta's chicken#06_hw05 4_NFCOCK
+nif_fild01,147,343,7 duplicate(HwChicken) Masta's chicken#06_hw06 4_NFCOCK
+nif_fild01,185,325,8 duplicate(HwChicken) Masta's chicken#06_hw07 4_NFCOCK
+nif_fild01,133,105,1 duplicate(HwChicken) Masta's chicken#06_hw08 4_NFCOCK
+nif_fild01,331,329,2 duplicate(HwChicken) Masta's chicken#06_hw09 4_NFCOCK
pay_dun03,1,1,0 script #06_hw_timer01 -1,{
OnInit:
@@ -862,47 +862,47 @@ OnTimer4200000:
}
-pay_dun03,151,138,3 duplicate(HwChicken3) Chicken#06_hw_p01 800
-pay_dun03,151,138,3 duplicate(HwChicken2) Chicken#06_hw_p02 800
-pay_dun03,152,138,3 duplicate(HwChicken2) Chicken#06_hw_p03 800
-pay_dun03,154,138,3 duplicate(HwChicken2) Chicken#06_hw_p04 800
-pay_dun03,155,138,3 duplicate(HwChicken2) Chicken#06_hw_p05 800
-pay_dun03,157,138,3 duplicate(HwChicken2) Chicken#06_hw_p06 800
-pay_dun03,158,138,3 duplicate(HwChicken3) Chicken#06_hw_p07 800
-pay_dun03,150,137,3 duplicate(HwChicken2) Chicken#06_hw_p08 800
-pay_dun03,153,137,3 duplicate(HwChicken2) Chicken#06_hw_p09 800
-pay_dun03,156,137,3 duplicate(HwChicken3) Chicken#06_hw_p10 800
-pay_dun03,159,137,3 duplicate(HwChicken2) Chicken#06_hw_p11 800
-pay_dun03,149,136,3 duplicate(HwChicken2) Chicken#06_hw_p12 800
-pay_dun03,152,136,3 duplicate(HwChicken3) Chicken#06_hw_p13 800
-pay_dun03,157,136,3 duplicate(HwChicken2) Chicken#06_hw_p14 800
-pay_dun03,160,136,3 duplicate(HwChicken2) Chicken#06_hw_p15 800
-pay_dun03,149,135,3 duplicate(HwChicken3) Chicken#06_hw_p16 800
-pay_dun03,151,135,3 duplicate(HwChicken2) Chicken#06_hw_p17 800
-pay_dun03,152,135,3 duplicate(HwChicken2) Chicken#06_hw_p18 800
-pay_dun03,153,135,3 duplicate(HwChicken3) Chicken#06_hw_p19 800
-pay_dun03,156,135,3 duplicate(HwChicken2) Chicken#06_hw_p20 800
-pay_dun03,157,135,3 duplicate(HwChicken2) Chicken#06_hw_p21 800
-pay_dun03,158,135,3 duplicate(HwChicken3) Chicken#06_hw_p22 800
-pay_dun03,160,135,3 duplicate(HwChicken2) Chicken#06_hw_p23 800
-pay_dun03,149,134,3 duplicate(HwChicken2) Chicken#06_hw_p24 800
-pay_dun03,152,134,3 duplicate(HwChicken3) Chicken#06_hw_p25 800
-pay_dun03,157,134,3 duplicate(HwChicken2) Chicken#06_hw_p26 800
-pay_dun03,160,134,3 duplicate(HwChicken2) Chicken#06_hw_p27 800
-pay_dun03,149,133,3 duplicate(HwChicken3) Chicken#06_hw_p28 800
-pay_dun03,160,133,3 duplicate(HwChicken2) Chicken#06_hw_p29 800
-pay_dun03,150,132,3 duplicate(HwChicken2) Chicken#06_hw_p30 800
-pay_dun03,153,132,3 duplicate(HwChicken3) Chicken#06_hw_p31 800
-pay_dun03,156,132,3 duplicate(HwChicken2) Chicken#06_hw_p32 800
-pay_dun03,159,132,3 duplicate(HwChicken2) Chicken#06_hw_p33 800
-pay_dun03,151,131,3 duplicate(HwChicken2) Chicken#06_hw_p34 800
-pay_dun03,152,131,3 duplicate(HwChicken2) Chicken#06_hw_p35 800
-pay_dun03,153,131,3 duplicate(HwChicken3) Chicken#06_hw_p36 800
-pay_dun03,154,131,3 duplicate(HwChicken2) Chicken#06_hw_p37 800
-pay_dun03,155,131,3 duplicate(HwChicken2) Chicken#06_hw_p38 800
-pay_dun03,156,131,3 duplicate(HwChicken3) Chicken#06_hw_p39 800
-pay_dun03,157,131,3 duplicate(HwChicken2) Chicken#06_hw_p40 800
-pay_dun03,158,131,3 duplicate(HwChicken3) Chicken#06_hw_p41 800
+pay_dun03,151,138,3 duplicate(HwChicken3) Chicken#06_hw_p01 4_NFCOCK
+pay_dun03,151,138,3 duplicate(HwChicken2) Chicken#06_hw_p02 4_NFCOCK
+pay_dun03,152,138,3 duplicate(HwChicken2) Chicken#06_hw_p03 4_NFCOCK
+pay_dun03,154,138,3 duplicate(HwChicken2) Chicken#06_hw_p04 4_NFCOCK
+pay_dun03,155,138,3 duplicate(HwChicken2) Chicken#06_hw_p05 4_NFCOCK
+pay_dun03,157,138,3 duplicate(HwChicken2) Chicken#06_hw_p06 4_NFCOCK
+pay_dun03,158,138,3 duplicate(HwChicken3) Chicken#06_hw_p07 4_NFCOCK
+pay_dun03,150,137,3 duplicate(HwChicken2) Chicken#06_hw_p08 4_NFCOCK
+pay_dun03,153,137,3 duplicate(HwChicken2) Chicken#06_hw_p09 4_NFCOCK
+pay_dun03,156,137,3 duplicate(HwChicken3) Chicken#06_hw_p10 4_NFCOCK
+pay_dun03,159,137,3 duplicate(HwChicken2) Chicken#06_hw_p11 4_NFCOCK
+pay_dun03,149,136,3 duplicate(HwChicken2) Chicken#06_hw_p12 4_NFCOCK
+pay_dun03,152,136,3 duplicate(HwChicken3) Chicken#06_hw_p13 4_NFCOCK
+pay_dun03,157,136,3 duplicate(HwChicken2) Chicken#06_hw_p14 4_NFCOCK
+pay_dun03,160,136,3 duplicate(HwChicken2) Chicken#06_hw_p15 4_NFCOCK
+pay_dun03,149,135,3 duplicate(HwChicken3) Chicken#06_hw_p16 4_NFCOCK
+pay_dun03,151,135,3 duplicate(HwChicken2) Chicken#06_hw_p17 4_NFCOCK
+pay_dun03,152,135,3 duplicate(HwChicken2) Chicken#06_hw_p18 4_NFCOCK
+pay_dun03,153,135,3 duplicate(HwChicken3) Chicken#06_hw_p19 4_NFCOCK
+pay_dun03,156,135,3 duplicate(HwChicken2) Chicken#06_hw_p20 4_NFCOCK
+pay_dun03,157,135,3 duplicate(HwChicken2) Chicken#06_hw_p21 4_NFCOCK
+pay_dun03,158,135,3 duplicate(HwChicken3) Chicken#06_hw_p22 4_NFCOCK
+pay_dun03,160,135,3 duplicate(HwChicken2) Chicken#06_hw_p23 4_NFCOCK
+pay_dun03,149,134,3 duplicate(HwChicken2) Chicken#06_hw_p24 4_NFCOCK
+pay_dun03,152,134,3 duplicate(HwChicken3) Chicken#06_hw_p25 4_NFCOCK
+pay_dun03,157,134,3 duplicate(HwChicken2) Chicken#06_hw_p26 4_NFCOCK
+pay_dun03,160,134,3 duplicate(HwChicken2) Chicken#06_hw_p27 4_NFCOCK
+pay_dun03,149,133,3 duplicate(HwChicken3) Chicken#06_hw_p28 4_NFCOCK
+pay_dun03,160,133,3 duplicate(HwChicken2) Chicken#06_hw_p29 4_NFCOCK
+pay_dun03,150,132,3 duplicate(HwChicken2) Chicken#06_hw_p30 4_NFCOCK
+pay_dun03,153,132,3 duplicate(HwChicken3) Chicken#06_hw_p31 4_NFCOCK
+pay_dun03,156,132,3 duplicate(HwChicken2) Chicken#06_hw_p32 4_NFCOCK
+pay_dun03,159,132,3 duplicate(HwChicken2) Chicken#06_hw_p33 4_NFCOCK
+pay_dun03,151,131,3 duplicate(HwChicken2) Chicken#06_hw_p34 4_NFCOCK
+pay_dun03,152,131,3 duplicate(HwChicken2) Chicken#06_hw_p35 4_NFCOCK
+pay_dun03,153,131,3 duplicate(HwChicken3) Chicken#06_hw_p36 4_NFCOCK
+pay_dun03,154,131,3 duplicate(HwChicken2) Chicken#06_hw_p37 4_NFCOCK
+pay_dun03,155,131,3 duplicate(HwChicken2) Chicken#06_hw_p38 4_NFCOCK
+pay_dun03,156,131,3 duplicate(HwChicken3) Chicken#06_hw_p39 4_NFCOCK
+pay_dun03,157,131,3 duplicate(HwChicken2) Chicken#06_hw_p40 4_NFCOCK
+pay_dun03,158,131,3 duplicate(HwChicken3) Chicken#06_hw_p41 4_NFCOCK
// Payon Field chickens
//============================================================
@@ -1001,35 +1001,35 @@ OnTimer6000000:
end;
}
-pay_fild08,147,353,3 duplicate(HwChicken3) Chicken#06_hw_pf01 800
-pay_fild08,147,354,3 duplicate(HwChicken2) Chicken#06_hw_pf02 800
-pay_fild08,147,355,3 duplicate(HwChicken2) Chicken#06_hw_pf03 800
-pay_fild08,148,352,3 duplicate(HwChicken3) Chicken#06_hw_pf04 800
-pay_fild08,148,356,3 duplicate(HwChicken2) Chicken#06_hw_pf05 800
-pay_fild08,149,351,3 duplicate(HwChicken2) Chicken#06_hw_pf06 800
-pay_fild08,149,354,3 duplicate(HwChicken3) Chicken#06_hw_pf07 800
-pay_fild08,149,357,3 duplicate(HwChicken2) Chicken#06_hw_pf08 800
-pay_fild08,150,351,3 duplicate(HwChicken2) Chicken#06_hw_pf09 800
-pay_fild08,150,357,3 duplicate(HwChicken3) Chicken#06_hw_pf10 800
-pay_fild08,151,351,3 duplicate(HwChicken2) Chicken#06_hw_pf11 800
-pay_fild08,151,353,3 duplicate(HwChicken2) Chicken#06_hw_pf12 800
-pay_fild08,151,355,3 duplicate(HwChicken3) Chicken#06_hw_pf13 800
-pay_fild08,151,357,3 duplicate(HwChicken2) Chicken#06_hw_pf14 800
-pay_fild08,152,351,3 duplicate(HwChicken2) Chicken#06_hw_pf15 800
-pay_fild08,152,357,3 duplicate(HwChicken3) Chicken#06_hw_pf16 800
-pay_fild08,153,351,3 duplicate(HwChicken2) Chicken#06_hw_pf17 800
-pay_fild08,153,357,3 duplicate(HwChicken2) Chicken#06_hw_pf18 800
-pay_fild08,154,351,3 duplicate(HwChicken3) Chicken#06_hw_pf19 800
-pay_fild08,154,353,3 duplicate(HwChicken2) Chicken#06_hw_pf20 800
-pay_fild08,154,355,3 duplicate(HwChicken2) Chicken#06_hw_pf21 800
-pay_fild08,154,357,3 duplicate(HwChicken3) Chicken#06_hw_pf22 800
-pay_fild08,155,350,3 duplicate(HwChicken2) Chicken#06_hw_pf23 800
-pay_fild08,155,352,3 duplicate(HwChicken2) Chicken#06_hw_pf24 800
-pay_fild08,155,354,3 duplicate(HwChicken3) Chicken#06_hw_pf25 800
-pay_fild08,155,356,3 duplicate(HwChicken2) Chicken#06_hw_pf26 800
-pay_fild08,155,358,3 duplicate(HwChicken3) Chicken#06_hw_pf27 800
-
-prontera,155,285,3 script Familiar#06_hw01::HWFamiDup 799,{
+pay_fild08,147,353,3 duplicate(HwChicken3) Chicken#06_hw_pf01 4_NFCOCK
+pay_fild08,147,354,3 duplicate(HwChicken2) Chicken#06_hw_pf02 4_NFCOCK
+pay_fild08,147,355,3 duplicate(HwChicken2) Chicken#06_hw_pf03 4_NFCOCK
+pay_fild08,148,352,3 duplicate(HwChicken3) Chicken#06_hw_pf04 4_NFCOCK
+pay_fild08,148,356,3 duplicate(HwChicken2) Chicken#06_hw_pf05 4_NFCOCK
+pay_fild08,149,351,3 duplicate(HwChicken2) Chicken#06_hw_pf06 4_NFCOCK
+pay_fild08,149,354,3 duplicate(HwChicken3) Chicken#06_hw_pf07 4_NFCOCK
+pay_fild08,149,357,3 duplicate(HwChicken2) Chicken#06_hw_pf08 4_NFCOCK
+pay_fild08,150,351,3 duplicate(HwChicken2) Chicken#06_hw_pf09 4_NFCOCK
+pay_fild08,150,357,3 duplicate(HwChicken3) Chicken#06_hw_pf10 4_NFCOCK
+pay_fild08,151,351,3 duplicate(HwChicken2) Chicken#06_hw_pf11 4_NFCOCK
+pay_fild08,151,353,3 duplicate(HwChicken2) Chicken#06_hw_pf12 4_NFCOCK
+pay_fild08,151,355,3 duplicate(HwChicken3) Chicken#06_hw_pf13 4_NFCOCK
+pay_fild08,151,357,3 duplicate(HwChicken2) Chicken#06_hw_pf14 4_NFCOCK
+pay_fild08,152,351,3 duplicate(HwChicken2) Chicken#06_hw_pf15 4_NFCOCK
+pay_fild08,152,357,3 duplicate(HwChicken3) Chicken#06_hw_pf16 4_NFCOCK
+pay_fild08,153,351,3 duplicate(HwChicken2) Chicken#06_hw_pf17 4_NFCOCK
+pay_fild08,153,357,3 duplicate(HwChicken2) Chicken#06_hw_pf18 4_NFCOCK
+pay_fild08,154,351,3 duplicate(HwChicken3) Chicken#06_hw_pf19 4_NFCOCK
+pay_fild08,154,353,3 duplicate(HwChicken2) Chicken#06_hw_pf20 4_NFCOCK
+pay_fild08,154,355,3 duplicate(HwChicken2) Chicken#06_hw_pf21 4_NFCOCK
+pay_fild08,154,357,3 duplicate(HwChicken3) Chicken#06_hw_pf22 4_NFCOCK
+pay_fild08,155,350,3 duplicate(HwChicken2) Chicken#06_hw_pf23 4_NFCOCK
+pay_fild08,155,352,3 duplicate(HwChicken2) Chicken#06_hw_pf24 4_NFCOCK
+pay_fild08,155,354,3 duplicate(HwChicken3) Chicken#06_hw_pf25 4_NFCOCK
+pay_fild08,155,356,3 duplicate(HwChicken2) Chicken#06_hw_pf26 4_NFCOCK
+pay_fild08,155,358,3 duplicate(HwChicken3) Chicken#06_hw_pf27 4_NFCOCK
+
+prontera,155,285,3 script Familiar#06_hw01::HWFamiDup 4_NFBAT,{
mes "[Familiar]";
mes "Hello.";
mes "I'm Loli Ruri's faithful and cute Familiar.";
@@ -1072,10 +1072,10 @@ prontera,155,285,3 script Familiar#06_hw01::HWFamiDup 799,{
mes "He likes it.";
close;
}
-payon,156,231,3 duplicate(HWFamiDup) Familiar#06_hw02 799
-morocc,159,143,3 duplicate(HWFamiDup) Familiar#06_hw03 799
-geffen,120,188,3 duplicate(HWFamiDup) Familiar#06_hw04 799
-alberta,80,171,3 duplicate(HWFamiDup) Familiar#06_hw05 799
+payon,156,231,3 duplicate(HWFamiDup) Familiar#06_hw02 4_NFBAT
+morocc,159,143,3 duplicate(HWFamiDup) Familiar#06_hw03 4_NFBAT
+geffen,120,188,3 duplicate(HWFamiDup) Familiar#06_hw04 4_NFBAT
+alberta,80,171,3 duplicate(HWFamiDup) Familiar#06_hw05 4_NFBAT
// Event Lude Monster Spawns
//============================================================
diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt
index 8bb8df1fd..6aad72358 100644
--- a/npc/events/halloween_2008.txt
+++ b/npc/events/halloween_2008.txt
@@ -15,7 +15,7 @@
//= 1.1 Some small changes. [Kisuka]
//============================================================
-payon,162,176,4 script Halloween Magician#iRO08 704,{
+payon,162,176,4 script Halloween Magician#iRO08 4_M_BIBI,{
if (Hallow08 < 1) {
mes "[Halloween Magician]";
mes "Kkkkkkkkk!";
@@ -232,7 +232,7 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{
}
}
-evt_zombie,16,142,1 script zombiewarp001 45,2,2,{
+evt_zombie,16,142,1 script zombiewarp001 WARPNPC,2,2,{
OnTouch:
if (@Hallow08Warp == 1) {
set Hallow08Kill,2;
@@ -242,7 +242,7 @@ OnTouch:
end;
}
-evt_zombie,122,27,1 script zombiewarp002 45,2,2,{
+evt_zombie,122,27,1 script zombiewarp002 WARPNPC,2,2,{
OnTouch:
if (@Hallow08Warp == 2) {
set Hallow08Kill,2;
@@ -252,7 +252,7 @@ OnTouch:
end;
}
-evt_zombie,267,89,1 script zombiewarp003 45,2,2,{
+evt_zombie,267,89,1 script zombiewarp003 WARPNPC,2,2,{
OnTouch:
if (@Hallow08Warp == 3) {
set Hallow08Kill,2;
diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt
index c349dec28..95b3e2a11 100644
--- a/npc/events/halloween_2009.txt
+++ b/npc/events/halloween_2009.txt
@@ -20,7 +20,7 @@
// Headgear Quest - Pumpkin Hat
//============================================================
-prontera,152,192,5 script Pumpkin Hat Researcher 712,{
+prontera,152,192,5 script Pumpkin Hat Researcher 4_M_05,{
if(BaseLevel < 45) {
mes "[Pumpkin Hat Researcher]";
mes "Shoo, I don't need a child. Shoo! I don't talk to novices.";
@@ -94,7 +94,7 @@ prontera,152,192,5 script Pumpkin Hat Researcher 712,{
// Buffs - Trick or Treaters
//============================================================
-- script Trick or Treater::09Treats 706,2,2,{
+- script Trick or Treater::09Treats 4_M_KID1,2,2,{
OnTouch:
hideoffnpc strnpcinfo(3);
initnpctimer;
@@ -209,18 +209,18 @@ OnTimer300000:
stopnpctimer;
end;
}
-prontera,151,173,5 duplicate(09Treats) Trick or Treater#iRO1 706,2,2
-prontera,270,350,5 duplicate(09Treats) Trick or Treater#iRO2 706,2,2
-prontera,234,310,5 duplicate(09Treats) Trick or Treater#iRO3 706,2,2
-prontera,156,321,5 duplicate(09Treats) Trick or Treater#iRO4 706,2,2
-prontera,156,283,5 duplicate(09Treats) Trick or Treater#iRO5 706,2,2
-prontera,142,214,5 duplicate(09Treats) Trick or Treater#iRO6 706,2,2
-prontera,134,125,5 duplicate(09Treats) Trick or Treater#iRO7 706,2,2
-prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 706,2,2
+prontera,151,173,5 duplicate(09Treats) Trick or Treater#iRO1 4_M_KID1,2,2
+prontera,270,350,5 duplicate(09Treats) Trick or Treater#iRO2 4_M_KID1,2,2
+prontera,234,310,5 duplicate(09Treats) Trick or Treater#iRO3 4_M_KID1,2,2
+prontera,156,321,5 duplicate(09Treats) Trick or Treater#iRO4 4_M_KID1,2,2
+prontera,156,283,5 duplicate(09Treats) Trick or Treater#iRO5 4_M_KID1,2,2
+prontera,142,214,5 duplicate(09Treats) Trick or Treater#iRO6 4_M_KID1,2,2
+prontera,134,125,5 duplicate(09Treats) Trick or Treater#iRO7 4_M_KID1,2,2
+prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 4_M_KID1,2,2
// Monster Summoning - Halloween Wizard
//============================================================
-- script Halloween Wizard#iRO09::09HallowWiz 737,{
+- script Halloween Wizard#iRO09::09HallowWiz 4_DARKLORD,{
mes "[Halloween Wizard]";
mes "...";
mes "Do you want to play a trick on someone?";
@@ -433,8 +433,8 @@ prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 706,2,2
}
}
}
-prontera,156,195,5 duplicate(09HallowWiz) Halloween Wizard#1 737
-geffen,133,122,5 duplicate(09HallowWiz) Halloween Wizard#2 737
-payon,156,196,5 duplicate(09HallowWiz) Halloween Wizard#3 737
-alberta,96,57,5 duplicate(09HallowWiz) Halloween Wizard#4 737
-aldebaran,146,122,5 duplicate(09HallowWiz) Halloween Wizard#5 737
+prontera,156,195,5 duplicate(09HallowWiz) Halloween Wizard#1 4_DARKLORD
+geffen,133,122,5 duplicate(09HallowWiz) Halloween Wizard#2 4_DARKLORD
+payon,156,196,5 duplicate(09HallowWiz) Halloween Wizard#3 4_DARKLORD
+alberta,96,57,5 duplicate(09HallowWiz) Halloween Wizard#4 4_DARKLORD
+aldebaran,146,122,5 duplicate(09HallowWiz) Halloween Wizard#5 4_DARKLORD
diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt
index eb41fc9d0..b308335cb 100644
--- a/npc/events/idul_fitri.txt
+++ b/npc/events/idul_fitri.txt
@@ -10,7 +10,7 @@
//= 1.1 Replaced effect numerics with constants. [Samuray22]
//============================================================
-prontera,146,92,3 script Cellerb 58,{
+prontera,146,92,3 script Cellerb 1_M_MERCHANT,{
mes "[Staff Idul Fitri]";
if((gettime(6)==10 && (gettime(5)==24 || gettime(5)==25))==0) {
mes "Congratulation! Celebrate Feast Day Of Ramadan Idul Fitri 1427 H.";
diff --git a/npc/events/lunar_2008.txt b/npc/events/lunar_2008.txt
index 72ebe644b..577869be3 100644
--- a/npc/events/lunar_2008.txt
+++ b/npc/events/lunar_2008.txt
@@ -22,7 +22,7 @@
//= 1.1 Added missing checkweights. [L0ne_W0lf]
//============================================================
-payon_in01,193,30,4 script Rice Mill Grandma#rat 78,{
+payon_in01,193,30,4 script Rice Mill Grandma#rat 1_F_ORIENT_04,{
mes "[Rice Mill Grandma]";
if (!lunar_rat) {
mes "Those filthy little";
@@ -170,7 +170,7 @@ payon_in01,193,30,4 script Rice Mill Grandma#rat 78,{
}
}
-payon,215,127,4 script Rice Mill Man#rat 54,{
+payon,215,127,4 script Rice Mill Man#rat 1_M_JOBGUIDER,{
mes "[Rice Mill Man]";
if (!lunar_rat) {
mes "Breaks my heart...";
@@ -223,8 +223,8 @@ payon,215,127,4 script Rice Mill Man#rat 54,{
}
}
-//payon,126,113,4 script Miss Lunar#rat 862,{
-payon,126,113,4 script Miss Lunar#rat 719,{
+//payon,126,113,4 script Miss Lunar#rat 4_F_LGTGIRL,{
+payon,126,113,4 script Miss Lunar#rat 4_F_NACORURI,{
mes "[Lunar]";
if ((MaxWeight-Weight) < 3000 || checkweight(1201,1) == 0) {
mes "Oh, I'm sorry, but we";
diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt
index 7f191290b..2fd6b7594 100644
--- a/npc/events/nguild/nguild_dunsw.txt
+++ b/npc/events/nguild/nguild_dunsw.txt
@@ -41,25 +41,25 @@ function script F_GldDunSw {
}
// Castle 1 ===============================================
-nguild_alde,212,181,0 script Switch#DunN01 111,{
+nguild_alde,212,181,0 script Switch#DunN01 HIDDEN_NPC,{
callfunc "F_GldDunSw","nguild_alde","02",32,122;
close;
}
// Castle 2 ===============================================
-nguild_gef,78,84,0 script Switch#DunN02 111,{
+nguild_gef,78,84,0 script Switch#DunN02 HIDDEN_NPC,{
callfunc "F_GldDunSw","nguild_gef","04",39,258;
close;
}
// Castle 3 ===============================================
-nguild_pay,101,25,0 script Switch#DunN03 111,{
+nguild_pay,101,25,0 script Switch#DunN03 HIDDEN_NPC,{
callfunc "F_GldDunSw","nguild_pay","01",186,165;
close;
}
// Castle 4 ===============================================
-nguild_prt,94,200,0 script Switch#DunN04 111,{
+nguild_prt,94,200,0 script Switch#DunN04 HIDDEN_NPC,{
callfunc "F_GldDunSw","nguild_prt","03",28,251;
close;
}
diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt
index 178125643..17e1db744 100644
--- a/npc/events/nguild/nguild_flags.txt
+++ b/npc/events/nguild/nguild_flags.txt
@@ -61,7 +61,7 @@ function script F_Flags {
//============================================================================//
// Castle 1
//============================================================================//
-n_castle,110,96,1 script NGuild Aldebaran#a1-1 722,{
+n_castle,110,96,1 script NGuild Aldebaran#a1-1 GUILD_FLAG,{
callfunc "F_Flags","Al De Baran","nguild_alde",218,170,1,1;
close;
@@ -70,7 +70,7 @@ OnRecvCastleN01:
end;
}
-nguild_alde,30,248,4 script NGuild Aldebaran#a1-6::NGuildAlde 722,{
+nguild_alde,30,248,4 script NGuild Aldebaran#a1-6::NGuildAlde GUILD_FLAG,{
callfunc "F_Flags","Al De Baran","nguild_alde",218,170,0,1;
close;
@@ -79,20 +79,20 @@ OnRecvCastleN01:
end;
}
// In Castle ============================================
-nguild_alde,30,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-7 722
-nguild_alde,37,248,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-8 722
-nguild_alde,37,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-9 722
-nguild_alde,95,80,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-10 722
-nguild_alde,95,59,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-11 722
-nguild_alde,62,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-12 722
-nguild_alde,70,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-13 722
-nguild_alde,74,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-14 722
-nguild_alde,62,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-15 722
-nguild_alde,66,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-16 722
-nguild_alde,70,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-17 722
-nguild_alde,74,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-18 722
-nguild_alde,203,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-19 722
-nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 722
+nguild_alde,30,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-7 GUILD_FLAG
+nguild_alde,37,248,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-8 GUILD_FLAG
+nguild_alde,37,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-9 GUILD_FLAG
+nguild_alde,95,80,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-10 GUILD_FLAG
+nguild_alde,95,59,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-11 GUILD_FLAG
+nguild_alde,62,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-12 GUILD_FLAG
+nguild_alde,70,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-13 GUILD_FLAG
+nguild_alde,74,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-14 GUILD_FLAG
+nguild_alde,62,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-15 GUILD_FLAG
+nguild_alde,66,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-16 GUILD_FLAG
+nguild_alde,70,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-17 GUILD_FLAG
+nguild_alde,74,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-18 GUILD_FLAG
+nguild_alde,203,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-19 GUILD_FLAG
+nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 GUILD_FLAG
@@ -100,7 +100,7 @@ nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 722
//============================================================================//
// Castle 2
//============================================================================//
-n_castle,110,109,3 script NGuild Geffen#g1-1 722,{
+n_castle,110,109,3 script NGuild Geffen#g1-1 GUILD_FLAG,{
callfunc "F_Flags","Geffen","nguild_gef",83,47,1,1;
close;
@@ -109,7 +109,7 @@ OnRecvCastleN02:
end;
}
-nguild_gef,28,157,4 script NGuild Geffen#g1-6::NGuildGef 722,{
+nguild_gef,28,157,4 script NGuild Geffen#g1-6::NGuildGef GUILD_FLAG,{
callfunc "F_Flags","Geffen","nguild_gef",83,47,0,1;
close;
@@ -118,19 +118,19 @@ OnRecvCastleN02:
end;
}
// In Castle =============================================
-nguild_gef,32,157,4 duplicate(NGuildGef) NGuild Geffen#g1-7 722
-nguild_gef,22,156,5 duplicate(NGuildGef) NGuild Geffen#g1-8 722
-nguild_gef,68,185,3 duplicate(NGuildGef) NGuild Geffen#g1-9 722
-nguild_gef,17,171,5 duplicate(NGuildGef) NGuild Geffen#g1-10 722
-nguild_gef,59,16,4 duplicate(NGuildGef) NGuild Geffen#g1-11 722
-nguild_gef,64,16,4 duplicate(NGuildGef) NGuild Geffen#g1-12 722
+nguild_gef,32,157,4 duplicate(NGuildGef) NGuild Geffen#g1-7 GUILD_FLAG
+nguild_gef,22,156,5 duplicate(NGuildGef) NGuild Geffen#g1-8 GUILD_FLAG
+nguild_gef,68,185,3 duplicate(NGuildGef) NGuild Geffen#g1-9 GUILD_FLAG
+nguild_gef,17,171,5 duplicate(NGuildGef) NGuild Geffen#g1-10 GUILD_FLAG
+nguild_gef,59,16,4 duplicate(NGuildGef) NGuild Geffen#g1-11 GUILD_FLAG
+nguild_gef,64,16,4 duplicate(NGuildGef) NGuild Geffen#g1-12 GUILD_FLAG
//============================================================================//
// Castle 3
//============================================================================//
-n_castle,94,109,5 script NGuild Payon#f1-1 722,{
+n_castle,94,109,5 script NGuild Payon#f1-1 GUILD_FLAG,{
callfunc "F_Flags","Payon","nguild_pay",87,29,1,1;
close;
@@ -139,7 +139,7 @@ OnRecvCastleN03:
end;
}
-nguild_pay,238,67,4 script NGuild Payon#f1-6::NGuildPay 722,{
+nguild_pay,238,67,4 script NGuild Payon#f1-6::NGuildPay GUILD_FLAG,{
callfunc "F_Flags","Payon","nguild_pay",87,29,0,1;
close;
@@ -148,12 +148,12 @@ OnRecvCastleN03:
end;
}
// In Castle ===============================================
-nguild_pay,238,67,4 duplicate(NGuildPay) NGuild Payon#f1-6 722
-nguild_pay,233,67,4 duplicate(NGuildPay) NGuild Payon#f1-7 722
-nguild_pay,221,123,4 duplicate(NGuildPay) NGuild Payon#f1-8 722
-nguild_pay,221,116,4 duplicate(NGuildPay) NGuild Payon#f1-9 722
-nguild_pay,206,108,4 duplicate(NGuildPay) NGuild Payon#f1-10 722
-nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 722
+nguild_pay,238,67,4 duplicate(NGuildPay) NGuild Payon#f1-6 GUILD_FLAG
+nguild_pay,233,67,4 duplicate(NGuildPay) NGuild Payon#f1-7 GUILD_FLAG
+nguild_pay,221,123,4 duplicate(NGuildPay) NGuild Payon#f1-8 GUILD_FLAG
+nguild_pay,221,116,4 duplicate(NGuildPay) NGuild Payon#f1-9 GUILD_FLAG
+nguild_pay,206,108,4 duplicate(NGuildPay) NGuild Payon#f1-10 GUILD_FLAG
+nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 GUILD_FLAG
@@ -161,7 +161,7 @@ nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 722
//=============================================================================//
// Castle 4
//=============================================================================//
-n_castle,94,96,7 script NGuild Prontera#p1-1 722,{
+n_castle,94,96,7 script NGuild Prontera#p1-1 GUILD_FLAG,{
callfunc "F_Flags","Prontera","nguild_prt",97,174,1,1;
close;
@@ -170,7 +170,7 @@ OnRecvCastleN04:
end;
}
-nguild_prt,58,56,4 script NGuild Prontera#p1-7::NGuildPrt 722,{
+nguild_prt,58,56,4 script NGuild Prontera#p1-7::NGuildPrt GUILD_FLAG,{
callfunc "F_Flags","Prontera","nguild_prt",97,174,0,1;
close;
@@ -179,12 +179,12 @@ OnRecvCastleN04:
end;
}
// In Castle =============================================
-nguild_prt,64,56,4 duplicate(NGuildPrt) NGuild Prontera#p1-8 722
-nguild_prt,76,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-9 722
-nguild_prt,84,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-10 722
-nguild_prt,94,39,4 duplicate(NGuildPrt) NGuild Prontera#p1-11 722
-nguild_prt,94,24,4 duplicate(NGuildPrt) NGuild Prontera#p1-12 722
-nguild_prt,73,14,4 duplicate(NGuildPrt) NGuild Prontera#p1-13 722
-nguild_prt,73,6,4 duplicate(NGuildPrt) NGuild Prontera#p1-14 722
-nguild_prt,55,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-15 722
-nguild_prt,45,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-16 722
+nguild_prt,64,56,4 duplicate(NGuildPrt) NGuild Prontera#p1-8 GUILD_FLAG
+nguild_prt,76,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-9 GUILD_FLAG
+nguild_prt,84,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-10 GUILD_FLAG
+nguild_prt,94,39,4 duplicate(NGuildPrt) NGuild Prontera#p1-11 GUILD_FLAG
+nguild_prt,94,24,4 duplicate(NGuildPrt) NGuild Prontera#p1-12 GUILD_FLAG
+nguild_prt,73,14,4 duplicate(NGuildPrt) NGuild Prontera#p1-13 GUILD_FLAG
+nguild_prt,73,6,4 duplicate(NGuildPrt) NGuild Prontera#p1-14 GUILD_FLAG
+nguild_prt,55,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-15 GUILD_FLAG
+nguild_prt,45,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-16 GUILD_FLAG
diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt
index 11d748ab4..155c33792 100644
--- a/npc/events/nguild/nguild_kafras.txt
+++ b/npc/events/nguild/nguild_kafras.txt
@@ -32,7 +32,7 @@ L_StartG:
}
// Castle 1 ===============================================
-nguild_alde,218,170,0 script Kafra Service#N01 117,{
+nguild_alde,218,170,0 script Kafra Service#N01 4_F_KAFRA1,{
callfunc "F_GKafra", "nguild_alde", "Prontera";
end;
OnRecvCastleN01:
@@ -41,8 +41,8 @@ OnRecvCastleN01:
}
// Castle 2 ===============================================
-//nguild_gef,96,173,0 script Kafra Service#N02 117,{
-nguild_gef,35,37,0 script Kafra Service#N02 117,{
+//nguild_gef,96,173,0 script Kafra Service#N02 4_F_KAFRA1,{
+nguild_gef,35,37,0 script Kafra Service#N02 4_F_KAFRA1,{
callfunc "F_GKafra", "nguild_gef", "Prontera";
end;
OnRecvCastleN02:
@@ -51,7 +51,7 @@ OnRecvCastleN02:
}
// Castle 3 ===============================================
-nguild_pay,128,58,3 script Kafra Service#N03 117,{
+nguild_pay,128,58,3 script Kafra Service#N03 4_F_KAFRA1,{
callfunc "F_GKafra", "nguild_pay", "Prontera";
end;
OnRecvCastleN03:
@@ -60,7 +60,7 @@ OnRecvCastleN03:
}
// Castle 4 ===============================================
-nguild_prt,96,173,0 script Kafra Service#N04 117,{
+nguild_prt,96,173,0 script Kafra Service#N04 4_F_KAFRA1,{
callfunc "F_GKafra", "nguild_prt", "Prontera";
end;
OnRecvCastleN04:
diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt
index 0b35108f7..fd5fc6053 100644
--- a/npc/events/nguild/nguild_managers.txt
+++ b/npc/events/nguild/nguild_managers.txt
@@ -145,28 +145,28 @@ function script F_GldManager {
}
// Castle 1 ==================================================================================
-nguild_alde,218,175,0 script Frolo 55,{
+nguild_alde,218,175,0 script Frolo 1_M_JOBTESTER,{
callfunc "F_GldManager","Frolo","nguild_alde",119,223,"N01";
close;
}
// Castle 2 ==================================================================================
-nguild_gef,40,48,5 script Leiber 55,{
+nguild_gef,40,48,5 script Leiber 1_M_JOBTESTER,{
callfunc "F_GldManager","Leiber","nguild_gef",155,112,"N02";
close;
}
// Castle 3 ==================================================================================
-nguild_pay,120,58,4 script Dundar 55,{
+nguild_pay,120,58,4 script Dundar 1_M_JOBTESTER,{
callfunc "F_GldManager","Dundar","nguild_pay",290,7,"N03";
close;
}
// Castle 4 ==================================================================================
-nguild_prt,112,181,0 script Thefton 55,{
+nguild_prt,112,181,0 script Thefton 1_M_JOBTESTER,{
callfunc "F_GldManager","Thefton","nguild_prt",15,209,"N04";
close;
}
diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt
index 1c9443225..cc3d7db1e 100644
--- a/npc/events/nguild/nguild_treas.txt
+++ b/npc/events/nguild/nguild_treas.txt
@@ -83,7 +83,7 @@ OnDied:
}
// Treasure Room Switch --------------------
-nguild_alde,123,223,0 script Switch#TresN01 111,{
+nguild_alde,123,223,0 script Switch#TresN01 HIDDEN_NPC,{
callfunc "F_GldTreasSw", "nguild_alde",218,176;
end;
}
@@ -109,7 +109,7 @@ OnDied:
}
// Room Switch ---------------------------------------------------------
-nguild_gef,152,117,0 script Switch#TresN02 111,{
+nguild_gef,152,117,0 script Switch#TresN02 HIDDEN_NPC,{
callfunc "F_GldTreasSw","nguild_gef",40,49;
end;
}
@@ -134,7 +134,7 @@ OnDied:
}
// Treasure Room Switch ---------------------------------------------------
-nguild_pay,295,8,0 script Switch#TresN03 111,{
+nguild_pay,295,8,0 script Switch#TresN03 HIDDEN_NPC,{
callfunc "F_GldTreasSw", "nguild_pay",120,59;
end;
}
@@ -159,7 +159,7 @@ OnDied:
}
// Treasure Room Switch ----------------------------------------------------
-nguild_prt,15,209,0 script Switch#TresN04 111,{
+nguild_prt,15,209,0 script Switch#TresN04 HIDDEN_NPC,{
callfunc "F_GldTreasSw", "nguild_prt",109,179;
end;
}
diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt
index ac54c0716..61541d096 100644
--- a/npc/events/nguild/nguild_warper.txt
+++ b/npc/events/nguild/nguild_warper.txt
@@ -26,7 +26,7 @@
//= TODO: The official entrance is in Izlude.
//============================================================
-prontera,146,163,6 script Novice Castles 729,{
+prontera,146,163,6 script Novice Castles 4_F_NOVICE,{
mes "[Cita]";
if (!getcharid(2)) {
mes "^FF0000You have to enter a guild to be able to hit Emperium!^000000";
@@ -80,7 +80,7 @@ prontera,146,163,6 script Novice Castles 729,{
close;
}
-n_castle,102,107,5 script Cita 729,{
+n_castle,102,107,5 script Cita 4_F_NOVICE,{
mes "[Cita]";
mes "Hello, "+ strcharinfo(0) +". Can I help you?";
next;
diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt
index 1e0505ffd..7745adb9b 100644
--- a/npc/events/twintowers.txt
+++ b/npc/events/twintowers.txt
@@ -13,7 +13,7 @@
//= 1.6 Fixed wrong sprite id on main npc [ultramage]
//============================================================
-prontera,146,92,4 script Twin Towers#tt1::Twin-Towers 812,{
+prontera,146,92,4 script Twin Towers#tt1::Twin-Towers TW_TOWER,{
mes "[Twin Towers]";
mes "How are you? We are the Twin Towers.";
mes "It is such a pleasure to be able to meet you here.";
@@ -84,10 +84,10 @@ prontera,146,92,4 script Twin Towers#tt1::Twin-Towers 812,{
close;
}
-morocc,160,97,4 duplicate(Twin-Towers) Twin Towers#tt2 812
-payon,176,226,4 duplicate(Twin-Towers) Twin Towers#tt3 812
-izlude,134,92,4 duplicate(Twin-Towers) Twin Towers#tt4 812
-alberta,25,238,4 duplicate(Twin-Towers) Twin Towers#tt5 812
-geffen,120,60,4 duplicate(Twin-Towers) Twin Towers#tt6 812
-aldebaran,143,116,4 duplicate(Twin-Towers) Twin Towers#tt7 812
-comodo,194,158,4 duplicate(Twin-Towers) Twin Towers#tt8 812
+morocc,160,97,4 duplicate(Twin-Towers) Twin Towers#tt2 TW_TOWER
+payon,176,226,4 duplicate(Twin-Towers) Twin Towers#tt3 TW_TOWER
+izlude,134,92,4 duplicate(Twin-Towers) Twin Towers#tt4 TW_TOWER
+alberta,25,238,4 duplicate(Twin-Towers) Twin Towers#tt5 TW_TOWER
+geffen,120,60,4 duplicate(Twin-Towers) Twin Towers#tt6 TW_TOWER
+aldebaran,143,116,4 duplicate(Twin-Towers) Twin Towers#tt7 TW_TOWER
+comodo,194,158,4 duplicate(Twin-Towers) Twin Towers#tt8 TW_TOWER
diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt
index 8f2bd85d5..e7f144102 100644
--- a/npc/events/valentinesday.txt
+++ b/npc/events/valentinesday.txt
@@ -15,7 +15,7 @@
// Stephen - Valentine Event Chocolate seller
//============================================================
-alberta,26,243,4 script Stephen 58,{
+alberta,26,243,4 script Stephen 1_M_MERCHANT,{
mes "[Stephen]";
mes "Guess what I've got?";
mes "A tasty treat not easily found in Rune-Midgard....";
@@ -59,7 +59,7 @@ alberta,26,243,4 script Stephen 58,{
// Jainie -- Gives information about Valentine Event
//============================================================
-alberta,29,243,4 script Jainie 53,{
+alberta,29,243,4 script Jainie 1_M_INNKEEPER,{
mes "[Jainie]";
mes "You know what? The chocolate that my boyfriend sells are from me!";
mes "I made them by myself.";
@@ -83,7 +83,7 @@ alberta,29,243,4 script Jainie 53,{
// Carl Orleans -- Valentine Event Chocolate maker
//============================================================
-prt_castle,54,34,4 script Carl Orleans 47,{
+prt_castle,54,34,4 script Carl Orleans 1_M_01,{
mes "[Carl Orleans]";
mes "Yes?";
next;
diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt
index 8c5dd4432..2e02c124c 100644
--- a/npc/events/valentinesday_2009.txt
+++ b/npc/events/valentinesday_2009.txt
@@ -23,7 +23,7 @@
// Marco Bassinio (Chocolate/Chocolate Box maker)
//============================================================
-prontera,164,174,4 script Trader#Val09 58,{
+prontera,164,174,4 script Trader#Val09 1_M_MERCHANT,{
mes "[Marco Bassinio]";
mes "Hey, folks! Here's something you don't see everyday!";
mes "Something you can never find in Rune-Midgarts!";
@@ -160,7 +160,7 @@ prontera,164,174,4 script Trader#Val09 58,{
// Packs Trader (Sells Wrapping Paper, Lace, and Box)
//============================================================
-prontera,147,171,5 script Packs Trader#Val09 58,{
+prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{
mes "[Packs Trader]";
mes "Hello.";
mes "I am a Packs Trader, I sell paper boxes and supplies for packing presents.";
@@ -304,7 +304,7 @@ prontera,147,171,5 script Packs Trader#Val09 58,{
// Event Ring Maker (Makes ring for players)
//============================================================
-prontera,154,185,5 script Event Ring Maker#Val09 721,{
+prontera,154,185,5 script Event Ring Maker#Val09 4_F_KAFRA7,{
if (BaseLevel < 75) {
mes "[Event Ring Maker]";
mes "Hello, I only make the Valentine rings to those experienced adventurer Level 75 or above.";
@@ -398,7 +398,7 @@ prontera,154,185,5 script Event Ring Maker#Val09 721,{
// Valentine Vote Manager (Registers votes)
//============================================================
-prontera,157,185,4 script Valentine Vote Manager#v 113,{
+prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{
mes "[Valentine Vote Manager]";
mes "Hello, I'm the Valentine's Vote Manager.";
mes "I'm in charge of collecting rings for this event!";
@@ -519,7 +519,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{
// Charles Orleans (Makes Home-Made Chocolates)
//============================================================
-prt_castle,42,35,3 script Dessert Manager#Val09 47,{
+prt_castle,42,35,3 script Dessert Manager#Val09 1_M_01,{
if (Sex) {
mes "[Charles Orleans]";
mes "Monsieur~! What brings you to my beautiful atelier?";
diff --git a/npc/events/valentinesday_2012.txt b/npc/events/valentinesday_2012.txt
index a8597cd22..cf1625891 100644
--- a/npc/events/valentinesday_2012.txt
+++ b/npc/events/valentinesday_2012.txt
@@ -12,7 +12,7 @@
//= 1.1 Standardized and fixed. [Euphy]
//============================================================
-mosk_in,21,246,5 script Pinkamenia 71,{
+mosk_in,21,246,5 script Pinkamenia 1_F_LIBRARYGIRL,{
set .@n$,"^0000FF[Pinkamenia]^000000";
if (#V_QUE12==3) {
set .@LFlowerID,7864;
@@ -104,7 +104,7 @@ OnInit:
end;
}
-mosk_in,21,244,3 script Baker Extraordinaire 410,{
+mosk_in,21,244,3 script Baker Extraordinaire 4_M_NOVELIST,{
set .@n$,"^0000FF[Baker Extraordinaire]^000000";
if(#V_QUE12==3) {
mes .@n$;
diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt
index d0acc8426..7e921ed97 100644
--- a/npc/events/whiteday.txt
+++ b/npc/events/whiteday.txt
@@ -11,7 +11,7 @@
//= Converted to rAthena format by Dr.Evil
//============================================================
-alberta,188,64,4 script Sugar 91,{
+alberta,188,64,4 script Sugar 4_F_02,{
set @maplenum,0;
set @mapleItemID,0;
set @maplePrice,0;
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index 99b3fdec9..37b91e6e0 100644
--- a/npc/events/xmas.txt
+++ b/npc/events/xmas.txt
@@ -20,7 +20,7 @@
//= 1.4 Added a fix to make Lutie & Bard quests passable during this event [Lupus]
//============================================================
-xmas_in,100,96,4 script Father Christmas::Santa2 718,{
+xmas_in,100,96,4 script Father Christmas::Santa2 4_M_SANTA,{
mes "[Santa Claus]";
if(xmas_npc==0) set xmas_npc, 1; // For Lutie & Bard quest
if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start;
diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt
index 0707d4725..537dce7a4 100644
--- a/npc/guild/aldeg_cas01.txt
+++ b/npc/guild/aldeg_cas01.txt
@@ -14,7 +14,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Neuschwanstein#1::OutsideFlagsA1 722,{
+- script Neuschwanstein#1::OutsideFlagsA1 GUILD_FLAG,{
set .@GID, GetCastleData("aldeg_cas01",1);
@@ -64,14 +64,14 @@ OnRecvCastleA01:
end;
}
-alde_gld,61,87,6 duplicate(OutsideFlagsA1) Neuschwanstein#1-2 722
-alde_gld,61,79,6 duplicate(OutsideFlagsA1) Neuschwanstein#2 722
-alde_gld,45,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#3 722
-alde_gld,51,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#4 722
+alde_gld,61,87,6 duplicate(OutsideFlagsA1) Neuschwanstein#1-2 GUILD_FLAG
+alde_gld,61,79,6 duplicate(OutsideFlagsA1) Neuschwanstein#2 GUILD_FLAG
+alde_gld,45,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#3 GUILD_FLAG
+alde_gld,51,87,8 duplicate(OutsideFlagsA1) Neuschwanstein#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Neuschwanstein#5::InsideFlagsA1 722,{
+- script Neuschwanstein#5::InsideFlagsA1 GUILD_FLAG,{
end;
OnRecvCastleA01:
@@ -79,40 +79,40 @@ OnRecvCastleA01:
end;
}
-aldeg_cas01,30,248,4 duplicate(InsideFlagsA1) Neuschwanstein#5-2 722
-aldeg_cas01,30,248,4 duplicate(InsideFlagsA1) Neuschwanstein#6 722
-aldeg_cas01,37,248,4 duplicate(InsideFlagsA1) Neuschwanstein#7 722
-aldeg_cas01,37,246,4 duplicate(InsideFlagsA1) Neuschwanstein#8 722
-aldeg_cas01,30,246,4 duplicate(InsideFlagsA1) Neuschwanstein#9 722
-aldeg_cas01,95,80,2 duplicate(InsideFlagsA1) Neuschwanstein#10 722
-aldeg_cas01,95,59,2 duplicate(InsideFlagsA1) Neuschwanstein#11 722
-aldeg_cas01,62,75,2 duplicate(InsideFlagsA1) Neuschwanstein#12 722
-aldeg_cas01,66,75,2 duplicate(InsideFlagsA1) Neuschwanstein#13 722
-aldeg_cas01,70,75,2 duplicate(InsideFlagsA1) Neuschwanstein#14 722
-aldeg_cas01,74,75,2 duplicate(InsideFlagsA1) Neuschwanstein#15 722
-aldeg_cas01,62,64,2 duplicate(InsideFlagsA1) Neuschwanstein#16 722
-aldeg_cas01,66,64,2 duplicate(InsideFlagsA1) Neuschwanstein#17 722
-aldeg_cas01,70,64,2 duplicate(InsideFlagsA1) Neuschwanstein#18 722
-aldeg_cas01,74,64,2 duplicate(InsideFlagsA1) Neuschwanstein#19 722
-aldeg_cas01,74,64,2 duplicate(InsideFlagsA1) Neuschwanstein#20 722
-aldeg_cas01,203,150,4 duplicate(InsideFlagsA1) Neuschwanstein#21 722
-aldeg_cas01,210,150,4 duplicate(InsideFlagsA1) Neuschwanstein#22 722
+aldeg_cas01,30,248,4 duplicate(InsideFlagsA1) Neuschwanstein#5-2 GUILD_FLAG
+aldeg_cas01,30,248,4 duplicate(InsideFlagsA1) Neuschwanstein#6 GUILD_FLAG
+aldeg_cas01,37,248,4 duplicate(InsideFlagsA1) Neuschwanstein#7 GUILD_FLAG
+aldeg_cas01,37,246,4 duplicate(InsideFlagsA1) Neuschwanstein#8 GUILD_FLAG
+aldeg_cas01,30,246,4 duplicate(InsideFlagsA1) Neuschwanstein#9 GUILD_FLAG
+aldeg_cas01,95,80,2 duplicate(InsideFlagsA1) Neuschwanstein#10 GUILD_FLAG
+aldeg_cas01,95,59,2 duplicate(InsideFlagsA1) Neuschwanstein#11 GUILD_FLAG
+aldeg_cas01,62,75,2 duplicate(InsideFlagsA1) Neuschwanstein#12 GUILD_FLAG
+aldeg_cas01,66,75,2 duplicate(InsideFlagsA1) Neuschwanstein#13 GUILD_FLAG
+aldeg_cas01,70,75,2 duplicate(InsideFlagsA1) Neuschwanstein#14 GUILD_FLAG
+aldeg_cas01,74,75,2 duplicate(InsideFlagsA1) Neuschwanstein#15 GUILD_FLAG
+aldeg_cas01,62,64,2 duplicate(InsideFlagsA1) Neuschwanstein#16 GUILD_FLAG
+aldeg_cas01,66,64,2 duplicate(InsideFlagsA1) Neuschwanstein#17 GUILD_FLAG
+aldeg_cas01,70,64,2 duplicate(InsideFlagsA1) Neuschwanstein#18 GUILD_FLAG
+aldeg_cas01,74,64,2 duplicate(InsideFlagsA1) Neuschwanstein#19 GUILD_FLAG
+aldeg_cas01,74,64,2 duplicate(InsideFlagsA1) Neuschwanstein#20 GUILD_FLAG
+aldeg_cas01,203,150,4 duplicate(InsideFlagsA1) Neuschwanstein#21 GUILD_FLAG
+aldeg_cas01,210,150,4 duplicate(InsideFlagsA1) Neuschwanstein#22 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-aldebaran,152,97,4 duplicate(InsideFlagsA1) Neuschwanstein#23 722
+aldebaran,152,97,4 duplicate(InsideFlagsA1) Neuschwanstein#23 GUILD_FLAG
// Kafra Employee
//============================================================
-aldeg_cas01,218,170,0 duplicate(guildkafra) Kafra Staff#aldeg_cas01 117
+aldeg_cas01,218,170,0 duplicate(guildkafra) Kafra Staff#aldeg_cas01 4_F_KAFRA1
// Steward
//============================================================
-aldeg_cas01,218,175,0 duplicate(cm) Alfredo#aldeg_cas01 55
+aldeg_cas01,218,175,0 duplicate(cm) Alfredo#aldeg_cas01 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-aldeg_cas01,123,223,0 script #lever_A01 111,{
+aldeg_cas01,123,223,0 script #lever_A01 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -127,7 +127,7 @@ aldeg_cas01,123,223,0 script #lever_A01 111,{
// Guild Dungeon Switch
//============================================================
-aldeg_cas01,211,181,0 duplicate(gdlever) #aldeg_cas01 111
+aldeg_cas01,211,181,0 duplicate(gdlever) #aldeg_cas01 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt
index 06371f14d..c5c03175f 100644
--- a/npc/guild/aldeg_cas02.txt
+++ b/npc/guild/aldeg_cas02.txt
@@ -14,7 +14,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Hohenschwangau#1::OutsideFlagsA2 722,{
+- script Hohenschwangau#1::OutsideFlagsA2 GUILD_FLAG,{
set .@GID, GetCastleData("aldeg_cas02",1);
@@ -64,12 +64,12 @@ OnRecvCastleA02:
end;
}
-alde_gld,99,251,4 duplicate(OutsideFlagsA2) Hohenschwangau#1-2 722
-alde_gld,99,244,4 duplicate(OutsideFlagsA2) Hohenschwangau#2 722
+alde_gld,99,251,4 duplicate(OutsideFlagsA2) Hohenschwangau#1-2 GUILD_FLAG
+alde_gld,99,244,4 duplicate(OutsideFlagsA2) Hohenschwangau#2 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Hohenschwangau#3::InsideFlagsA2 722,{
+- script Hohenschwangau#3::InsideFlagsA2 GUILD_FLAG,{
end;
OnRecvCastleA02:
@@ -77,36 +77,36 @@ OnRecvCastleA02:
end;
}
-aldeg_cas02,82,71,2 duplicate(InsideFlagsA2) Hohenschwangau#3-2 722
-aldeg_cas02,67,30,2 duplicate(InsideFlagsA2) Hohenschwangau#4 722
-aldeg_cas02,183,140,2 duplicate(InsideFlagsA2) Hohenschwangau#5 722
-aldeg_cas02,212,152,2 duplicate(InsideFlagsA2) Hohenschwangau#6 722
-aldeg_cas02,108,39,2 duplicate(InsideFlagsA2) Hohenschwangau#7 722
-aldeg_cas02,57,213,2 duplicate(InsideFlagsA2) Hohenschwangau#8 722
-aldeg_cas02,103,53,2 duplicate(InsideFlagsA2) Hohenschwangau#9 722
-aldeg_cas02,73,53,2 duplicate(InsideFlagsA2) Hohenschwangau#10 722
-aldeg_cas02,63,41,2 duplicate(InsideFlagsA2) Hohenschwangau#11 722
-aldeg_cas02,229,6,2 duplicate(InsideFlagsA2) Hohenschwangau#12 722
-aldeg_cas02,230,40,2 duplicate(InsideFlagsA2) Hohenschwangau#13 722
-aldeg_cas02,197,40,2 duplicate(InsideFlagsA2) Hohenschwangau#14 722
-aldeg_cas02,32,213,2 duplicate(InsideFlagsA2) Hohenschwangau#15 722
-aldeg_cas02,121,29,2 duplicate(InsideFlagsA2) Hohenschwangau#16 722
+aldeg_cas02,82,71,2 duplicate(InsideFlagsA2) Hohenschwangau#3-2 GUILD_FLAG
+aldeg_cas02,67,30,2 duplicate(InsideFlagsA2) Hohenschwangau#4 GUILD_FLAG
+aldeg_cas02,183,140,2 duplicate(InsideFlagsA2) Hohenschwangau#5 GUILD_FLAG
+aldeg_cas02,212,152,2 duplicate(InsideFlagsA2) Hohenschwangau#6 GUILD_FLAG
+aldeg_cas02,108,39,2 duplicate(InsideFlagsA2) Hohenschwangau#7 GUILD_FLAG
+aldeg_cas02,57,213,2 duplicate(InsideFlagsA2) Hohenschwangau#8 GUILD_FLAG
+aldeg_cas02,103,53,2 duplicate(InsideFlagsA2) Hohenschwangau#9 GUILD_FLAG
+aldeg_cas02,73,53,2 duplicate(InsideFlagsA2) Hohenschwangau#10 GUILD_FLAG
+aldeg_cas02,63,41,2 duplicate(InsideFlagsA2) Hohenschwangau#11 GUILD_FLAG
+aldeg_cas02,229,6,2 duplicate(InsideFlagsA2) Hohenschwangau#12 GUILD_FLAG
+aldeg_cas02,230,40,2 duplicate(InsideFlagsA2) Hohenschwangau#13 GUILD_FLAG
+aldeg_cas02,197,40,2 duplicate(InsideFlagsA2) Hohenschwangau#14 GUILD_FLAG
+aldeg_cas02,32,213,2 duplicate(InsideFlagsA2) Hohenschwangau#15 GUILD_FLAG
+aldeg_cas02,121,29,2 duplicate(InsideFlagsA2) Hohenschwangau#16 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-aldebaran,149,97,4 duplicate(InsideFlagsA2) Hohenschwangau#17 722
+aldebaran,149,97,4 duplicate(InsideFlagsA2) Hohenschwangau#17 GUILD_FLAG
// Kafra Employee
//============================================================
-aldeg_cas02,84,74,0 duplicate(guildkafra) Kafra Staff#aldeg_cas02 117
+aldeg_cas02,84,74,0 duplicate(guildkafra) Kafra Staff#aldeg_cas02 4_F_KAFRA1
// Steward
//============================================================
-aldeg_cas02,78,74,0 duplicate(cm) Chenchenlie#aldeg_cas02 55
+aldeg_cas02,78,74,0 duplicate(cm) Chenchenlie#aldeg_cas02 1_M_JOBTESTER
// Treasure Room Lever
//============================================================
-aldeg_cas02,139,234,0 script #lever_A02 111,{
+aldeg_cas02,139,234,0 script #lever_A02 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ aldeg_cas02,139,234,0 script #lever_A02 111,{
// Guild Dungeon Lever
//============================================================
-aldeg_cas02,194,136,0 duplicate(gdlever) #aldeg_cas02 111
+aldeg_cas02,194,136,0 duplicate(gdlever) #aldeg_cas02 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt
index 299ffdadc..d36ed707e 100644
--- a/npc/guild/aldeg_cas03.txt
+++ b/npc/guild/aldeg_cas03.txt
@@ -14,7 +14,7 @@
// Guild Flag (Outside Castle)
//============================================================
-- script Nuernberg#1::OutsideFlagsA3 722,{
+- script Nuernberg#1::OutsideFlagsA3 GUILD_FLAG,{
set .@GID, GetCastleData("aldeg_cas03",1);
@@ -64,12 +64,12 @@ OnRecvCastleA03:
end;
}
-alde_gld,146,82,8 duplicate(OutsideFlagsA3) Nuernberg#1-2 722
-alde_gld,138,82,8 duplicate(OutsideFlagsA3) Nuernberg#2 722
+alde_gld,146,82,8 duplicate(OutsideFlagsA3) Nuernberg#1-2 GUILD_FLAG
+alde_gld,138,82,8 duplicate(OutsideFlagsA3) Nuernberg#2 GUILD_FLAG
// Guild Flag (Inside Castle)
//============================================================
-- script Nuernberg#3::InsideFlagsA3 722,{
+- script Nuernberg#3::InsideFlagsA3 GUILD_FLAG,{
end;
OnRecvCastleA03:
@@ -77,39 +77,39 @@ OnRecvCastleA03:
end;
}
-aldeg_cas03,176,175,2 duplicate(InsideFlagsA3) Nuernberg#3-2 722
-aldeg_cas03,77,115,2 duplicate(InsideFlagsA3) Nuernberg#4 722
-aldeg_cas03,77,215,2 duplicate(InsideFlagsA3) Nuernberg#5 722
-aldeg_cas03,112,107,2 duplicate(InsideFlagsA3) Nuernberg#6 722
-aldeg_cas03,112,117,2 duplicate(InsideFlagsA3) Nuernberg#7 722
-aldeg_cas03,69,71,2 duplicate(InsideFlagsA3) Nuernberg#8 722
-aldeg_cas03,91,69,2 duplicate(InsideFlagsA3) Nuernberg#9 722
-aldeg_cas03,108,60,2 duplicate(InsideFlagsA3) Nuernberg#10 722
-aldeg_cas03,121,73,2 duplicate(InsideFlagsA3) Nuernberg#11 722
-aldeg_cas03,121,73,2 duplicate(InsideFlagsA3) Nuernberg#12 722
-aldeg_cas03,75,102,2 duplicate(InsideFlagsA3) Nuernberg#13 722
-aldeg_cas03,199,169,2 duplicate(InsideFlagsA3) Nuernberg#14 722
-aldeg_cas03,181,179,2 duplicate(InsideFlagsA3) Nuernberg#15 722
-aldeg_cas03,192,44,2 duplicate(InsideFlagsA3) Nuernberg#16 722
-aldeg_cas03,208,145,2 duplicate(InsideFlagsA3) Nuernberg#17 722
-aldeg_cas03,207,75,2 duplicate(InsideFlagsA3) Nuernberg#18 722
-aldeg_cas03,96,62,2 duplicate(InsideFlagsA3) Nuernberg#19 722
+aldeg_cas03,176,175,2 duplicate(InsideFlagsA3) Nuernberg#3-2 GUILD_FLAG
+aldeg_cas03,77,115,2 duplicate(InsideFlagsA3) Nuernberg#4 GUILD_FLAG
+aldeg_cas03,77,215,2 duplicate(InsideFlagsA3) Nuernberg#5 GUILD_FLAG
+aldeg_cas03,112,107,2 duplicate(InsideFlagsA3) Nuernberg#6 GUILD_FLAG
+aldeg_cas03,112,117,2 duplicate(InsideFlagsA3) Nuernberg#7 GUILD_FLAG
+aldeg_cas03,69,71,2 duplicate(InsideFlagsA3) Nuernberg#8 GUILD_FLAG
+aldeg_cas03,91,69,2 duplicate(InsideFlagsA3) Nuernberg#9 GUILD_FLAG
+aldeg_cas03,108,60,2 duplicate(InsideFlagsA3) Nuernberg#10 GUILD_FLAG
+aldeg_cas03,121,73,2 duplicate(InsideFlagsA3) Nuernberg#11 GUILD_FLAG
+aldeg_cas03,121,73,2 duplicate(InsideFlagsA3) Nuernberg#12 GUILD_FLAG
+aldeg_cas03,75,102,2 duplicate(InsideFlagsA3) Nuernberg#13 GUILD_FLAG
+aldeg_cas03,199,169,2 duplicate(InsideFlagsA3) Nuernberg#14 GUILD_FLAG
+aldeg_cas03,181,179,2 duplicate(InsideFlagsA3) Nuernberg#15 GUILD_FLAG
+aldeg_cas03,192,44,2 duplicate(InsideFlagsA3) Nuernberg#16 GUILD_FLAG
+aldeg_cas03,208,145,2 duplicate(InsideFlagsA3) Nuernberg#17 GUILD_FLAG
+aldeg_cas03,207,75,2 duplicate(InsideFlagsA3) Nuernberg#18 GUILD_FLAG
+aldeg_cas03,96,62,2 duplicate(InsideFlagsA3) Nuernberg#19 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-aldebaran,134,97,4 duplicate(InsideFlagsA3) Nuernberg#20 722
+aldebaran,134,97,4 duplicate(InsideFlagsA3) Nuernberg#20 GUILD_FLAG
// Kafra Employee
//============================================================
-aldeg_cas03,118,76,0 duplicate(guildkafra) Kafra Staff#aldeg_cas03 117
+aldeg_cas03,118,76,0 duplicate(guildkafra) Kafra Staff#aldeg_cas03 4_F_KAFRA1
// Steward
//============================================================
-aldeg_cas03,110,118,0 duplicate(cm) Nahzarf#aldeg_cas03 55
+aldeg_cas03,110,118,0 duplicate(cm) Nahzarf#aldeg_cas03 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-aldeg_cas03,229,267,0 script #lever_A03 111,{
+aldeg_cas03,229,267,0 script #lever_A03 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -124,7 +124,7 @@ aldeg_cas03,229,267,0 script #lever_A03 111,{
// Guild Dungeon Switch
//============================================================
-aldeg_cas03,200,177,0 duplicate(gdlever) #aldeg_cas03 111
+aldeg_cas03,200,177,0 duplicate(gdlever) #aldeg_cas03 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt
index 91e38c96d..30009c707 100644
--- a/npc/guild/aldeg_cas04.txt
+++ b/npc/guild/aldeg_cas04.txt
@@ -14,7 +14,7 @@
// Guild Flag (Outside Castle)
//============================================================
-- script Wuerzburg#1::OutsideFlagsA4 722,{
+- script Wuerzburg#1::OutsideFlagsA4 GUILD_FLAG,{
set .@GID, GetCastleData("aldeg_cas04",1);
@@ -64,12 +64,12 @@ OnRecvCastleA04:
end;
}
-alde_gld,239,246,2 duplicate(OutsideFlagsA4) Wuerzburg#1-2 722
-alde_gld,239,239,2 duplicate(OutsideFlagsA4) Wuerzburg#2 722
+alde_gld,239,246,2 duplicate(OutsideFlagsA4) Wuerzburg#1-2 GUILD_FLAG
+alde_gld,239,239,2 duplicate(OutsideFlagsA4) Wuerzburg#2 GUILD_FLAG
// Guild Flag (Inside Castle)
//============================================================
-- script Wuerzburg#3::InsideFlagsA4 722,{
+- script Wuerzburg#3::InsideFlagsA4 GUILD_FLAG,{
end;
OnRecvCastleA04:
@@ -77,39 +77,39 @@ OnRecvCastleA04:
end;
}
-aldeg_cas04,167,61,2 duplicate(InsideFlagsA4) Wuerzburg#3-2 722
-aldeg_cas04,164,90,2 duplicate(InsideFlagsA4) Wuerzburg#4 722
-aldeg_cas04,129,193,2 duplicate(InsideFlagsA4) Wuerzburg#5 722
-aldeg_cas04,112,206,2 duplicate(InsideFlagsA4) Wuerzburg#6 722
-aldeg_cas04,113,212,2 duplicate(InsideFlagsA4) Wuerzburg#7 722
-aldeg_cas04,77,117,2 duplicate(InsideFlagsA4) Wuerzburg#8 722
-aldeg_cas04,186,42,2 duplicate(InsideFlagsA4) Wuerzburg#9 722
-aldeg_cas04,30,69,2 duplicate(InsideFlagsA4) Wuerzburg#10 722
-aldeg_cas04,55,97,2 duplicate(InsideFlagsA4) Wuerzburg#11 722
-aldeg_cas04,45,98,2 duplicate(InsideFlagsA4) Wuerzburg#12 722
-aldeg_cas04,33,116,2 duplicate(InsideFlagsA4) Wuerzburg#13 722
-aldeg_cas04,130,180,2 duplicate(InsideFlagsA4) Wuerzburg#14 722
-aldeg_cas04,129,193,2 duplicate(InsideFlagsA4) Wuerzburg#15 722
-aldeg_cas04,33,107,2 duplicate(InsideFlagsA4) Wuerzburg#16 722
-aldeg_cas04,133,220,2 duplicate(InsideFlagsA4) Wuerzburg#17 722
-aldeg_cas04,169,22,2 duplicate(InsideFlagsA4) Wuerzburg#18 722
-aldeg_cas04,169,15,2 duplicate(InsideFlagsA4) Wuerzburg#19 722
+aldeg_cas04,167,61,2 duplicate(InsideFlagsA4) Wuerzburg#3-2 GUILD_FLAG
+aldeg_cas04,164,90,2 duplicate(InsideFlagsA4) Wuerzburg#4 GUILD_FLAG
+aldeg_cas04,129,193,2 duplicate(InsideFlagsA4) Wuerzburg#5 GUILD_FLAG
+aldeg_cas04,112,206,2 duplicate(InsideFlagsA4) Wuerzburg#6 GUILD_FLAG
+aldeg_cas04,113,212,2 duplicate(InsideFlagsA4) Wuerzburg#7 GUILD_FLAG
+aldeg_cas04,77,117,2 duplicate(InsideFlagsA4) Wuerzburg#8 GUILD_FLAG
+aldeg_cas04,186,42,2 duplicate(InsideFlagsA4) Wuerzburg#9 GUILD_FLAG
+aldeg_cas04,30,69,2 duplicate(InsideFlagsA4) Wuerzburg#10 GUILD_FLAG
+aldeg_cas04,55,97,2 duplicate(InsideFlagsA4) Wuerzburg#11 GUILD_FLAG
+aldeg_cas04,45,98,2 duplicate(InsideFlagsA4) Wuerzburg#12 GUILD_FLAG
+aldeg_cas04,33,116,2 duplicate(InsideFlagsA4) Wuerzburg#13 GUILD_FLAG
+aldeg_cas04,130,180,2 duplicate(InsideFlagsA4) Wuerzburg#14 GUILD_FLAG
+aldeg_cas04,129,193,2 duplicate(InsideFlagsA4) Wuerzburg#15 GUILD_FLAG
+aldeg_cas04,33,107,2 duplicate(InsideFlagsA4) Wuerzburg#16 GUILD_FLAG
+aldeg_cas04,133,220,2 duplicate(InsideFlagsA4) Wuerzburg#17 GUILD_FLAG
+aldeg_cas04,169,22,2 duplicate(InsideFlagsA4) Wuerzburg#18 GUILD_FLAG
+aldeg_cas04,169,15,2 duplicate(InsideFlagsA4) Wuerzburg#19 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-aldebaran,131,97,4 duplicate(InsideFlagsA4) Wuerzburg#20 722
+aldebaran,131,97,4 duplicate(InsideFlagsA4) Wuerzburg#20 GUILD_FLAG
// Kafra Employee
//============================================================
-aldeg_cas04,45,88,0 duplicate(guildkafra) Kafra Staff#aldeg_cas04 117
+aldeg_cas04,45,88,0 duplicate(guildkafra) Kafra Staff#aldeg_cas04 4_F_KAFRA1
// Steward
//============================================================
-aldeg_cas04,67,116,0 duplicate(cm) Brymhensen#aldeg_cas04 55
+aldeg_cas04,67,116,0 duplicate(cm) Brymhensen#aldeg_cas04 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-aldeg_cas04,83,17,0 script #lever_A04 111,{
+aldeg_cas04,83,17,0 script #lever_A04 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -124,7 +124,7 @@ aldeg_cas04,83,17,0 script #lever_A04 111,{
// Guild Dungeon Switch
//============================================================
-aldeg_cas04,76,64,0 duplicate(gdlever) #aldeg_cas04 111
+aldeg_cas04,76,64,0 duplicate(gdlever) #aldeg_cas04 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt
index 85bb272f1..d6ddabfda 100644
--- a/npc/guild/aldeg_cas05.txt
+++ b/npc/guild/aldeg_cas05.txt
@@ -14,7 +14,7 @@
// Guild Flag (Outside Castle)
//============================================================
-- script Rothenburg#1::OutsideFlagsA5 722,{
+- script Rothenburg#1::OutsideFlagsA5 GUILD_FLAG,{
set .@GID, GetCastleData("aldeg_cas05",1);
@@ -64,12 +64,12 @@ OnRecvCastleA05:
end;
}
-alde_gld,265,93,6 duplicate(OutsideFlagsA5) Rothenburg#1-2 722
-alde_gld,265,87,6 duplicate(OutsideFlagsA5) Rothenburg#2 722
+alde_gld,265,93,6 duplicate(OutsideFlagsA5) Rothenburg#1-2 GUILD_FLAG
+alde_gld,265,87,6 duplicate(OutsideFlagsA5) Rothenburg#2 GUILD_FLAG
// Guild Flag (Inside Castle)
//============================================================
-- script Rothenburg#3::InsideFlagsA5 722,{
+- script Rothenburg#3::InsideFlagsA5 GUILD_FLAG,{
end;
OnRecvCastleA05:
@@ -77,38 +77,38 @@ OnRecvCastleA05:
end;
}
-aldeg_cas05,170,85,2 duplicate(InsideFlagsA5) Rothenburg#3-2 722
-aldeg_cas05,142,212,2 duplicate(InsideFlagsA5) Rothenburg#4 722
-aldeg_cas05,149,196,2 duplicate(InsideFlagsA5) Rothenburg#5 722
-aldeg_cas05,41,180,2 duplicate(InsideFlagsA5) Rothenburg#6 722
-aldeg_cas05,38,201,2 duplicate(InsideFlagsA5) Rothenburg#7 722
-aldeg_cas05,65,182,2 duplicate(InsideFlagsA5) Rothenburg#8 722
-aldeg_cas05,65,205,2 duplicate(InsideFlagsA5) Rothenburg#9 722
-aldeg_cas05,10,218,2 duplicate(InsideFlagsA5) Rothenburg#10 722
-aldeg_cas05,10,218,2 duplicate(InsideFlagsA5) Rothenburg#11 722
-aldeg_cas05,164,201,2 duplicate(InsideFlagsA5) Rothenburg#12 722
-aldeg_cas05,14,117,2 duplicate(InsideFlagsA5) Rothenburg#13 722
-aldeg_cas05,10,225,2 duplicate(InsideFlagsA5) Rothenburg#14 722
-aldeg_cas05,187,59,2 duplicate(InsideFlagsA5) Rothenburg#15 722
-aldeg_cas05,154,51,2 duplicate(InsideFlagsA5) Rothenburg#16 722
-aldeg_cas05,22,211,2 duplicate(InsideFlagsA5) Rothenburg#17 722
-aldeg_cas05,150,202,2 duplicate(InsideFlagsA5) Rothenburg#18 722
+aldeg_cas05,170,85,2 duplicate(InsideFlagsA5) Rothenburg#3-2 GUILD_FLAG
+aldeg_cas05,142,212,2 duplicate(InsideFlagsA5) Rothenburg#4 GUILD_FLAG
+aldeg_cas05,149,196,2 duplicate(InsideFlagsA5) Rothenburg#5 GUILD_FLAG
+aldeg_cas05,41,180,2 duplicate(InsideFlagsA5) Rothenburg#6 GUILD_FLAG
+aldeg_cas05,38,201,2 duplicate(InsideFlagsA5) Rothenburg#7 GUILD_FLAG
+aldeg_cas05,65,182,2 duplicate(InsideFlagsA5) Rothenburg#8 GUILD_FLAG
+aldeg_cas05,65,205,2 duplicate(InsideFlagsA5) Rothenburg#9 GUILD_FLAG
+aldeg_cas05,10,218,2 duplicate(InsideFlagsA5) Rothenburg#10 GUILD_FLAG
+aldeg_cas05,10,218,2 duplicate(InsideFlagsA5) Rothenburg#11 GUILD_FLAG
+aldeg_cas05,164,201,2 duplicate(InsideFlagsA5) Rothenburg#12 GUILD_FLAG
+aldeg_cas05,14,117,2 duplicate(InsideFlagsA5) Rothenburg#13 GUILD_FLAG
+aldeg_cas05,10,225,2 duplicate(InsideFlagsA5) Rothenburg#14 GUILD_FLAG
+aldeg_cas05,187,59,2 duplicate(InsideFlagsA5) Rothenburg#15 GUILD_FLAG
+aldeg_cas05,154,51,2 duplicate(InsideFlagsA5) Rothenburg#16 GUILD_FLAG
+aldeg_cas05,22,211,2 duplicate(InsideFlagsA5) Rothenburg#17 GUILD_FLAG
+aldeg_cas05,150,202,2 duplicate(InsideFlagsA5) Rothenburg#18 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-aldebaran,128,97,4 duplicate(InsideFlagsA5) Rothenburg#19 722
+aldebaran,128,97,4 duplicate(InsideFlagsA5) Rothenburg#19 GUILD_FLAG
// Kafra Employee
//============================================================
-aldeg_cas05,31,190,0 duplicate(guildkafra) Kafra Staff#aldeg_cas05 117
+aldeg_cas05,31,190,0 duplicate(guildkafra) Kafra Staff#aldeg_cas05 4_F_KAFRA1
// Steward
//============================================================
-aldeg_cas05,51,179,0 duplicate(cm) Esmarehk#aldeg_cas05 55
+aldeg_cas05,51,179,0 duplicate(cm) Esmarehk#aldeg_cas05 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-aldeg_cas05,64,8,0 script #lever_A05 111,{
+aldeg_cas05,64,8,0 script #lever_A05 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -123,7 +123,7 @@ aldeg_cas05,64,8,0 script #lever_A05 111,{
// Guild Dungeon Switch
//============================================================
-aldeg_cas05,22,205,0 duplicate(gdlever) #aldeg_cas05 111
+aldeg_cas05,22,205,0 duplicate(gdlever) #aldeg_cas05 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/gefg_cas01.txt b/npc/guild/gefg_cas01.txt
index 527a1a9a6..a05b72b8f 100644
--- a/npc/guild/gefg_cas01.txt
+++ b/npc/guild/gefg_cas01.txt
@@ -14,7 +14,7 @@
// Guild Flag (Outside Castle)
//============================================================
-- script Repherion#1::OutsideFlagsG1 722,{
+- script Repherion#1::OutsideFlagsG1 GUILD_FLAG,{
set .@GID, GetCastleData("gefg_cas01",1);
@@ -64,14 +64,14 @@ OnRecvCastleG01:
end;
}
-gef_fild13,148,51,5 duplicate(OutsideFlagsG1) Repherion#1-2 722
-gef_fild13,155,54,5 duplicate(OutsideFlagsG1) Repherion#2 722
-gef_fild13,212,79,6 duplicate(OutsideFlagsG1) Repherion#3 722
-gef_fild13,211,71,6 duplicate(OutsideFlagsG1) Repherion#4 722
+gef_fild13,148,51,5 duplicate(OutsideFlagsG1) Repherion#1-2 GUILD_FLAG
+gef_fild13,155,54,5 duplicate(OutsideFlagsG1) Repherion#2 GUILD_FLAG
+gef_fild13,212,79,6 duplicate(OutsideFlagsG1) Repherion#3 GUILD_FLAG
+gef_fild13,211,71,6 duplicate(OutsideFlagsG1) Repherion#4 GUILD_FLAG
// Guild Flag (Inside Castle)
//============================================================
-- script Repherion#5::InsideFlagsG1 722,{
+- script Repherion#5::InsideFlagsG1 GUILD_FLAG,{
end;
OnRecvCastleG01:
@@ -79,28 +79,28 @@ OnRecvCastleG01:
end;
}
-gefg_cas01,28,157,4 duplicate(InsideFlagsG1) Repherion#5-2 722
-gefg_cas01,22,156,5 duplicate(InsideFlagsG1) Repherion#6 722
-gefg_cas01,68,185,3 duplicate(InsideFlagsG1) Repherion#7 722
-gefg_cas01,17,171,5 duplicate(InsideFlagsG1) Repherion#8 722
-gefg_cas01,59,16,4 duplicate(InsideFlagsG1) Repherion#9 722
-gefg_cas01,64,16,4 duplicate(InsideFlagsG1) Repherion#10 722
+gefg_cas01,28,157,4 duplicate(InsideFlagsG1) Repherion#5-2 GUILD_FLAG
+gefg_cas01,22,156,5 duplicate(InsideFlagsG1) Repherion#6 GUILD_FLAG
+gefg_cas01,68,185,3 duplicate(InsideFlagsG1) Repherion#7 GUILD_FLAG
+gefg_cas01,17,171,5 duplicate(InsideFlagsG1) Repherion#8 GUILD_FLAG
+gefg_cas01,59,16,4 duplicate(InsideFlagsG1) Repherion#9 GUILD_FLAG
+gefg_cas01,64,16,4 duplicate(InsideFlagsG1) Repherion#10 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-geffen,109,123,2 duplicate(InsideFlagsG1) Repherion#11 722
+geffen,109,123,2 duplicate(InsideFlagsG1) Repherion#11 GUILD_FLAG
// Kafra Employee
//============================================================
-gefg_cas01,83,47,3 duplicate(guildkafra) Kafra Staff#gefg_cas01 117
+gefg_cas01,83,47,3 duplicate(guildkafra) Kafra Staff#gefg_cas01 4_F_KAFRA1
// Steward
//============================================================
-gefg_cas01,40,48,5 duplicate(cm) Gnahcher#gefg_cas01 55
+gefg_cas01,40,48,5 duplicate(cm) Gnahcher#gefg_cas01 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-gefg_cas01,152,117,0 script #lever_G01 111,{
+gefg_cas01,152,117,0 script #lever_G01 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -115,7 +115,7 @@ gefg_cas01,152,117,0 script #lever_G01 111,{
// Guild Dungeon Switch
//============================================================
-gefg_cas01,78,84,0 duplicate(gdlever) #gefg_cas01 111
+gefg_cas01,78,84,0 duplicate(gdlever) #gefg_cas01 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/gefg_cas02.txt b/npc/guild/gefg_cas02.txt
index dfb20f93b..f4c5bd37f 100644
--- a/npc/guild/gefg_cas02.txt
+++ b/npc/guild/gefg_cas02.txt
@@ -14,7 +14,7 @@
// Guild Flag (Outside Castle)
//============================================================
-- script Eeyorbriggar#1::OutsideFlagsG2 722,{
+- script Eeyorbriggar#1::OutsideFlagsG2 GUILD_FLAG,{
set .@GID, GetCastleData("gefg_cas02",1);
@@ -64,14 +64,14 @@ OnRecvCastleG02:
end;
}
-gef_fild13,303,243,4 duplicate(OutsideFlagsG2) Eeyorbriggar#1-2 722
-gef_fild13,312,243,4 duplicate(OutsideFlagsG2) Eeyorbriggar#2 722
-gef_fild13,290,243,4 duplicate(OutsideFlagsG2) Eeyorbriggar#3 722
-gef_fild13,324,243,4 duplicate(OutsideFlagsG2) Eeyorbriggar#4 722
+gef_fild13,303,243,4 duplicate(OutsideFlagsG2) Eeyorbriggar#1-2 GUILD_FLAG
+gef_fild13,312,243,4 duplicate(OutsideFlagsG2) Eeyorbriggar#2 GUILD_FLAG
+gef_fild13,290,243,4 duplicate(OutsideFlagsG2) Eeyorbriggar#3 GUILD_FLAG
+gef_fild13,324,243,4 duplicate(OutsideFlagsG2) Eeyorbriggar#4 GUILD_FLAG
// Guild Flag (Inside Castle)
//============================================================
-- script Eeyorbriggar#5::InsideFlagsG2 722,{
+- script Eeyorbriggar#5::InsideFlagsG2 GUILD_FLAG,{
end;
OnRecvCastleG02:
@@ -79,29 +79,29 @@ OnRecvCastleG02:
end;
}
-gefg_cas02,65,130,5 duplicate(InsideFlagsG2) Eeyorbriggar#5-2 722
-gefg_cas02,30,123,5 duplicate(InsideFlagsG2) Eeyorbriggar#6 722
-gefg_cas02,65,139,6 duplicate(InsideFlagsG2) Eeyorbriggar#7 722
-gefg_cas02,37,177,6 duplicate(InsideFlagsG2) Eeyorbriggar#8 722
-gefg_cas02,37,168,6 duplicate(InsideFlagsG2) Eeyorbriggar#9 722
-gefg_cas02,68,47,2 duplicate(InsideFlagsG2) Eeyorbriggar#10 722
-gefg_cas02,68,36,2 duplicate(InsideFlagsG2) Eeyorbriggar#11 722
+gefg_cas02,65,130,5 duplicate(InsideFlagsG2) Eeyorbriggar#5-2 GUILD_FLAG
+gefg_cas02,30,123,5 duplicate(InsideFlagsG2) Eeyorbriggar#6 GUILD_FLAG
+gefg_cas02,65,139,6 duplicate(InsideFlagsG2) Eeyorbriggar#7 GUILD_FLAG
+gefg_cas02,37,177,6 duplicate(InsideFlagsG2) Eeyorbriggar#8 GUILD_FLAG
+gefg_cas02,37,168,6 duplicate(InsideFlagsG2) Eeyorbriggar#9 GUILD_FLAG
+gefg_cas02,68,47,2 duplicate(InsideFlagsG2) Eeyorbriggar#10 GUILD_FLAG
+gefg_cas02,68,36,2 duplicate(InsideFlagsG2) Eeyorbriggar#11 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-geffen,112,129,1 duplicate(InsideFlagsG2) Eeyorbriggar#12 722
+geffen,112,129,1 duplicate(InsideFlagsG2) Eeyorbriggar#12 GUILD_FLAG
// Kafra Employee
//============================================================
-gefg_cas02,23,66,3 duplicate(guildkafra) Kafra Staff#gefg_cas02 117
+gefg_cas02,23,66,3 duplicate(guildkafra) Kafra Staff#gefg_cas02 4_F_KAFRA1
// Steward
//============================================================
-gefg_cas02,12,66,5 duplicate(cm) Esmarehk#gefg_cas02 55
+gefg_cas02,12,66,5 duplicate(cm) Esmarehk#gefg_cas02 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-gefg_cas02,145,114,0 script #lever_G02 111,{
+gefg_cas02,145,114,0 script #lever_G02 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -116,7 +116,7 @@ gefg_cas02,145,114,0 script #lever_G02 111,{
// Guild Dungeon Switch
//============================================================
-gefg_cas02,167,40,0 duplicate(gdlever) #gefg_cas02 111
+gefg_cas02,167,40,0 duplicate(gdlever) #gefg_cas02 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/gefg_cas03.txt b/npc/guild/gefg_cas03.txt
index b46ed18c7..60e3c46fd 100644
--- a/npc/guild/gefg_cas03.txt
+++ b/npc/guild/gefg_cas03.txt
@@ -14,7 +14,7 @@
// Guild Flag (Outside Castle)
//============================================================
-- script Yesnelph#1::OutsideFlagsG3 722,{
+- script Yesnelph#1::OutsideFlagsG3 GUILD_FLAG,{
set .@GID, GetCastleData("gefg_cas03",1);
@@ -64,16 +64,16 @@ OnRecvCastleG03:
end;
}
-gef_fild13,78,182,4 duplicate(OutsideFlagsG3) Yesnelph#1-2 722
-gef_fild13,87,182,4 duplicate(OutsideFlagsG3) Yesnelph#2 722
-gef_fild13,73,295,7 duplicate(OutsideFlagsG3) Yesnelph#3 722
-gef_fild13,113,274,7 duplicate(OutsideFlagsG3) Yesnelph#4 722
-gef_fild13,144,235,6 duplicate(OutsideFlagsG3) Yesnelph#5 722
-gef_fild13,144,244,6 duplicate(OutsideFlagsG3) Yesnelph#6 722
+gef_fild13,78,182,4 duplicate(OutsideFlagsG3) Yesnelph#1-2 GUILD_FLAG
+gef_fild13,87,182,4 duplicate(OutsideFlagsG3) Yesnelph#2 GUILD_FLAG
+gef_fild13,73,295,7 duplicate(OutsideFlagsG3) Yesnelph#3 GUILD_FLAG
+gef_fild13,113,274,7 duplicate(OutsideFlagsG3) Yesnelph#4 GUILD_FLAG
+gef_fild13,144,235,6 duplicate(OutsideFlagsG3) Yesnelph#5 GUILD_FLAG
+gef_fild13,144,244,6 duplicate(OutsideFlagsG3) Yesnelph#6 GUILD_FLAG
// Guild Flag (Inside Castle)
//============================================================
-- script Yesnelph#7::InsideFlagsG3 722,{
+- script Yesnelph#7::InsideFlagsG3 GUILD_FLAG,{
end;
OnRecvCastleG03:
@@ -81,30 +81,30 @@ OnRecvCastleG03:
end;
}
-gefg_cas03,122,220,6 duplicate(InsideFlagsG3) Yesnelph#7-2 722
-gefg_cas03,122,229,6 duplicate(InsideFlagsG3) Yesnelph#8 722
-gefg_cas03,91,257,7 duplicate(InsideFlagsG3) Yesnelph#9 722
-gefg_cas03,52,276,7 duplicate(InsideFlagsG3) Yesnelph#10 722
-gefg_cas03,56,164,4 duplicate(InsideFlagsG3) Yesnelph#11 722
-gefg_cas03,65,164,4 duplicate(InsideFlagsG3) Yesnelph#12 722
-gefg_cas03,37,214,1 duplicate(InsideFlagsG3) Yesnelph#13 722
-gefg_cas03,34,208,1 duplicate(InsideFlagsG3) Yesnelph#14 722
+gefg_cas03,122,220,6 duplicate(InsideFlagsG3) Yesnelph#7-2 GUILD_FLAG
+gefg_cas03,122,229,6 duplicate(InsideFlagsG3) Yesnelph#8 GUILD_FLAG
+gefg_cas03,91,257,7 duplicate(InsideFlagsG3) Yesnelph#9 GUILD_FLAG
+gefg_cas03,52,276,7 duplicate(InsideFlagsG3) Yesnelph#10 GUILD_FLAG
+gefg_cas03,56,164,4 duplicate(InsideFlagsG3) Yesnelph#11 GUILD_FLAG
+gefg_cas03,65,164,4 duplicate(InsideFlagsG3) Yesnelph#12 GUILD_FLAG
+gefg_cas03,37,214,1 duplicate(InsideFlagsG3) Yesnelph#13 GUILD_FLAG
+gefg_cas03,34,208,1 duplicate(InsideFlagsG3) Yesnelph#14 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-geffen,120,132,8 duplicate(InsideFlagsG3) Yesnelph#15 722
+geffen,120,132,8 duplicate(InsideFlagsG3) Yesnelph#15 GUILD_FLAG
// Kafra Employee
//============================================================
-gefg_cas03,116,89,5 duplicate(guildkafra) Kafra Staff#gefg_cas03 117
+gefg_cas03,116,89,5 duplicate(guildkafra) Kafra Staff#gefg_cas03 4_F_KAFRA1
// Steward
//============================================================
-gefg_cas03,106,23,5 duplicate(cm) Jyang#gefg_cas03 55
+gefg_cas03,106,23,5 duplicate(cm) Jyang#gefg_cas03 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-gefg_cas03,275,289,0 script #lever_G03 111,{
+gefg_cas03,275,289,0 script #lever_G03 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ gefg_cas03,275,289,0 script #lever_G03 111,{
// Guild Dungeon Switch
//============================================================
-gefg_cas03,221,43,0 duplicate(gdlever) #gefg_cas03 111
+gefg_cas03,221,43,0 duplicate(gdlever) #gefg_cas03 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/gefg_cas04.txt b/npc/guild/gefg_cas04.txt
index b42055293..cd4eccf0e 100644
--- a/npc/guild/gefg_cas04.txt
+++ b/npc/guild/gefg_cas04.txt
@@ -14,7 +14,7 @@
// Guild Flag (Outside Castle)
//============================================================
-- script Bergel#1::OutsideFlagsG4 722,{
+- script Bergel#1::OutsideFlagsG4 GUILD_FLAG,{
set .@GID, GetCastleData("gefg_cas04",1);
@@ -64,12 +64,12 @@ OnRecvCastleG04:
end;
}
-gef_fild13,190,283,3 duplicate(OutsideFlagsG4) Bergel#1-2 722
-gef_fild13,199,274,3 duplicate(OutsideFlagsG4) Bergel#2 722
+gef_fild13,190,283,3 duplicate(OutsideFlagsG4) Bergel#1-2 GUILD_FLAG
+gef_fild13,199,274,3 duplicate(OutsideFlagsG4) Bergel#2 GUILD_FLAG
// Guild Flag (Inside Castle)
//============================================================
-- script Bergel#3::InsideFlagsG4 722,{
+- script Bergel#3::InsideFlagsG4 GUILD_FLAG,{
end;
OnRecvCastleG04:
@@ -77,30 +77,30 @@ OnRecvCastleG04:
end;
}
-gefg_cas04,24,157,4 duplicate(InsideFlagsG4) Bergel#3-2 722
-gefg_cas04,35,158,4 duplicate(InsideFlagsG4) Bergel#4 722
-gefg_cas04,44,184,4 duplicate(InsideFlagsG4) Bergel#5 722
-gefg_cas04,51,184,4 duplicate(InsideFlagsG4) Bergel#6 722
-gefg_cas04,39,212,7 duplicate(InsideFlagsG4) Bergel#7 722
-gefg_cas04,29,212,1 duplicate(InsideFlagsG4) Bergel#8 722
-gefg_cas04,24,73,1 duplicate(InsideFlagsG4) Bergel#9 722
-gefg_cas04,35,73,4 duplicate(InsideFlagsG4) Bergel#10 722
+gefg_cas04,24,157,4 duplicate(InsideFlagsG4) Bergel#3-2 GUILD_FLAG
+gefg_cas04,35,158,4 duplicate(InsideFlagsG4) Bergel#4 GUILD_FLAG
+gefg_cas04,44,184,4 duplicate(InsideFlagsG4) Bergel#5 GUILD_FLAG
+gefg_cas04,51,184,4 duplicate(InsideFlagsG4) Bergel#6 GUILD_FLAG
+gefg_cas04,39,212,7 duplicate(InsideFlagsG4) Bergel#7 GUILD_FLAG
+gefg_cas04,29,212,1 duplicate(InsideFlagsG4) Bergel#8 GUILD_FLAG
+gefg_cas04,24,73,1 duplicate(InsideFlagsG4) Bergel#9 GUILD_FLAG
+gefg_cas04,35,73,4 duplicate(InsideFlagsG4) Bergel#10 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-geffen,127,130,7 duplicate(InsideFlagsG4) Bergel#11 722
+geffen,127,130,7 duplicate(InsideFlagsG4) Bergel#11 GUILD_FLAG
// Kafra Employee
//============================================================
-gefg_cas04,59,70,3 duplicate(guildkafra) Kafra Staff#gefg_cas04 117
+gefg_cas04,59,70,3 duplicate(guildkafra) Kafra Staff#gefg_cas04 4_F_KAFRA1
// Steward
//============================================================
-gefg_cas04,73,46,3 duplicate(cm) Kellvahni#gefg_cas04 55
+gefg_cas04,73,46,3 duplicate(cm) Kellvahni#gefg_cas04 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-gefg_cas04,116,123,0 script #lever_G04 111,{
+gefg_cas04,116,123,0 script #lever_G04 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -115,7 +115,7 @@ gefg_cas04,116,123,0 script #lever_G04 111,{
// Guild Dungeon Switch
//============================================================
-gefg_cas04,58,75,0 duplicate(gdlever) #gefg_cas04 111
+gefg_cas04,58,75,0 duplicate(gdlever) #gefg_cas04 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/gefg_cas05.txt b/npc/guild/gefg_cas05.txt
index ce53a3d04..08abccf5b 100644
--- a/npc/guild/gefg_cas05.txt
+++ b/npc/guild/gefg_cas05.txt
@@ -14,7 +14,7 @@
// Guild Flag (Outside Castle)
//============================================================
-- script Mersetzdeitz#1::OutsideFlagsG5 722,{
+- script Mersetzdeitz#1::OutsideFlagsG5 GUILD_FLAG,{
set .@GID, GetCastleData("gefg_cas05",1);
@@ -64,14 +64,14 @@ OnRecvCastleG05:
end;
}
-gef_fild13,302,87,7 duplicate(OutsideFlagsG5) Mersetzdeitz#1-2 722
-gef_fild13,313,83,0 duplicate(OutsideFlagsG5) Mersetzdeitz#2 722
-gef_fild13,252,51,2 duplicate(OutsideFlagsG5) Mersetzdeitz#3 722
-gef_fild13,26,147,2 duplicate(OutsideFlagsG5) Mersetzdeitz#4 722
+gef_fild13,302,87,7 duplicate(OutsideFlagsG5) Mersetzdeitz#1-2 GUILD_FLAG
+gef_fild13,313,83,0 duplicate(OutsideFlagsG5) Mersetzdeitz#2 GUILD_FLAG
+gef_fild13,252,51,2 duplicate(OutsideFlagsG5) Mersetzdeitz#3 GUILD_FLAG
+gef_fild13,26,147,2 duplicate(OutsideFlagsG5) Mersetzdeitz#4 GUILD_FLAG
// Guild Flag (Inside Castle)
//============================================================
-- script Mersetzdeitz#5::InsideFlagsG5 722,{
+- script Mersetzdeitz#5::InsideFlagsG5 GUILD_FLAG,{
end;
OnRecvCastleG05:
@@ -79,28 +79,28 @@ OnRecvCastleG05:
end;
}
-gefg_cas05,77,185,7 duplicate(InsideFlagsG5) Mersetzdeitz#5-2 722
-gefg_cas05,92,181,0 duplicate(InsideFlagsG5) Mersetzdeitz#6 722
-gefg_cas05,83,158,1 duplicate(InsideFlagsG5) Mersetzdeitz#7 722
-gefg_cas05,62,144,7 duplicate(InsideFlagsG5) Mersetzdeitz#8 722
-gefg_cas05,62,66,4 duplicate(InsideFlagsG5) Mersetzdeitz#9 722
-gefg_cas05,69,66,4 duplicate(InsideFlagsG5) Mersetzdeitz#10 722
+gefg_cas05,77,185,7 duplicate(InsideFlagsG5) Mersetzdeitz#5-2 GUILD_FLAG
+gefg_cas05,92,181,0 duplicate(InsideFlagsG5) Mersetzdeitz#6 GUILD_FLAG
+gefg_cas05,83,158,1 duplicate(InsideFlagsG5) Mersetzdeitz#7 GUILD_FLAG
+gefg_cas05,62,144,7 duplicate(InsideFlagsG5) Mersetzdeitz#8 GUILD_FLAG
+gefg_cas05,62,66,4 duplicate(InsideFlagsG5) Mersetzdeitz#9 GUILD_FLAG
+gefg_cas05,69,66,4 duplicate(InsideFlagsG5) Mersetzdeitz#10 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-geffen,131,123,6 duplicate(InsideFlagsG5) Mersetzdeitz#11 722
+geffen,131,123,6 duplicate(InsideFlagsG5) Mersetzdeitz#11 GUILD_FLAG
// Kafra Employee
//============================================================
-gefg_cas05,61,52,5 duplicate(guildkafra) Kafra Staff#gefg_cas05 117
+gefg_cas05,61,52,5 duplicate(guildkafra) Kafra Staff#gefg_cas05 4_F_KAFRA1
// Steward
//============================================================
-gefg_cas05,70,52,3 duplicate(cm) Byohre#gefg_cas05 55
+gefg_cas05,70,52,3 duplicate(cm) Byohre#gefg_cas05 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-gefg_cas05,149,107,0 script #lever_G05 111,{
+gefg_cas05,149,107,0 script #lever_G05 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -115,7 +115,7 @@ gefg_cas05,149,107,0 script #lever_G05 111,{
// Guild Dungeon Switch
//============================================================
-gefg_cas05,65,22,0 duplicate(gdlever) #gefg_cas05 111
+gefg_cas05,65,22,0 duplicate(gdlever) #gefg_cas05 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/payg_cas01.txt b/npc/guild/payg_cas01.txt
index bd33111cd..4570f7db5 100644
--- a/npc/guild/payg_cas01.txt
+++ b/npc/guild/payg_cas01.txt
@@ -16,7 +16,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Bright Arbor#1::OutsideFlagsPA1 722,{
+- script Bright Arbor#1::OutsideFlagsPA1 GUILD_FLAG,{
set .@GID, GetCastleData("payg_cas01",1);
@@ -66,14 +66,14 @@ OnRecvCastlePy01:
end;
}
-pay_gld,125,236,4 duplicate(OutsideFlagsPA1) Bright Arbor#1-2 722
-pay_gld,110,233,4 duplicate(OutsideFlagsPA1) Bright Arbor#2 722
-pay_gld,116,233,4 duplicate(OutsideFlagsPA1) Bright Arbor#3 722
-pay_gld,91,239,2 duplicate(OutsideFlagsPA1) Bright Arbor#4 722
+pay_gld,125,236,4 duplicate(OutsideFlagsPA1) Bright Arbor#1-2 GUILD_FLAG
+pay_gld,110,233,4 duplicate(OutsideFlagsPA1) Bright Arbor#2 GUILD_FLAG
+pay_gld,116,233,4 duplicate(OutsideFlagsPA1) Bright Arbor#3 GUILD_FLAG
+pay_gld,91,239,2 duplicate(OutsideFlagsPA1) Bright Arbor#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Bright Arbor#5::InsideFlagsPA1 722,{
+- script Bright Arbor#5::InsideFlagsPA1 GUILD_FLAG,{
end;
OnRecvCastlePy01:
@@ -81,29 +81,29 @@ OnRecvCastlePy01:
end;
}
-payg_cas01,238,67,4 duplicate(InsideFlagsPA1) Bright Arbor#5-2 722
-payg_cas01,233,67,4 duplicate(InsideFlagsPA1) Bright Arbor#6 722
-payg_cas01,221,123,4 duplicate(InsideFlagsPA1) Bright Arbor#7 722
-payg_cas01,221,116,4 duplicate(InsideFlagsPA1) Bright Arbor#8 722
-payg_cas01,206,108,4 duplicate(InsideFlagsPA1) Bright Arbor#9 722
-payg_cas01,212,108,4 duplicate(InsideFlagsPA1) Bright Arbor#10 722
+payg_cas01,238,67,4 duplicate(InsideFlagsPA1) Bright Arbor#5-2 GUILD_FLAG
+payg_cas01,233,67,4 duplicate(InsideFlagsPA1) Bright Arbor#6 GUILD_FLAG
+payg_cas01,221,123,4 duplicate(InsideFlagsPA1) Bright Arbor#7 GUILD_FLAG
+payg_cas01,221,116,4 duplicate(InsideFlagsPA1) Bright Arbor#8 GUILD_FLAG
+payg_cas01,206,108,4 duplicate(InsideFlagsPA1) Bright Arbor#9 GUILD_FLAG
+payg_cas01,212,108,4 duplicate(InsideFlagsPA1) Bright Arbor#10 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-payon,90,322,4 duplicate(InsideFlagsPA1) Bright Arbor#11 722
-payon,166,177,3 duplicate(InsideFlagsPA1) Bright Arbor#12 722
+payon,90,322,4 duplicate(InsideFlagsPA1) Bright Arbor#11 GUILD_FLAG
+payon,166,177,3 duplicate(InsideFlagsPA1) Bright Arbor#12 GUILD_FLAG
// Kafra Employee
//============================================================
-payg_cas01,128,58,3 duplicate(guildkafra) Kafra Staff#payg_cas01 117
+payg_cas01,128,58,3 duplicate(guildkafra) Kafra Staff#payg_cas01 4_F_KAFRA1
// Steward
//============================================================
-payg_cas01,120,58,4 duplicate(cm) Kurunnadi#payg_cas01 55
+payg_cas01,120,58,4 duplicate(cm) Kurunnadi#payg_cas01 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-payg_cas01,295,8,0 script #lever_PA01 111,{
+payg_cas01,295,8,0 script #lever_PA01 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -118,7 +118,7 @@ payg_cas01,295,8,0 script #lever_PA01 111,{
// Guild Dungeon Switch
//============================================================
-payg_cas01,101,25,0 duplicate(gdlever) #payg_cas01 111
+payg_cas01,101,25,0 duplicate(gdlever) #payg_cas01 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt
index 27e5fc4f0..5119ee896 100644
--- a/npc/guild/payg_cas02.txt
+++ b/npc/guild/payg_cas02.txt
@@ -17,7 +17,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Scarlet Palace#1::OutsideFlagsPA2 722,{
+- script Scarlet Palace#1::OutsideFlagsPA2 GUILD_FLAG,{
set .@GID, GetCastleData("payg_cas02",1);
@@ -67,14 +67,14 @@ OnRecvCastlePy02:
end;
}
-pay_gld,292,112,6 duplicate(OutsideFlagsPA2) Scarlet Palace#1-2 722
-pay_gld,292,120,6 duplicate(OutsideFlagsPA2) Scarlet Palace#2 722
-pay_gld,291,135,6 duplicate(OutsideFlagsPA2) Scarlet Palace#3 722
-pay_gld,271,163,0 duplicate(OutsideFlagsPA2) Scarlet Palace#4 722
+pay_gld,292,112,6 duplicate(OutsideFlagsPA2) Scarlet Palace#1-2 GUILD_FLAG
+pay_gld,292,120,6 duplicate(OutsideFlagsPA2) Scarlet Palace#2 GUILD_FLAG
+pay_gld,291,135,6 duplicate(OutsideFlagsPA2) Scarlet Palace#3 GUILD_FLAG
+pay_gld,271,163,0 duplicate(OutsideFlagsPA2) Scarlet Palace#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Scarlet Palace#5::InsideFlagsPA2 722,{
+- script Scarlet Palace#5::InsideFlagsPA2 GUILD_FLAG,{
end;
OnRecvCastlePy02:
@@ -82,29 +82,29 @@ OnRecvCastlePy02:
end;
}
-payg_cas02,254,40,6 duplicate(InsideFlagsPA2) Scarlet Palace#5-2 722
-payg_cas02,254,48,6 duplicate(InsideFlagsPA2) Scarlet Palace#6 722
-payg_cas02,202,49,0 duplicate(InsideFlagsPA2) Scarlet Palace#7 722
-payg_cas02,209,49,0 duplicate(InsideFlagsPA2) Scarlet Palace#8 722
-payg_cas02,59,282,4 duplicate(InsideFlagsPA2) Scarlet Palace#9 722
-payg_cas02,70,282,4 duplicate(InsideFlagsPA2) Scarlet Palace#10 722
+payg_cas02,254,40,6 duplicate(InsideFlagsPA2) Scarlet Palace#5-2 GUILD_FLAG
+payg_cas02,254,48,6 duplicate(InsideFlagsPA2) Scarlet Palace#6 GUILD_FLAG
+payg_cas02,202,49,0 duplicate(InsideFlagsPA2) Scarlet Palace#7 GUILD_FLAG
+payg_cas02,209,49,0 duplicate(InsideFlagsPA2) Scarlet Palace#8 GUILD_FLAG
+payg_cas02,59,282,4 duplicate(InsideFlagsPA2) Scarlet Palace#9 GUILD_FLAG
+payg_cas02,70,282,4 duplicate(InsideFlagsPA2) Scarlet Palace#10 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-payon,97,322,4 duplicate(InsideFlagsPA2) Scarlet Palace#11 722
-payon,166,173,3 duplicate(InsideFlagsPA2) Scarlet Palace#12 722
+payon,97,322,4 duplicate(InsideFlagsPA2) Scarlet Palace#11 GUILD_FLAG
+payon,166,173,3 duplicate(InsideFlagsPA2) Scarlet Palace#12 GUILD_FLAG
// Kafra Employee
//============================================================
-payg_cas02,22,275,5 duplicate(guildkafra) Kafra Staff#payg_cas02 117
+payg_cas02,22,275,5 duplicate(guildkafra) Kafra Staff#payg_cas02 4_F_KAFRA1
// Steward
//============================================================
-payg_cas02,22,260,7 duplicate(cm) Cherieos#payg_cas02 55
+payg_cas02,22,260,7 duplicate(cm) Cherieos#payg_cas02 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-payg_cas02,149,149,0 script #lever_PA02 111,{
+payg_cas02,149,149,0 script #lever_PA02 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ payg_cas02,149,149,0 script #lever_PA02 111,{
// Guild Dungeon Switch
//============================================================
-payg_cas02,278,247,0 duplicate(gdlever) #payg_cas02 111
+payg_cas02,278,247,0 duplicate(gdlever) #payg_cas02 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/payg_cas03.txt b/npc/guild/payg_cas03.txt
index e67b9798f..94b566b2d 100644
--- a/npc/guild/payg_cas03.txt
+++ b/npc/guild/payg_cas03.txt
@@ -16,7 +16,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Holy Shadow#1::OutsideFlagsPA3 722,{
+- script Holy Shadow#1::OutsideFlagsPA3 GUILD_FLAG,{
set .@GID, GetCastleData("payg_cas03",1);
@@ -66,14 +66,14 @@ OnRecvCastlePy03:
end;
}
-pay_gld,321,298,2 duplicate(OutsideFlagsPA3) Holy Shadow#1-2 722
-pay_gld,321,289,2 duplicate(OutsideFlagsPA3) Holy Shadow#2 722
-pay_gld,327,304,1 duplicate(OutsideFlagsPA3) Holy Shadow#3 722
-pay_gld,333,254,4 duplicate(OutsideFlagsPA3) Holy Shadow#4 722
+pay_gld,321,298,2 duplicate(OutsideFlagsPA3) Holy Shadow#1-2 GUILD_FLAG
+pay_gld,321,289,2 duplicate(OutsideFlagsPA3) Holy Shadow#2 GUILD_FLAG
+pay_gld,327,304,1 duplicate(OutsideFlagsPA3) Holy Shadow#3 GUILD_FLAG
+pay_gld,333,254,4 duplicate(OutsideFlagsPA3) Holy Shadow#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Holy Shadow#5::InsideFlagsPA3 722,{
+- script Holy Shadow#5::InsideFlagsPA3 GUILD_FLAG,{
end;
OnRecvCastlePy03:
@@ -81,29 +81,29 @@ OnRecvCastlePy03:
end;
}
-payg_cas03,236,54,2 duplicate(InsideFlagsPA3) Holy Shadow#5-2 722
-payg_cas03,236,45,2 duplicate(InsideFlagsPA3) Holy Shadow#6 722
-payg_cas03,259,66,4 duplicate(InsideFlagsPA3) Holy Shadow#7 722
-payg_cas03,266,66,4 duplicate(InsideFlagsPA3) Holy Shadow#8 722
-payg_cas03,34,31,4 duplicate(InsideFlagsPA3) Holy Shadow#9 722
-payg_cas03,43,31,4 duplicate(InsideFlagsPA3) Holy Shadow#10 722
+payg_cas03,236,54,2 duplicate(InsideFlagsPA3) Holy Shadow#5-2 GUILD_FLAG
+payg_cas03,236,45,2 duplicate(InsideFlagsPA3) Holy Shadow#6 GUILD_FLAG
+payg_cas03,259,66,4 duplicate(InsideFlagsPA3) Holy Shadow#7 GUILD_FLAG
+payg_cas03,266,66,4 duplicate(InsideFlagsPA3) Holy Shadow#8 GUILD_FLAG
+payg_cas03,34,31,4 duplicate(InsideFlagsPA3) Holy Shadow#9 GUILD_FLAG
+payg_cas03,43,31,4 duplicate(InsideFlagsPA3) Holy Shadow#10 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-payon,113,322,4 duplicate(InsideFlagsPA3) Holy Shadow#11 722
-payon,166,169,3 duplicate(InsideFlagsPA3) Holy Shadow#12 722
+payon,113,322,4 duplicate(InsideFlagsPA3) Holy Shadow#11 GUILD_FLAG
+payon,166,169,3 duplicate(InsideFlagsPA3) Holy Shadow#12 GUILD_FLAG
// Kafra Employee
//============================================================
-payg_cas03,9,263,5 duplicate(guildkafra) Kafra Staff#payg_cas03 117
+payg_cas03,9,263,5 duplicate(guildkafra) Kafra Staff#payg_cas03 4_F_KAFRA1
// Steward
//============================================================
-payg_cas03,50,261,3 duplicate(cm) Gheriot#payg_cas03 55
+payg_cas03,50,261,3 duplicate(cm) Gheriot#payg_cas03 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-payg_cas03,163,167,0 script #lever_PA03 111,{
+payg_cas03,163,167,0 script #lever_PA03 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -118,7 +118,7 @@ payg_cas03,163,167,0 script #lever_PA03 111,{
// Guild Dungeon Switch
//============================================================
-payg_cas03,38,42,0 duplicate(gdlever) #payg_cas03 111
+payg_cas03,38,42,0 duplicate(gdlever) #payg_cas03 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/payg_cas04.txt b/npc/guild/payg_cas04.txt
index 4f584e368..53c327081 100644
--- a/npc/guild/payg_cas04.txt
+++ b/npc/guild/payg_cas04.txt
@@ -17,7 +17,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Sacred Altar#1::OutsideFlagsPA4 722,{
+- script Sacred Altar#1::OutsideFlagsPA4 GUILD_FLAG,{
set .@GID, GetCastleData("payg_cas04",1);
@@ -67,14 +67,14 @@ OnRecvCastlePy04:
end;
}
-pay_gld,137,160,0 duplicate(OutsideFlagsPA4) Sacred Altar#1-2 722
-pay_gld,143,160,0 duplicate(OutsideFlagsPA4) Sacred Altar#2 722
-pay_gld,133,151,2 duplicate(OutsideFlagsPA4) Sacred Altar#3 722
-pay_gld,153,166,1 duplicate(OutsideFlagsPA4) Sacred Altar#4 722
+pay_gld,137,160,0 duplicate(OutsideFlagsPA4) Sacred Altar#1-2 GUILD_FLAG
+pay_gld,143,160,0 duplicate(OutsideFlagsPA4) Sacred Altar#2 GUILD_FLAG
+pay_gld,133,151,2 duplicate(OutsideFlagsPA4) Sacred Altar#3 GUILD_FLAG
+pay_gld,153,166,1 duplicate(OutsideFlagsPA4) Sacred Altar#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Sacred Altar#5::InsideFlagsPA4 722,{
+- script Sacred Altar#5::InsideFlagsPA4 GUILD_FLAG,{
end;
OnRecvCastlePy04:
@@ -82,29 +82,29 @@ OnRecvCastlePy04:
end;
}
-payg_cas04,255,259,0 duplicate(InsideFlagsPA4) Sacred Altar#5-2 722
-payg_cas04,248,259,0 duplicate(InsideFlagsPA4) Sacred Altar#6 722
-payg_cas04,248,168,6 duplicate(InsideFlagsPA4) Sacred Altar#7 722
-payg_cas04,248,160,6 duplicate(InsideFlagsPA4) Sacred Altar#8 722
-payg_cas04,232,181,4 duplicate(InsideFlagsPA4) Sacred Altar#9 722
-payg_cas04,239,181,4 duplicate(InsideFlagsPA4) Sacred Altar#10 722
+payg_cas04,255,259,0 duplicate(InsideFlagsPA4) Sacred Altar#5-2 GUILD_FLAG
+payg_cas04,248,259,0 duplicate(InsideFlagsPA4) Sacred Altar#6 GUILD_FLAG
+payg_cas04,248,168,6 duplicate(InsideFlagsPA4) Sacred Altar#7 GUILD_FLAG
+payg_cas04,248,160,6 duplicate(InsideFlagsPA4) Sacred Altar#8 GUILD_FLAG
+payg_cas04,232,181,4 duplicate(InsideFlagsPA4) Sacred Altar#9 GUILD_FLAG
+payg_cas04,239,181,4 duplicate(InsideFlagsPA4) Sacred Altar#10 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-payon,118,322,4 duplicate(InsideFlagsPA4) Sacred Altar#11 722
-payon,166,165,3 duplicate(InsideFlagsPA4) Sacred Altar#12 722
+payon,118,322,4 duplicate(InsideFlagsPA4) Sacred Altar#11 GUILD_FLAG
+payon,166,165,3 duplicate(InsideFlagsPA4) Sacred Altar#12 GUILD_FLAG
// Kafra Employee
//============================================================
-payg_cas04,40,235,1 duplicate(guildkafra) Kafra Staff#payg_cas04 117
+payg_cas04,40,235,1 duplicate(guildkafra) Kafra Staff#payg_cas04 4_F_KAFRA1
// Steward
//============================================================
-payg_cas04,38,284,3 duplicate(cm) DJ#payg_cas04 55
+payg_cas04,38,284,3 duplicate(cm) DJ#payg_cas04 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-payg_cas04,151,47,0 script #lever_PA04 111,{
+payg_cas04,151,47,0 script #lever_PA04 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ payg_cas04,151,47,0 script #lever_PA04 111,{
// Guild Dungeon Switch
//============================================================
-payg_cas04,52,48,0 duplicate(gdlever) #payg_cas04 111
+payg_cas04,52,48,0 duplicate(gdlever) #payg_cas04 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/payg_cas05.txt b/npc/guild/payg_cas05.txt
index ce5ee2f06..f7d61fc70 100644
--- a/npc/guild/payg_cas05.txt
+++ b/npc/guild/payg_cas05.txt
@@ -16,7 +16,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Bamboo Grove Hill#1::OutsideFlagsPA5 722,{
+- script Bamboo Grove Hill#1::OutsideFlagsPA5 GUILD_FLAG,{
set .@GID, GetCastleData("payg_cas05",1);
@@ -66,14 +66,14 @@ OnRecvCastlePy05:
end;
}
-pay_gld,208,268,4 duplicate(OutsideFlagsPA5) Bamboo Grove Hill#1-2 722
-pay_gld,199,268,4 duplicate(OutsideFlagsPA5) Bamboo Grove Hill#2 722
-pay_gld,190,277,3 duplicate(OutsideFlagsPA5) Bamboo Grove Hill#3 722
-pay_gld,187,294,2 duplicate(OutsideFlagsPA5) Bamboo Grove Hill#4 722
+pay_gld,208,268,4 duplicate(OutsideFlagsPA5) Bamboo Grove Hill#1-2 GUILD_FLAG
+pay_gld,199,268,4 duplicate(OutsideFlagsPA5) Bamboo Grove Hill#2 GUILD_FLAG
+pay_gld,190,277,3 duplicate(OutsideFlagsPA5) Bamboo Grove Hill#3 GUILD_FLAG
+pay_gld,187,294,2 duplicate(OutsideFlagsPA5) Bamboo Grove Hill#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Bamboo Grove Hill#5::InsideFlagsPA5 722,{
+- script Bamboo Grove Hill#5::InsideFlagsPA5 GUILD_FLAG,{
end;
OnRecvCastlePy05:
@@ -81,29 +81,29 @@ OnRecvCastlePy05:
end;
}
-payg_cas05,32,249,4 duplicate(InsideFlagsPA5) Bamboo Grove Hill#5-2 722
-payg_cas05,24,249,4 duplicate(InsideFlagsPA5) Bamboo Grove Hill#6 722
-payg_cas05,62,271,0 duplicate(InsideFlagsPA5) Bamboo Grove Hill#7 722
-payg_cas05,57,271,0 duplicate(InsideFlagsPA5) Bamboo Grove Hill#8 722
-payg_cas05,55,252,2 duplicate(InsideFlagsPA5) Bamboo Grove Hill#9 722
-payg_cas05,55,260,2 duplicate(InsideFlagsPA5) Bamboo Grove Hill#10 722
+payg_cas05,32,249,4 duplicate(InsideFlagsPA5) Bamboo Grove Hill#5-2 GUILD_FLAG
+payg_cas05,24,249,4 duplicate(InsideFlagsPA5) Bamboo Grove Hill#6 GUILD_FLAG
+payg_cas05,62,271,0 duplicate(InsideFlagsPA5) Bamboo Grove Hill#7 GUILD_FLAG
+payg_cas05,57,271,0 duplicate(InsideFlagsPA5) Bamboo Grove Hill#8 GUILD_FLAG
+payg_cas05,55,252,2 duplicate(InsideFlagsPA5) Bamboo Grove Hill#9 GUILD_FLAG
+payg_cas05,55,260,2 duplicate(InsideFlagsPA5) Bamboo Grove Hill#10 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-payon,123,322,4 duplicate(InsideFlagsPA5) Bamboo Grove Hill#11 722
-payon,166,161,3 duplicate(InsideFlagsPA5) Bamboo Grove Hill#12 722
+payon,123,322,4 duplicate(InsideFlagsPA5) Bamboo Grove Hill#11 GUILD_FLAG
+payon,166,161,3 duplicate(InsideFlagsPA5) Bamboo Grove Hill#12 GUILD_FLAG
// Kafra Employee
//============================================================
-payg_cas05,276,227,1 duplicate(guildkafra) Kafra Staff#payg_cas05 117
+payg_cas05,276,227,1 duplicate(guildkafra) Kafra Staff#payg_cas05 4_F_KAFRA1
// Steward
//============================================================
-payg_cas05,277,249,3 duplicate(cm) Nahzarf#payg_cas05 55
+payg_cas05,277,249,3 duplicate(cm) Nahzarf#payg_cas05 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-payg_cas05,161,136,0 script #lever_PA05 111,{
+payg_cas05,161,136,0 script #lever_PA05 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -118,7 +118,7 @@ payg_cas05,161,136,0 script #lever_PA05 111,{
// Guild Dungeon Switch
//============================================================
-payg_cas05,249,15,0 duplicate(gdlever) #payg_cas05 111
+payg_cas05,249,15,0 duplicate(gdlever) #payg_cas05 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/prtg_cas01.txt b/npc/guild/prtg_cas01.txt
index 25206d922..e739735de 100644
--- a/npc/guild/prtg_cas01.txt
+++ b/npc/guild/prtg_cas01.txt
@@ -16,7 +16,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Kriemhild#1::OutsideFlagsPR1 722,{
+- script Kriemhild#1::OutsideFlagsPR1 GUILD_FLAG,{
set .@GID, GetCastleData("prtg_cas01",1);
@@ -66,14 +66,14 @@ OnRecvCastlePt01:
end;
}
-prt_gld,131,60,6 duplicate(OutsideFlagsPR1) Kriemhild#1-2 722
-prt_gld,138,68,6 duplicate(OutsideFlagsPR1) Kriemhild#2 722
-prt_gld,138,60,6 duplicate(OutsideFlagsPR1) Kriemhild#3 722
-prt_gld,135,60,6 duplicate(OutsideFlagsPR1) Kriemhild#4 722
+prt_gld,131,60,6 duplicate(OutsideFlagsPR1) Kriemhild#1-2 GUILD_FLAG
+prt_gld,138,68,6 duplicate(OutsideFlagsPR1) Kriemhild#2 GUILD_FLAG
+prt_gld,138,60,6 duplicate(OutsideFlagsPR1) Kriemhild#3 GUILD_FLAG
+prt_gld,135,60,6 duplicate(OutsideFlagsPR1) Kriemhild#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Kriemhild#5::InsideFlagsPR1 722,{
+- script Kriemhild#5::InsideFlagsPR1 GUILD_FLAG,{
end;
OnRecvCastlePt01:
@@ -81,32 +81,32 @@ OnRecvCastlePt01:
end;
}
-prtg_cas01,58,56,4 duplicate(InsideFlagsPR1) Kriemhild#5-2 722
-prtg_cas01,64,56,4 duplicate(InsideFlagsPR1) Kriemhild#6 722
-prtg_cas01,76,32,4 duplicate(InsideFlagsPR1) Kriemhild#7 722
-prtg_cas01,84,32,4 duplicate(InsideFlagsPR1) Kriemhild#8 722
-prtg_cas01,94,39,4 duplicate(InsideFlagsPR1) Kriemhild#9 722
-prtg_cas01,94,24,4 duplicate(InsideFlagsPR1) Kriemhild#10 722
-prtg_cas01,73,14,4 duplicate(InsideFlagsPR1) Kriemhild#11 722
-prtg_cas01,73,6,4 duplicate(InsideFlagsPR1) Kriemhild#12 722
-prtg_cas01,55,46,4 duplicate(InsideFlagsPR1) Kriemhild#13 722
-prtg_cas01,45,46,4 duplicate(InsideFlagsPR1) Kriemhild#14 722
+prtg_cas01,58,56,4 duplicate(InsideFlagsPR1) Kriemhild#5-2 GUILD_FLAG
+prtg_cas01,64,56,4 duplicate(InsideFlagsPR1) Kriemhild#6 GUILD_FLAG
+prtg_cas01,76,32,4 duplicate(InsideFlagsPR1) Kriemhild#7 GUILD_FLAG
+prtg_cas01,84,32,4 duplicate(InsideFlagsPR1) Kriemhild#8 GUILD_FLAG
+prtg_cas01,94,39,4 duplicate(InsideFlagsPR1) Kriemhild#9 GUILD_FLAG
+prtg_cas01,94,24,4 duplicate(InsideFlagsPR1) Kriemhild#10 GUILD_FLAG
+prtg_cas01,73,14,4 duplicate(InsideFlagsPR1) Kriemhild#11 GUILD_FLAG
+prtg_cas01,73,6,4 duplicate(InsideFlagsPR1) Kriemhild#12 GUILD_FLAG
+prtg_cas01,55,46,4 duplicate(InsideFlagsPR1) Kriemhild#13 GUILD_FLAG
+prtg_cas01,45,46,4 duplicate(InsideFlagsPR1) Kriemhild#14 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-prontera,155,190,4 duplicate(InsideFlagsPR1) Kriemhild#15 722
+prontera,155,190,4 duplicate(InsideFlagsPR1) Kriemhild#15 GUILD_FLAG
// Kafra Employee
//============================================================
-prtg_cas01,96,173,0 duplicate(guildkafra) Kafra Staff#prtg_cas01 117
+prtg_cas01,96,173,0 duplicate(guildkafra) Kafra Staff#prtg_cas01 4_F_KAFRA1
// Steward
//============================================================
-prtg_cas01,112,181,0 duplicate(cm) Ahvray#prtg_cas01 55
+prtg_cas01,112,181,0 duplicate(cm) Ahvray#prtg_cas01 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-prtg_cas01,15,208,0 script #Lever_PR01 111,{
+prtg_cas01,15,208,0 script #Lever_PR01 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ prtg_cas01,15,208,0 script #Lever_PR01 111,{
// Guild Dungeon Switch
//============================================================
-prtg_cas01,94,200,0 duplicate(gdlever) #prtg_cas01 111
+prtg_cas01,94,200,0 duplicate(gdlever) #prtg_cas01 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/prtg_cas02.txt b/npc/guild/prtg_cas02.txt
index 4ddb3f64f..7c3df9334 100644
--- a/npc/guild/prtg_cas02.txt
+++ b/npc/guild/prtg_cas02.txt
@@ -16,7 +16,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Swanhild#1::OutsideFlagsPR2 722,{
+- script Swanhild#1::OutsideFlagsPR2 GUILD_FLAG,{
set .@GID, GetCastleData("prtg_cas02",1);
@@ -66,14 +66,14 @@ OnRecvCastlePt02:
end;
}
-prt_gld,244,126,8 duplicate(OutsideFlagsPR2) Swanhild#1-2 722
-prt_gld,244,128,8 duplicate(OutsideFlagsPR2) Swanhild#2 722
-prt_gld,236,126,8 duplicate(OutsideFlagsPR2) Swanhild#3 722
-prt_gld,236,128,8 duplicate(OutsideFlagsPR2) Swanhild#4 722
+prt_gld,244,126,8 duplicate(OutsideFlagsPR2) Swanhild#1-2 GUILD_FLAG
+prt_gld,244,128,8 duplicate(OutsideFlagsPR2) Swanhild#2 GUILD_FLAG
+prt_gld,236,126,8 duplicate(OutsideFlagsPR2) Swanhild#3 GUILD_FLAG
+prt_gld,236,128,8 duplicate(OutsideFlagsPR2) Swanhild#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Swanhild#5::InsideFlagsPR2 722,{
+- script Swanhild#5::InsideFlagsPR2 GUILD_FLAG,{
end;
OnRecvCastlePt02:
@@ -81,34 +81,34 @@ OnRecvCastlePt02:
end;
}
-prtg_cas02,40,227,4 duplicate(InsideFlagsPR2) Swanhild#5-2 722
-prtg_cas02,46,227,4 duplicate(InsideFlagsPR2) Swanhild#6 722
-prtg_cas02,11,219,4 duplicate(InsideFlagsPR2) Swanhild#7 722
-prtg_cas02,11,214,4 duplicate(InsideFlagsPR2) Swanhild#8 722
-prtg_cas02,20,219,4 duplicate(InsideFlagsPR2) Swanhild#9 722
-prtg_cas02,20,214,4 duplicate(InsideFlagsPR2) Swanhild#10 722
-prtg_cas02,79,227,8 duplicate(InsideFlagsPR2) Swanhild#11 722
-prtg_cas02,70,227,8 duplicate(InsideFlagsPR2) Swanhild#12 722
-prtg_cas02,38,189,8 duplicate(InsideFlagsPR2) Swanhild#13 722
-prtg_cas02,34,189,8 duplicate(InsideFlagsPR2) Swanhild#14 722
-prtg_cas02,153,161,4 duplicate(InsideFlagsPR2) Swanhild#15 722
-prtg_cas02,162,161,4 duplicate(InsideFlagsPR2) Swanhild#16 722
+prtg_cas02,40,227,4 duplicate(InsideFlagsPR2) Swanhild#5-2 GUILD_FLAG
+prtg_cas02,46,227,4 duplicate(InsideFlagsPR2) Swanhild#6 GUILD_FLAG
+prtg_cas02,11,219,4 duplicate(InsideFlagsPR2) Swanhild#7 GUILD_FLAG
+prtg_cas02,11,214,4 duplicate(InsideFlagsPR2) Swanhild#8 GUILD_FLAG
+prtg_cas02,20,219,4 duplicate(InsideFlagsPR2) Swanhild#9 GUILD_FLAG
+prtg_cas02,20,214,4 duplicate(InsideFlagsPR2) Swanhild#10 GUILD_FLAG
+prtg_cas02,79,227,8 duplicate(InsideFlagsPR2) Swanhild#11 GUILD_FLAG
+prtg_cas02,70,227,8 duplicate(InsideFlagsPR2) Swanhild#12 GUILD_FLAG
+prtg_cas02,38,189,8 duplicate(InsideFlagsPR2) Swanhild#13 GUILD_FLAG
+prtg_cas02,34,189,8 duplicate(InsideFlagsPR2) Swanhild#14 GUILD_FLAG
+prtg_cas02,153,161,4 duplicate(InsideFlagsPR2) Swanhild#15 GUILD_FLAG
+prtg_cas02,162,161,4 duplicate(InsideFlagsPR2) Swanhild#16 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-prontera,146,194,3 duplicate(InsideFlagsPR2) Swanhild#17 722
+prontera,146,194,3 duplicate(InsideFlagsPR2) Swanhild#17 GUILD_FLAG
// Kafra Employee
//============================================================
-prtg_cas02,71,36,4 duplicate(guildkafra) Kafra Staff#prtg_cas02 117
+prtg_cas02,71,36,4 duplicate(guildkafra) Kafra Staff#prtg_cas02 4_F_KAFRA1
// Steward
//============================================================
-prtg_cas02,94,61,4 duplicate(cm) Roy#prtg_cas02 55
+prtg_cas02,94,61,4 duplicate(cm) Roy#prtg_cas02 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-prtg_cas02,207,228,0 script #Lever_PR02 111,{
+prtg_cas02,207,228,0 script #Lever_PR02 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -123,7 +123,7 @@ prtg_cas02,207,228,0 script #Lever_PR02 111,{
// Guild Dungeon Switch
//============================================================
-prtg_cas02,84,72,0 duplicate(gdlever) #prtg_cas02 111
+prtg_cas02,84,72,0 duplicate(gdlever) #prtg_cas02 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/prtg_cas03.txt b/npc/guild/prtg_cas03.txt
index 28dea58d4..07b7aec4a 100644
--- a/npc/guild/prtg_cas03.txt
+++ b/npc/guild/prtg_cas03.txt
@@ -16,7 +16,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Fadhgridh#1::OutsideFlagsPR3 722,{
+- script Fadhgridh#1::OutsideFlagsPR3 GUILD_FLAG,{
set .@GID, GetCastleData("prtg_cas03",1);
@@ -66,14 +66,14 @@ OnRecvCastlePt03:
end;
}
-prt_gld,147,140,4 duplicate(OutsideFlagsPR3) Fadhgridh#1-2 722
-prt_gld,147,136,4 duplicate(OutsideFlagsPR3) Fadhgridh#2 722
-prt_gld,158,140,4 duplicate(OutsideFlagsPR3) Fadhgridh#3 722
-prt_gld,158,136,4 duplicate(OutsideFlagsPR3) Fadhgridh#4 722
+prt_gld,147,140,4 duplicate(OutsideFlagsPR3) Fadhgridh#1-2 GUILD_FLAG
+prt_gld,147,136,4 duplicate(OutsideFlagsPR3) Fadhgridh#2 GUILD_FLAG
+prt_gld,158,140,4 duplicate(OutsideFlagsPR3) Fadhgridh#3 GUILD_FLAG
+prt_gld,158,136,4 duplicate(OutsideFlagsPR3) Fadhgridh#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Fadhgridh#5::InsideFlagsPR3 722,{
+- script Fadhgridh#5::InsideFlagsPR3 GUILD_FLAG,{
end;
OnRecvCastlePt03:
@@ -81,32 +81,32 @@ OnRecvCastlePt03:
end;
}
-prtg_cas03,168,28,4 duplicate(InsideFlagsPR3) Fadhgridh#5-2 722
-prtg_cas03,182,28,4 duplicate(InsideFlagsPR3) Fadhgridh#6 722
-prtg_cas03,43,50,4 duplicate(InsideFlagsPR3) Fadhgridh#7 722
-prtg_cas03,48,50,4 duplicate(InsideFlagsPR3) Fadhgridh#8 722
-prtg_cas03,43,58,4 duplicate(InsideFlagsPR3) Fadhgridh#9 722
-prtg_cas03,48,58,4 duplicate(InsideFlagsPR3) Fadhgridh#10 722
-prtg_cas03,158,210,4 duplicate(InsideFlagsPR3) Fadhgridh#11 722
-prtg_cas03,169,210,4 duplicate(InsideFlagsPR3) Fadhgridh#12 722
-prtg_cas03,162,201,4 duplicate(InsideFlagsPR3) Fadhgridh#13 722
-prtg_cas03,165,201,4 duplicate(InsideFlagsPR3) Fadhgridh#14 722
+prtg_cas03,168,28,4 duplicate(InsideFlagsPR3) Fadhgridh#5-2 GUILD_FLAG
+prtg_cas03,182,28,4 duplicate(InsideFlagsPR3) Fadhgridh#6 GUILD_FLAG
+prtg_cas03,43,50,4 duplicate(InsideFlagsPR3) Fadhgridh#7 GUILD_FLAG
+prtg_cas03,48,50,4 duplicate(InsideFlagsPR3) Fadhgridh#8 GUILD_FLAG
+prtg_cas03,43,58,4 duplicate(InsideFlagsPR3) Fadhgridh#9 GUILD_FLAG
+prtg_cas03,48,58,4 duplicate(InsideFlagsPR3) Fadhgridh#10 GUILD_FLAG
+prtg_cas03,158,210,4 duplicate(InsideFlagsPR3) Fadhgridh#11 GUILD_FLAG
+prtg_cas03,169,210,4 duplicate(InsideFlagsPR3) Fadhgridh#12 GUILD_FLAG
+prtg_cas03,162,201,4 duplicate(InsideFlagsPR3) Fadhgridh#13 GUILD_FLAG
+prtg_cas03,165,201,4 duplicate(InsideFlagsPR3) Fadhgridh#14 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-prontera,143,203,2 duplicate(InsideFlagsPR3) Fadhgridh#15 722
+prontera,143,203,2 duplicate(InsideFlagsPR3) Fadhgridh#15 GUILD_FLAG
// Kafra Employee
//============================================================
-prtg_cas03,181,215,4 duplicate(guildkafra) Kafra Staff#prtg_cas03 117
+prtg_cas03,181,215,4 duplicate(guildkafra) Kafra Staff#prtg_cas03 4_F_KAFRA1
// Steward
//============================================================
-prtg_cas03,51,100,4 duplicate(cm) Sttick#prtg_cas03 55
+prtg_cas03,51,100,4 duplicate(cm) Sttick#prtg_cas03 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-prtg_cas03,193,130,0 script #Lever_PR03 111,{
+prtg_cas03,193,130,0 script #Lever_PR03 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ prtg_cas03,193,130,0 script #Lever_PR03 111,{
// Guild Dungeon Switch
//============================================================
-prtg_cas03,5,70,0 duplicate(gdlever) #prtg_cas03 111
+prtg_cas03,5,70,0 duplicate(gdlever) #prtg_cas03 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/prtg_cas04.txt b/npc/guild/prtg_cas04.txt
index d6bb7c15c..0c072bd66 100644
--- a/npc/guild/prtg_cas04.txt
+++ b/npc/guild/prtg_cas04.txt
@@ -16,7 +16,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Skoegul#1::OutsideFlagsPR4 722,{
+- script Skoegul#1::OutsideFlagsPR4 GUILD_FLAG,{
set .@GID, GetCastleData("prtg_cas04",1);
@@ -66,14 +66,14 @@ OnRecvCastlePt04:
end;
}
-prt_gld,120,243,6 duplicate(OutsideFlagsPR4) Skoegul#1-2 722
-prt_gld,120,236,6 duplicate(OutsideFlagsPR4) Skoegul#2 722
-prt_gld,122,243,6 duplicate(OutsideFlagsPR4) Skoegul#3 722
-prt_gld,122,236,6 duplicate(OutsideFlagsPR4) Skoegul#4 722
+prt_gld,120,243,6 duplicate(OutsideFlagsPR4) Skoegul#1-2 GUILD_FLAG
+prt_gld,120,236,6 duplicate(OutsideFlagsPR4) Skoegul#2 GUILD_FLAG
+prt_gld,122,243,6 duplicate(OutsideFlagsPR4) Skoegul#3 GUILD_FLAG
+prt_gld,122,236,6 duplicate(OutsideFlagsPR4) Skoegul#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Skoegul#5::InsideFlagsPR4 722,{
+- script Skoegul#5::InsideFlagsPR4 GUILD_FLAG,{
end;
OnRecvCastlePt04:
@@ -81,32 +81,32 @@ OnRecvCastlePt04:
end;
}
-prtg_cas04,82,29,4 duplicate(InsideFlagsPR4) Skoegul#5-2 722
-prtg_cas04,75,29,4 duplicate(InsideFlagsPR4) Skoegul#6 722
-prtg_cas04,75,27,4 duplicate(InsideFlagsPR4) Skoegul#7 722
-prtg_cas04,82,27,4 duplicate(InsideFlagsPR4) Skoegul#8 722
-prtg_cas04,59,29,4 duplicate(InsideFlagsPR4) Skoegul#9 722
-prtg_cas04,67,29,4 duplicate(InsideFlagsPR4) Skoegul#10 722
-prtg_cas04,258,25,4 duplicate(InsideFlagsPR4) Skoegul#11 722
-prtg_cas04,258,20,4 duplicate(InsideFlagsPR4) Skoegul#12 722
-prtg_cas04,263,20,4 duplicate(InsideFlagsPR4) Skoegul#13 722
-prtg_cas04,263,27,4 duplicate(InsideFlagsPR4) Skoegul#14 722
+prtg_cas04,82,29,4 duplicate(InsideFlagsPR4) Skoegul#5-2 GUILD_FLAG
+prtg_cas04,75,29,4 duplicate(InsideFlagsPR4) Skoegul#6 GUILD_FLAG
+prtg_cas04,75,27,4 duplicate(InsideFlagsPR4) Skoegul#7 GUILD_FLAG
+prtg_cas04,82,27,4 duplicate(InsideFlagsPR4) Skoegul#8 GUILD_FLAG
+prtg_cas04,59,29,4 duplicate(InsideFlagsPR4) Skoegul#9 GUILD_FLAG
+prtg_cas04,67,29,4 duplicate(InsideFlagsPR4) Skoegul#10 GUILD_FLAG
+prtg_cas04,258,25,4 duplicate(InsideFlagsPR4) Skoegul#11 GUILD_FLAG
+prtg_cas04,258,20,4 duplicate(InsideFlagsPR4) Skoegul#12 GUILD_FLAG
+prtg_cas04,263,20,4 duplicate(InsideFlagsPR4) Skoegul#13 GUILD_FLAG
+prtg_cas04,263,27,4 duplicate(InsideFlagsPR4) Skoegul#14 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-prontera,167,203,6 duplicate(InsideFlagsPR4) Skoegul#15 722
+prontera,167,203,6 duplicate(InsideFlagsPR4) Skoegul#15 GUILD_FLAG
// Kafra Employee
//============================================================
-prtg_cas04,258,247,4 duplicate(guildkafra) Kafra Staff#prtg_cas04 117
+prtg_cas04,258,247,4 duplicate(guildkafra) Kafra Staff#prtg_cas04 4_F_KAFRA1
// Steward
//============================================================
-prtg_cas04,259,265,4 duplicate(cm) Van Dreth#prtg_cas04 55
+prtg_cas04,259,265,4 duplicate(cm) Van Dreth#prtg_cas04 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-prtg_cas04,275,160,0 script #Lever_PR04 111,{
+prtg_cas04,275,160,0 script #Lever_PR04 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -121,7 +121,7 @@ prtg_cas04,275,160,0 script #Lever_PR04 111,{
// Guild Dungeon Switch
//============================================================
-prtg_cas04,56,283,0 duplicate(gdlever) #prtg_cas04 111
+prtg_cas04,56,283,0 duplicate(gdlever) #prtg_cas04 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild/prtg_cas05.txt b/npc/guild/prtg_cas05.txt
index 40c485f95..0c4938a26 100644
--- a/npc/guild/prtg_cas05.txt
+++ b/npc/guild/prtg_cas05.txt
@@ -16,7 +16,7 @@
// Guild Flags (Outside Castle)
//============================================================
-- script Gondul#1::OutsideFlagsPR5 722,{
+- script Gondul#1::OutsideFlagsPR5 GUILD_FLAG,{
set .@GID, GetCastleData("prtg_cas05",1);
@@ -66,14 +66,14 @@ OnRecvCastlePt05:
end;
}
-prt_gld,199,243,2 duplicate(OutsideFlagsPR5) Gondul#1-2 722
-prt_gld,199,236,2 duplicate(OutsideFlagsPR5) Gondul#2 722
-prt_gld,197,243,2 duplicate(OutsideFlagsPR5) Gondul#3 722
-prt_gld,197,236,2 duplicate(OutsideFlagsPR5) Gondul#4 722
+prt_gld,199,243,2 duplicate(OutsideFlagsPR5) Gondul#1-2 GUILD_FLAG
+prt_gld,199,236,2 duplicate(OutsideFlagsPR5) Gondul#2 GUILD_FLAG
+prt_gld,197,243,2 duplicate(OutsideFlagsPR5) Gondul#3 GUILD_FLAG
+prt_gld,197,236,2 duplicate(OutsideFlagsPR5) Gondul#4 GUILD_FLAG
// Guild Flags (Inside Castle)
//============================================================
-- script Gondul#5::InsideFlagsPR5 722,{
+- script Gondul#5::InsideFlagsPR5 GUILD_FLAG,{
end;
OnRecvCastlePt05:
@@ -81,30 +81,30 @@ OnRecvCastlePt05:
end;
}
-prtg_cas05,19,247,4 duplicate(InsideFlagsPR5) Gondul#5-2 722
-prtg_cas05,19,243,4 duplicate(InsideFlagsPR5) Gondul#6 722
-prtg_cas05,26,247,4 duplicate(InsideFlagsPR5) Gondul#7 722
-prtg_cas05,26,243,4 duplicate(InsideFlagsPR5) Gondul#8 722
-prtg_cas05,249,289,4 duplicate(InsideFlagsPR5) Gondul#9 722
-prtg_cas05,256,289,4 duplicate(InsideFlagsPR5) Gondul#10 722
-prtg_cas05,253,271,4 duplicate(InsideFlagsPR5) Gondul#11 722
-prtg_cas05,273,257,4 duplicate(InsideFlagsPR5) Gondul#12 722
+prtg_cas05,19,247,4 duplicate(InsideFlagsPR5) Gondul#5-2 GUILD_FLAG
+prtg_cas05,19,243,4 duplicate(InsideFlagsPR5) Gondul#6 GUILD_FLAG
+prtg_cas05,26,247,4 duplicate(InsideFlagsPR5) Gondul#7 GUILD_FLAG
+prtg_cas05,26,243,4 duplicate(InsideFlagsPR5) Gondul#8 GUILD_FLAG
+prtg_cas05,249,289,4 duplicate(InsideFlagsPR5) Gondul#9 GUILD_FLAG
+prtg_cas05,256,289,4 duplicate(InsideFlagsPR5) Gondul#10 GUILD_FLAG
+prtg_cas05,253,271,4 duplicate(InsideFlagsPR5) Gondul#11 GUILD_FLAG
+prtg_cas05,273,257,4 duplicate(InsideFlagsPR5) Gondul#12 GUILD_FLAG
// Guild Flag (Town)
//============================================================
-prontera,165,194,5 duplicate(InsideFlagsPR5) Gondul#13 722
+prontera,165,194,5 duplicate(InsideFlagsPR5) Gondul#13 GUILD_FLAG
// Kafra Employee
//============================================================
-prtg_cas05,52,41,4 duplicate(guildkafra) Kafra Staff#prtg_cas05 117
+prtg_cas05,52,41,4 duplicate(guildkafra) Kafra Staff#prtg_cas05 4_F_KAFRA1
// Steward
//============================================================
-prtg_cas05,36,37,4 duplicate(cm) Raynor#prtg_cas05 55
+prtg_cas05,36,37,4 duplicate(cm) Raynor#prtg_cas05 1_M_JOBTESTER
// Treasure Room Exit
//============================================================
-prtg_cas05,281,176,0 script #Lever_PR05 111,{
+prtg_cas05,281,176,0 script #Lever_PR05 HIDDEN_NPC,{
mes " ";
mes "There's a small lever. Will you pull it?";
@@ -119,7 +119,7 @@ prtg_cas05,281,176,0 script #Lever_PR05 111,{
// Guild Dungeon Switch
//============================================================
-prtg_cas05,212,95,0 duplicate(gdlever) #prtg_cas05 111
+prtg_cas05,212,95,0 duplicate(gdlever) #prtg_cas05 HIDDEN_NPC
// Guild Treasure Spawns
//============================================================
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index a2b929347..5639c7c6d 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -18,30 +18,30 @@
- duplicate(RL#template) RL2#arug_cas01 -1
- duplicate(RL#template) RL3#arug_cas01 -1
-arug_cas01,92,380,3 duplicate(Steward#template) Steward#ar01 55
-arug_cas01,112,193,1 duplicate(Guardian#template) Brace#ar01 868
-arug_cas01,31,362,3 duplicate(Kafra#template) Kafra Employee#ar01 117
-arug_cas01,211,234,0 duplicate(Guardian Stone#template) 1st Guardian Stone#ar01 844
-arug_cas01,308,189,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#ar01 844
-arug_cas01,247,52,0 duplicate(Control#template) Control Device01#ar01 111
-arug_cas01,118,131,0 duplicate(Control#template) Control Device02#ar01 111
-arug_cas01,82,172,0 duplicate(Control#template) Control Device03#ar01 111
-arug_cas01,259,371,0 duplicate(Switch#template) #aru01_switch 111
-arug_cas01,157,345,3 duplicate(Sunflower#template) Mysterious Sunflower#06 977
+arug_cas01,92,380,3 duplicate(Steward#template) Steward#ar01 1_M_JOBTESTER
+arug_cas01,112,193,1 duplicate(Guardian#template) Brace#ar01 4_M_LGTGUARD
+arug_cas01,31,362,3 duplicate(Kafra#template) Kafra Employee#ar01 4_F_KAFRA1
+arug_cas01,211,234,0 duplicate(Guardian Stone#template) 1st Guardian Stone#ar01 CLEAR_NPC
+arug_cas01,308,189,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#ar01 CLEAR_NPC
+arug_cas01,247,52,0 duplicate(Control#template) Control Device01#ar01 HIDDEN_NPC
+arug_cas01,118,131,0 duplicate(Control#template) Control Device02#ar01 HIDDEN_NPC
+arug_cas01,82,172,0 duplicate(Control#template) Control Device03#ar01 HIDDEN_NPC
+arug_cas01,259,371,0 duplicate(Switch#template) #aru01_switch HIDDEN_NPC
+arug_cas01,157,345,3 duplicate(Sunflower#template) Mysterious Sunflower#06 4_RED_FLOWER
-arug_cas01,74,232,0 script LF-01#arug_cas01 111,{ callfunc "LinkFlag","First Gate House",158,237,"Second Gate House",297,248; }
-arug_cas01,77,232,0 script LF-02#arug_cas01 111,{ callfunc "LinkFlag","Defense Area 1-1",197,144,"Defense Area 1-2",245,103; }
-arug_cas01,80,232,0 script LF-03#arug_cas01 111,{ callfunc "LinkFlag","Defense Area 2-1",256,35,"Defense Area 2-2",186,26; }
-arug_cas01,83,232,0 script LF-04#arug_cas01 111,{ callfunc "LinkFlag","Defense Area 2-3",146,65,"Defense Area 2-4",176,111; }
-arug_cas01,86,232,0 script LF-05#arug_cas01 111,{ callfunc "LinkFlag","Defense Area 3-1",94,126,"Defense Area 3-2",126,126; }
-arug_cas01,89,232,0 script LF-06#arug_cas01 111,{ callfunc "LinkFlag","Defense Area 3-3",68,171,"Defense Area 3-4",105,182; }
-arug_cas01,92,232,0 script LF-07#arug_cas01 111,{ callfunc "LinkFlag","Gate House Fork",233,130; }
-arug_cas01,95,232,0 script LF-08#arug_cas01 111,{ callfunc "LinkFlag","Area 1-1",197,144,"Area 2-1",256,35,"Area 3-1",146,65; }
-arug_cas01,98,232,0 script LF-09#arug_cas01 111,{ callfunc "LinkFlag","Area 1-2",245,103,"Area 2-2",186,26,"Area 3-3",68,171; }
-arug_cas01,101,232,0 script LF-10#arug_cas01 111,{ callfunc "LinkFlag","Convenience Facility",121,357; }
-arug_cas01,72,176,0 script Mardol#LF_ar01_1::LF_ar01_1 111,{ callfunc "LinkFlag","Emperium Center",67,193; }
-arug_cas01,103,186,0 duplicate(LF_ar01_1) Mardol#LF_ar01_2 111
-arug_cas01,92,126,4 script Mardol#LF_ar01_3::LF_ar01_2 111,{
+arug_cas01,74,232,0 script LF-01#arug_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",158,237,"Second Gate House",297,248; }
+arug_cas01,77,232,0 script LF-02#arug_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",197,144,"Defense Area 1-2",245,103; }
+arug_cas01,80,232,0 script LF-03#arug_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",256,35,"Defense Area 2-2",186,26; }
+arug_cas01,83,232,0 script LF-04#arug_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",146,65,"Defense Area 2-4",176,111; }
+arug_cas01,86,232,0 script LF-05#arug_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",94,126,"Defense Area 3-2",126,126; }
+arug_cas01,89,232,0 script LF-06#arug_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-3",68,171,"Defense Area 3-4",105,182; }
+arug_cas01,92,232,0 script LF-07#arug_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Gate House Fork",233,130; }
+arug_cas01,95,232,0 script LF-08#arug_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-1",197,144,"Area 2-1",256,35,"Area 3-1",146,65; }
+arug_cas01,98,232,0 script LF-09#arug_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",245,103,"Area 2-2",186,26,"Area 3-3",68,171; }
+arug_cas01,101,232,0 script LF-10#arug_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",121,357; }
+arug_cas01,72,176,0 script Mardol#LF_ar01_1::LF_ar01_1 HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",67,193; }
+arug_cas01,103,186,0 duplicate(LF_ar01_1) Mardol#LF_ar01_2 HIDDEN_NPC
+arug_cas01,92,126,4 script Mardol#LF_ar01_3::LF_ar01_2 HIDDEN_NPC,{
callfunc "LinkFlag","Emperium Center",67,193;
end;
OnAgitInit2:
@@ -49,20 +49,20 @@ OnRecvCastleAr01:
FlagEmblem GetCastleData("arug_cas01",1);
end;
}
-arug_cas01,127,126,4 duplicate(LF_ar01_2) Mardol#LF_ar01_3 111
-arug_cas01,150,102,0 duplicate(LF_ar01_1) Mardol#LF_ar01_4 111
-arug_cas01,208,68,0 duplicate(LF_ar01_1) Mardol#LF_ar01_5 111
-arug_cas01,249,52,0 duplicate(LF_ar01_1) Mardol#LF_ar01_6 111
-arug_cas01,234,76,0 duplicate(LF_ar01_1) Mardol#LF_ar01_7 111
-arug_cas01,249,76,0 duplicate(LF_ar01_1) Mardol#LF_ar01_8 111
-arug_cas01,204,142,0 duplicate(LF_ar01_1) Mardol#LF_ar01_9 111
-arug_cas01,183,244,0 duplicate(LF_ar01_1) Mardol#LF_ar01_10 111
-arug_cas01,292,219,0 duplicate(LF_ar01_1) Mardol#LF_ar01_11 111
-arug_cas01,102,120,4 duplicate(LF_ar01_2) Mardol#LF_ar01_12 722
-arug_cas01,117,120,4 duplicate(LF_ar01_2) Mardol#LF_ar01_13 722
-arug_cas01,233,140,4 duplicate(LF_ar01_2) Mardol#LF_ar01_14 722
+arug_cas01,127,126,4 duplicate(LF_ar01_2) Mardol#LF_ar01_3 HIDDEN_NPC
+arug_cas01,150,102,0 duplicate(LF_ar01_1) Mardol#LF_ar01_4 HIDDEN_NPC
+arug_cas01,208,68,0 duplicate(LF_ar01_1) Mardol#LF_ar01_5 HIDDEN_NPC
+arug_cas01,249,52,0 duplicate(LF_ar01_1) Mardol#LF_ar01_6 HIDDEN_NPC
+arug_cas01,234,76,0 duplicate(LF_ar01_1) Mardol#LF_ar01_7 HIDDEN_NPC
+arug_cas01,249,76,0 duplicate(LF_ar01_1) Mardol#LF_ar01_8 HIDDEN_NPC
+arug_cas01,204,142,0 duplicate(LF_ar01_1) Mardol#LF_ar01_9 HIDDEN_NPC
+arug_cas01,183,244,0 duplicate(LF_ar01_1) Mardol#LF_ar01_10 HIDDEN_NPC
+arug_cas01,292,219,0 duplicate(LF_ar01_1) Mardol#LF_ar01_11 HIDDEN_NPC
+arug_cas01,102,120,4 duplicate(LF_ar01_2) Mardol#LF_ar01_12 GUILD_FLAG
+arug_cas01,117,120,4 duplicate(LF_ar01_2) Mardol#LF_ar01_13 GUILD_FLAG
+arug_cas01,233,140,4 duplicate(LF_ar01_2) Mardol#LF_ar01_14 GUILD_FLAG
-aru_gld,164,270,4 script Mardol#flag_Ar01_1::Ar01_Flag 722,{
+aru_gld,164,270,4 script Mardol#flag_Ar01_1::Ar01_Flag GUILD_FLAG,{
callfunc "ReturnFlag","arug_cas01",1;
end;
OnAgitInit2:
@@ -70,6 +70,6 @@ OnRecvCastleAr01:
FlagEmblem GetCastleData("arug_cas01",1);
end;
}
-aru_gld,142,235,4 duplicate(Ar01_Flag) Mardol#flag_Ar01_2 722
-aru_gld,164,245,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_3 722
-aru_gld,182,255,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_4 722 \ No newline at end of file
+aru_gld,142,235,4 duplicate(Ar01_Flag) Mardol#flag_Ar01_2 GUILD_FLAG
+aru_gld,164,245,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_3 GUILD_FLAG
+aru_gld,182,255,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_4 GUILD_FLAG \ No newline at end of file
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index a6b7f0d55..31bd02ad6 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -18,38 +18,38 @@
- duplicate(RL#template) RL2#arug_cas02 -1
- duplicate(RL#template) RL3#arug_cas02 -1
-arug_cas02,303,341,3 duplicate(Steward#template) Steward#ar02 55
-arug_cas02,38,259,5 duplicate(Guardian#template) Yumenes#ar02 868
-arug_cas02,354,326,3 duplicate(Kafra#template) Kafra Employee#ar02 117
-arug_cas02,33,168,0 duplicate(Guardian Stone#template) 1st Guardian Stone#ar02 844
-arug_cas02,245,168,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#ar02 844
-arug_cas02,143,228,0 duplicate(Control#template) Control Device01#ar02 111
-arug_cas02,118,356,0 duplicate(Control#template) Control Device02#ar02 111
-arug_cas02,56,308,0 duplicate(Control#template) Control Device03#ar02 111
-arug_cas02,386,227,0 duplicate(Switch#template) #aru02_switch 111
-arug_cas02,350,294,3 duplicate(Sunflower#template) Mysterious Sunflower#07 977
+arug_cas02,303,341,3 duplicate(Steward#template) Steward#ar02 1_M_JOBTESTER
+arug_cas02,38,259,5 duplicate(Guardian#template) Yumenes#ar02 4_M_LGTGUARD
+arug_cas02,354,326,3 duplicate(Kafra#template) Kafra Employee#ar02 4_F_KAFRA1
+arug_cas02,33,168,0 duplicate(Guardian Stone#template) 1st Guardian Stone#ar02 CLEAR_NPC
+arug_cas02,245,168,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#ar02 CLEAR_NPC
+arug_cas02,143,228,0 duplicate(Control#template) Control Device01#ar02 HIDDEN_NPC
+arug_cas02,118,356,0 duplicate(Control#template) Control Device02#ar02 HIDDEN_NPC
+arug_cas02,56,308,0 duplicate(Control#template) Control Device03#ar02 HIDDEN_NPC
+arug_cas02,386,227,0 duplicate(Switch#template) #aru02_switch HIDDEN_NPC
+arug_cas02,350,294,3 duplicate(Sunflower#template) Mysterious Sunflower#07 4_RED_FLOWER
-arug_cas02,98,270,0 script LF-01#arug_cas02 111,{ callfunc "LinkFlag","First Gate House",10,187,"Second Gate House",268,187; }
-arug_cas02,98,266,0 script LF-02#arug_cas02 111,{ callfunc "LinkFlag","Defense Area 1-1",66,31,"Defense Area 1-2",212,31; }
-arug_cas02,98,262,0 script LF-03#arug_cas02 111,{ callfunc "LinkFlag","Defense Area 1-3",90,120,"Defense Area 1-4",188,119; }
-arug_cas02,98,258,0 script LF-04#arug_cas02 111,{ callfunc "LinkFlag","Defense Area 2-1",119,183,"Defense Area 2-2",159,183; }
-arug_cas02,98,253,0 script LF-05#arug_cas02 111,{ callfunc "LinkFlag","Defense Area 2-3",156,324,"Defense Area 2-4",174,372; }
-arug_cas02,98,249,0 script LF-06#arug_cas02 111,{ callfunc "LinkFlag","Defense Area 3-1",28,325,"Defense Area 3-2",57,325; }
-arug_cas02,98,245,0 script LF-07#arug_cas02 111,{ callfunc "LinkFlag","Center 2nd Area",156,263,"Center 3rd Area",43,354; }
-arug_cas02,98,241,0 script LF-08#arug_cas02 111,{ callfunc "LinkFlag","Convenience Facility",387,323; }
-arug_cas02,216,92,0 script Cyr#LF_ar02_1::LF_ar02_1 111,{ callfunc "LinkFlag","Emperium Center",43,256; }
-arug_cas02,63,92,0 duplicate(LF_ar02_1) Cyr#LF_ar02_2 111
-arug_cas02,127,133,4 duplicate(LF_ar02_1) Cyr#LF_ar02_3 111
-arug_cas02,152,133,4 duplicate(LF_ar02_1) Cyr#LF_ar02_4 111
-arug_cas02,149,218,0 duplicate(LF_ar02_1) Cyr#LF_ar02_5 111
-arug_cas02,162,218,0 duplicate(LF_ar02_1) Cyr#LF_ar02_6 111
-arug_cas02,128,350,0 duplicate(LF_ar02_1) Cyr#LF_ar02_7 111
-arug_cas02,128,341,0 duplicate(LF_ar02_1) Cyr#LF_ar02_8 111
-arug_cas02,49,317,0 duplicate(LF_ar02_1) Cyr#LF_ar02_9 111
-arug_cas02,30,317,0 duplicate(LF_ar02_1) Cyr#LF_ar02_10 111
-arug_cas02,9,190,0 duplicate(LF_ar02_1) Cyr#LF_ar02_11 111
-arug_cas02,271,190,0 duplicate(LF_ar02_1) Cyr#LF_ar02_12 111
-arug_cas02,129,178,4 script Cyr#LF_ar02_13::LF_ar02_2 722,{
+arug_cas02,98,270,0 script LF-01#arug_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",10,187,"Second Gate House",268,187; }
+arug_cas02,98,266,0 script LF-02#arug_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",66,31,"Defense Area 1-2",212,31; }
+arug_cas02,98,262,0 script LF-03#arug_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-3",90,120,"Defense Area 1-4",188,119; }
+arug_cas02,98,258,0 script LF-04#arug_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",119,183,"Defense Area 2-2",159,183; }
+arug_cas02,98,253,0 script LF-05#arug_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",156,324,"Defense Area 2-4",174,372; }
+arug_cas02,98,249,0 script LF-06#arug_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",28,325,"Defense Area 3-2",57,325; }
+arug_cas02,98,245,0 script LF-07#arug_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Center 2nd Area",156,263,"Center 3rd Area",43,354; }
+arug_cas02,98,241,0 script LF-08#arug_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",387,323; }
+arug_cas02,216,92,0 script Cyr#LF_ar02_1::LF_ar02_1 HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",43,256; }
+arug_cas02,63,92,0 duplicate(LF_ar02_1) Cyr#LF_ar02_2 HIDDEN_NPC
+arug_cas02,127,133,4 duplicate(LF_ar02_1) Cyr#LF_ar02_3 HIDDEN_NPC
+arug_cas02,152,133,4 duplicate(LF_ar02_1) Cyr#LF_ar02_4 HIDDEN_NPC
+arug_cas02,149,218,0 duplicate(LF_ar02_1) Cyr#LF_ar02_5 HIDDEN_NPC
+arug_cas02,162,218,0 duplicate(LF_ar02_1) Cyr#LF_ar02_6 HIDDEN_NPC
+arug_cas02,128,350,0 duplicate(LF_ar02_1) Cyr#LF_ar02_7 HIDDEN_NPC
+arug_cas02,128,341,0 duplicate(LF_ar02_1) Cyr#LF_ar02_8 HIDDEN_NPC
+arug_cas02,49,317,0 duplicate(LF_ar02_1) Cyr#LF_ar02_9 HIDDEN_NPC
+arug_cas02,30,317,0 duplicate(LF_ar02_1) Cyr#LF_ar02_10 HIDDEN_NPC
+arug_cas02,9,190,0 duplicate(LF_ar02_1) Cyr#LF_ar02_11 HIDDEN_NPC
+arug_cas02,271,190,0 duplicate(LF_ar02_1) Cyr#LF_ar02_12 HIDDEN_NPC
+arug_cas02,129,178,4 script Cyr#LF_ar02_13::LF_ar02_2 GUILD_FLAG,{
callfunc "LinkFlag","Emperium Center",43,256;
end;
OnAgitInit2:
@@ -57,11 +57,11 @@ OnRecvCastleAr02:
FlagEmblem GetCastleData("arug_cas02",1);
end;
}
-arug_cas02,149,178,4 duplicate(LF_ar02_2) Cyr#LF_ar02_14 722
-arug_cas02,132,38,4 duplicate(LF_ar02_2) Cyr#LF_ar02_15 722
-arug_cas02,147,38,4 duplicate(LF_ar02_2) Cyr#LF_ar02_16 722
+arug_cas02,149,178,4 duplicate(LF_ar02_2) Cyr#LF_ar02_14 GUILD_FLAG
+arug_cas02,132,38,4 duplicate(LF_ar02_2) Cyr#LF_ar02_15 GUILD_FLAG
+arug_cas02,147,38,4 duplicate(LF_ar02_2) Cyr#LF_ar02_16 GUILD_FLAG
-aru_gld,80,41,6 script Cyr#flag_Ar02_1::Ar02_Flag 722,{
+aru_gld,80,41,6 script Cyr#flag_Ar02_1::Ar02_Flag GUILD_FLAG,{
callfunc "ReturnFlag","arug_cas02",1;
end;
OnAgitInit2:
@@ -69,8 +69,8 @@ OnRecvCastleAr02:
FlagEmblem GetCastleData("arug_cas02",1);
end;
}
-aru_gld,80,52,6 duplicate(Ar02_Flag) Cyr#flag_Ar02_2 722
-aru_gld,120,83,5 script Cyr#flag_Ar02_3 722,{
+aru_gld,80,52,6 duplicate(Ar02_Flag) Cyr#flag_Ar02_2 GUILD_FLAG
+aru_gld,120,83,5 script Cyr#flag_Ar02_3 GUILD_FLAG,{
callfunc "ReturnFlag","arug_cas02",0;
end;
OnAgitInit2:
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index bf11c9449..415788f54 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -18,38 +18,38 @@
- duplicate(RL#template) RL2#arug_cas03 -1
- duplicate(RL#template) RL3#arug_cas03 -1
-arug_cas03,328,98,3 duplicate(Steward#template) Steward#ar03 55
-arug_cas03,146,315,3 duplicate(Guardian#template) Yehsus#ar03 868
-arug_cas03,315,98,5 duplicate(Kafra#template) Kafra Employee#ar03 117
-arug_cas03,65,171,0 duplicate(Guardian Stone#template) 1st Guardian Stone#ar03 844
-arug_cas03,212,149,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#ar03 844
-arug_cas03,136,158,0 duplicate(Control#template) Control Device01#ar03 111
-arug_cas03,135,212,0 duplicate(Control#template) Control Device02#ar03 111
-arug_cas03,134,266,0 duplicate(Control#template) Control Device03#ar03 111
-arug_cas03,299,277,0 duplicate(Switch#template) #aru03_switch 111
-arug_cas03,312,154,3 duplicate(Sunflower#template) Mysterious Sunflower#08 977
+arug_cas03,328,98,3 duplicate(Steward#template) Steward#ar03 1_M_JOBTESTER
+arug_cas03,146,315,3 duplicate(Guardian#template) Yehsus#ar03 4_M_LGTGUARD
+arug_cas03,315,98,5 duplicate(Kafra#template) Kafra Employee#ar03 4_F_KAFRA1
+arug_cas03,65,171,0 duplicate(Guardian Stone#template) 1st Guardian Stone#ar03 CLEAR_NPC
+arug_cas03,212,149,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#ar03 CLEAR_NPC
+arug_cas03,136,158,0 duplicate(Control#template) Control Device01#ar03 HIDDEN_NPC
+arug_cas03,135,212,0 duplicate(Control#template) Control Device02#ar03 HIDDEN_NPC
+arug_cas03,134,266,0 duplicate(Control#template) Control Device03#ar03 HIDDEN_NPC
+arug_cas03,299,277,0 duplicate(Switch#template) #aru03_switch HIDDEN_NPC
+arug_cas03,312,154,3 duplicate(Sunflower#template) Mysterious Sunflower#08 4_RED_FLOWER
-arug_cas03,122,314,0 script LF-01#arug_cas03 111,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
-arug_cas03,125,314,0 script LF-02#arug_cas03 111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
-arug_cas03,128,314,0 script LF-03#arug_cas03 111,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
-arug_cas03,131,314,0 script LF-04#arug_cas03 111,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
-arug_cas03,134,314,0 script LF-05#arug_cas03 111,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
-arug_cas03,149,314,0 script LF-06#arug_cas03 111,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
-arug_cas03,152,314,0 script LF-07#arug_cas03 111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
-arug_cas03,155,314,0 script LF-08#arug_cas03 111,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
-arug_cas03,158,314,0 script LF-09#arug_cas03 111,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
-arug_cas03,161,314,0 script LF-10#arug_cas03 111,{ callfunc "LinkFlag","Convenience Facility",321,57; }
-arug_cas03,45,158,0 script Horn#LF_ar03_01::LF_ar03_01 111,{ callfunc "LinkFlag","Emperium Center",121,318; }
-arug_cas03,226,156,0 duplicate(LF_ar03_01) Horn#LF_ar03_01 111
-arug_cas03,134,62,4 duplicate(LF_ar03_01) Horn#LF_ar03_02 111
-arug_cas03,149,62,4 duplicate(LF_ar03_01) Horn#LF_ar03_03 111
-arug_cas03,123,154,0 duplicate(LF_ar03_01) Horn#LF_ar03_04 111
-arug_cas03,160,154,0 duplicate(LF_ar03_01) Horn#LF_ar03_05 111
-arug_cas03,135,205,0 duplicate(LF_ar03_01) Horn#LF_ar03_06 111
-arug_cas03,148,205,0 duplicate(LF_ar03_01) Horn#LF_ar03_07 111
-arug_cas03,134,260,0 duplicate(LF_ar03_01) Horn#LF_ar03_08 111
-//arug_cas03,204,142,0 duplicate(LF_ar03_01) Horn#LF_ar03_09 111
-arug_cas03,148,103,4 script Horn#LF_ar03_10::LF_ar03_02 722,{
+arug_cas03,122,314,0 script LF-01#arug_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
+arug_cas03,125,314,0 script LF-02#arug_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
+arug_cas03,128,314,0 script LF-03#arug_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
+arug_cas03,131,314,0 script LF-04#arug_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
+arug_cas03,134,314,0 script LF-05#arug_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
+arug_cas03,149,314,0 script LF-06#arug_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
+arug_cas03,152,314,0 script LF-07#arug_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
+arug_cas03,155,314,0 script LF-08#arug_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
+arug_cas03,158,314,0 script LF-09#arug_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
+arug_cas03,161,314,0 script LF-10#arug_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",321,57; }
+arug_cas03,45,158,0 script Horn#LF_ar03_01::LF_ar03_01 HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",121,318; }
+arug_cas03,226,156,0 duplicate(LF_ar03_01) Horn#LF_ar03_01 HIDDEN_NPC
+arug_cas03,134,62,4 duplicate(LF_ar03_01) Horn#LF_ar03_02 HIDDEN_NPC
+arug_cas03,149,62,4 duplicate(LF_ar03_01) Horn#LF_ar03_03 HIDDEN_NPC
+arug_cas03,123,154,0 duplicate(LF_ar03_01) Horn#LF_ar03_04 HIDDEN_NPC
+arug_cas03,160,154,0 duplicate(LF_ar03_01) Horn#LF_ar03_05 HIDDEN_NPC
+arug_cas03,135,205,0 duplicate(LF_ar03_01) Horn#LF_ar03_06 HIDDEN_NPC
+arug_cas03,148,205,0 duplicate(LF_ar03_01) Horn#LF_ar03_07 HIDDEN_NPC
+arug_cas03,134,260,0 duplicate(LF_ar03_01) Horn#LF_ar03_08 HIDDEN_NPC
+//arug_cas03,204,142,0 duplicate(LF_ar03_01) Horn#LF_ar03_09 HIDDEN_NPC
+arug_cas03,148,103,4 script Horn#LF_ar03_10::LF_ar03_02 GUILD_FLAG,{
callfunc "LinkFlag","Emperium Center",121,318;
end;
OnAgitInit2:
@@ -57,11 +57,11 @@ OnRecvCastleAr03:
FlagEmblem GetCastleData("arug_cas03",1);
end;
}
-arug_cas03,135,103,4 duplicate(LF_ar03_02) Horn#LF_ar03_11 722
-arug_cas03,63,51,7 duplicate(LF_ar03_02) Horn#LF_ar03_12 722
-arug_cas03,214,51,1 duplicate(LF_ar03_02) Horn#LF_ar03_13 722
+arug_cas03,135,103,4 duplicate(LF_ar03_02) Horn#LF_ar03_11 GUILD_FLAG
+arug_cas03,63,51,7 duplicate(LF_ar03_02) Horn#LF_ar03_12 GUILD_FLAG
+arug_cas03,214,51,1 duplicate(LF_ar03_02) Horn#LF_ar03_13 GUILD_FLAG
-aru_gld,60,174,0 script Horn#flag_Ar03_1::Ar03_Flag 722,{
+aru_gld,60,174,0 script Horn#flag_Ar03_1::Ar03_Flag GUILD_FLAG,{
callfunc "ReturnFlag","arug_cas03",1;
end;
OnAgitInit2:
@@ -69,4 +69,4 @@ OnRecvCastleAr03:
FlagEmblem GetCastleData("arug_cas03",1);
end;
}
-aru_gld,74,174,0 duplicate(Ar03_Flag) Horn#flag_Ar03_2 722 \ No newline at end of file
+aru_gld,74,174,0 duplicate(Ar03_Flag) Horn#flag_Ar03_2 GUILD_FLAG \ No newline at end of file
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index c46c7ff15..c74ad619f 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -18,38 +18,38 @@
- duplicate(RL#template) RL2#arug_cas04 -1
- duplicate(RL#template) RL3#arug_cas04 -1
-arug_cas04,328,98,3 duplicate(Steward#template) Steward#ar04 55
-arug_cas04,146,315,3 duplicate(Guardian#template) Nios#ar04 868
-arug_cas04,315,98,5 duplicate(Kafra#template) Kafra Employee#ar04 117
-arug_cas04,65,171,0 duplicate(Guardian Stone#template) 1st Guardian Stone#ar04 844
-arug_cas04,212,149,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#ar04 844
-arug_cas04,136,158,0 duplicate(Control#template) Control Device01#ar04 111
-arug_cas04,135,212,0 duplicate(Control#template) Control Device02#ar04 111
-arug_cas04,134,266,0 duplicate(Control#template) Control Device03#ar04 111
-arug_cas04,299,277,0 duplicate(Switch#template) #aru04_switch 111
-arug_cas04,312,154,3 duplicate(Sunflower#template) Mysterious Sunflower#09 977
+arug_cas04,328,98,3 duplicate(Steward#template) Steward#ar04 1_M_JOBTESTER
+arug_cas04,146,315,3 duplicate(Guardian#template) Nios#ar04 4_M_LGTGUARD
+arug_cas04,315,98,5 duplicate(Kafra#template) Kafra Employee#ar04 4_F_KAFRA1
+arug_cas04,65,171,0 duplicate(Guardian Stone#template) 1st Guardian Stone#ar04 CLEAR_NPC
+arug_cas04,212,149,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#ar04 CLEAR_NPC
+arug_cas04,136,158,0 duplicate(Control#template) Control Device01#ar04 HIDDEN_NPC
+arug_cas04,135,212,0 duplicate(Control#template) Control Device02#ar04 HIDDEN_NPC
+arug_cas04,134,266,0 duplicate(Control#template) Control Device03#ar04 HIDDEN_NPC
+arug_cas04,299,277,0 duplicate(Switch#template) #aru04_switch HIDDEN_NPC
+arug_cas04,312,154,3 duplicate(Sunflower#template) Mysterious Sunflower#09 4_RED_FLOWER
-arug_cas04,122,314,0 script LF-01#arug_cas04 111,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
-arug_cas04,125,314,0 script LF-02#arug_cas04 111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
-arug_cas04,128,314,0 script LF-03#arug_cas04 111,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
-arug_cas04,131,314,0 script LF-04#arug_cas04 111,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
-arug_cas04,134,314,0 script LF-05#arug_cas04 111,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
-arug_cas04,149,314,0 script LF-06#arug_cas04 111,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
-arug_cas04,152,314,0 script LF-07#arug_cas04 111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
-arug_cas04,155,314,0 script LF-08#arug_cas04 111,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
-arug_cas04,158,314,0 script LF-09#arug_cas04 111,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
-arug_cas04,161,314,0 script LF-10#arug_cas04 111,{ callfunc "LinkFlag","Convenience Facility",321,57; }
-arug_cas04,45,158,0 script Gefn#LF_ar04_01::LF_ar04_01 111,{ callfunc "LinkFlag","Emperium Center",121,318; }
-arug_cas04,226,156,0 duplicate(LF_ar04_01) Gefn#LF_ar04_01 111
-arug_cas04,134,62,4 duplicate(LF_ar04_01) Gefn#LF_ar04_02 111
-arug_cas04,149,62,4 duplicate(LF_ar04_01) Gefn#LF_ar04_03 111
-arug_cas04,123,154,0 duplicate(LF_ar04_01) Gefn#LF_ar04_04 111
-arug_cas04,160,154,0 duplicate(LF_ar04_01) Gefn#LF_ar04_05 111
-arug_cas04,135,205,0 duplicate(LF_ar04_01) Gefn#LF_ar04_06 111
-arug_cas04,148,205,0 duplicate(LF_ar04_01) Gefn#LF_ar04_07 111
-arug_cas04,134,260,0 duplicate(LF_ar04_01) Gefn#LF_ar04_08 111
-//arug_cas04,204,142,0 duplicate(LF_ar04_01) Gefn#LF_ar04_09 111
-arug_cas04,148,103,4 script Gefn#LF_ar04_10::LF_ar04_02 722,{
+arug_cas04,122,314,0 script LF-01#arug_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
+arug_cas04,125,314,0 script LF-02#arug_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
+arug_cas04,128,314,0 script LF-03#arug_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
+arug_cas04,131,314,0 script LF-04#arug_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
+arug_cas04,134,314,0 script LF-05#arug_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
+arug_cas04,149,314,0 script LF-06#arug_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
+arug_cas04,152,314,0 script LF-07#arug_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
+arug_cas04,155,314,0 script LF-08#arug_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
+arug_cas04,158,314,0 script LF-09#arug_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
+arug_cas04,161,314,0 script LF-10#arug_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",321,57; }
+arug_cas04,45,158,0 script Gefn#LF_ar04_01::LF_ar04_01 HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",121,318; }
+arug_cas04,226,156,0 duplicate(LF_ar04_01) Gefn#LF_ar04_01 HIDDEN_NPC
+arug_cas04,134,62,4 duplicate(LF_ar04_01) Gefn#LF_ar04_02 HIDDEN_NPC
+arug_cas04,149,62,4 duplicate(LF_ar04_01) Gefn#LF_ar04_03 HIDDEN_NPC
+arug_cas04,123,154,0 duplicate(LF_ar04_01) Gefn#LF_ar04_04 HIDDEN_NPC
+arug_cas04,160,154,0 duplicate(LF_ar04_01) Gefn#LF_ar04_05 HIDDEN_NPC
+arug_cas04,135,205,0 duplicate(LF_ar04_01) Gefn#LF_ar04_06 HIDDEN_NPC
+arug_cas04,148,205,0 duplicate(LF_ar04_01) Gefn#LF_ar04_07 HIDDEN_NPC
+arug_cas04,134,260,0 duplicate(LF_ar04_01) Gefn#LF_ar04_08 HIDDEN_NPC
+//arug_cas04,204,142,0 duplicate(LF_ar04_01) Gefn#LF_ar04_09 HIDDEN_NPC
+arug_cas04,148,103,4 script Gefn#LF_ar04_10::LF_ar04_02 GUILD_FLAG,{
callfunc "LinkFlag","Emperium Center",121,318;
end;
OnAgitInit2:
@@ -57,11 +57,11 @@ OnRecvCastlear04:
FlagEmblem GetCastleData("arug_cas04",1);
end;
}
-arug_cas04,135,103,4 duplicate(LF_ar04_02) Gefn#LF_ar04_11 722
-arug_cas04,63,51,7 duplicate(LF_ar04_02) Gefn#LF_ar04_12 722
-arug_cas04,214,51,1 duplicate(LF_ar04_02) Gefn#LF_ar04_13 722
+arug_cas04,135,103,4 duplicate(LF_ar04_02) Gefn#LF_ar04_11 GUILD_FLAG
+arug_cas04,63,51,7 duplicate(LF_ar04_02) Gefn#LF_ar04_12 GUILD_FLAG
+arug_cas04,214,51,1 duplicate(LF_ar04_02) Gefn#LF_ar04_13 GUILD_FLAG
-aru_gld,306,359,6 script Gefn#flag_ar04_1::ar04_Flag 722,{
+aru_gld,306,359,6 script Gefn#flag_ar04_1::ar04_Flag GUILD_FLAG,{
callfunc "ReturnFlag","arug_cas04",1;
end;
OnAgitInit2:
@@ -69,8 +69,8 @@ OnRecvCastlear04:
FlagEmblem GetCastleData("arug_cas04",1);
end;
}
-aru_gld,306,348,6 duplicate(ar04_Flag) Gefn#flag_ar04_2 722
-aru_gld,301,318,4 script Gefn#flag_ar04_3::ar04_Flag2 722,{
+aru_gld,306,348,6 duplicate(ar04_Flag) Gefn#flag_ar04_2 GUILD_FLAG
+aru_gld,301,318,4 script Gefn#flag_ar04_3::ar04_Flag2 GUILD_FLAG,{
callfunc "ReturnFlag","arug_cas04",0;
end;
OnAgitInit2:
@@ -78,4 +78,4 @@ OnRecvCastlear04:
FlagEmblem GetCastleData("arug_cas04",1);
end;
}
-aru_gld,313,318,4 duplicate(ar04_Flag2) Gefn#flag_ar04_4 722 \ No newline at end of file
+aru_gld,313,318,4 duplicate(ar04_Flag2) Gefn#flag_ar04_4 GUILD_FLAG \ No newline at end of file
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index b250a9385..92c9d60bd 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -18,38 +18,38 @@
- duplicate(RL#template) RL2#arug_cas05 -1
- duplicate(RL#template) RL3#arug_cas05 -1
-arug_cas05,328,98,3 duplicate(Steward#template) Steward#ar05 55
-arug_cas05,146,315,3 duplicate(Guardian#template) Eeos#ar05 868
-arug_cas05,315,98,5 duplicate(Kafra#template) Kafra Employee#ar05 117
-arug_cas05,65,171,0 duplicate(Guardian Stone#template) 1st Guardian Stone#ar05 844
-arug_cas05,212,149,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#ar05 844
-arug_cas05,136,158,0 duplicate(Control#template) Control Device01#ar05 111
-arug_cas05,135,212,0 duplicate(Control#template) Control Device02#ar05 111
-arug_cas05,134,266,0 duplicate(Control#template) Control Device03#ar05 111
-arug_cas05,299,277,0 duplicate(Switch#template) #aru05_switch 111
-arug_cas05,312,154,3 duplicate(Sunflower#template) Mysterious Sunflower#10 977
+arug_cas05,328,98,3 duplicate(Steward#template) Steward#ar05 1_M_JOBTESTER
+arug_cas05,146,315,3 duplicate(Guardian#template) Eeos#ar05 4_M_LGTGUARD
+arug_cas05,315,98,5 duplicate(Kafra#template) Kafra Employee#ar05 4_F_KAFRA1
+arug_cas05,65,171,0 duplicate(Guardian Stone#template) 1st Guardian Stone#ar05 CLEAR_NPC
+arug_cas05,212,149,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#ar05 CLEAR_NPC
+arug_cas05,136,158,0 duplicate(Control#template) Control Device01#ar05 HIDDEN_NPC
+arug_cas05,135,212,0 duplicate(Control#template) Control Device02#ar05 HIDDEN_NPC
+arug_cas05,134,266,0 duplicate(Control#template) Control Device03#ar05 HIDDEN_NPC
+arug_cas05,299,277,0 duplicate(Switch#template) #aru05_switch HIDDEN_NPC
+arug_cas05,312,154,3 duplicate(Sunflower#template) Mysterious Sunflower#10 4_RED_FLOWER
-arug_cas05,122,314,0 script LF-01#arug_cas05 111,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
-arug_cas05,125,314,0 script LF-02#arug_cas05 111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
-arug_cas05,128,314,0 script LF-03#arug_cas05 111,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
-arug_cas05,131,314,0 script LF-04#arug_cas05 111,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
-arug_cas05,134,314,0 script LF-05#arug_cas05 111,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
-arug_cas05,149,314,0 script LF-06#arug_cas05 111,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
-arug_cas05,152,314,0 script LF-07#arug_cas05 111,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
-arug_cas05,155,314,0 script LF-08#arug_cas05 111,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
-arug_cas05,158,314,0 script LF-09#arug_cas05 111,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
-arug_cas05,161,314,0 script LF-10#arug_cas05 111,{ callfunc "LinkFlag","Convenience Facility",321,57; }
-arug_cas05,45,158,0 script Banadis#LF_ar05_01::LF_ar05_01 111,{ callfunc "LinkFlag","Emperium Center",121,318; }
-arug_cas05,226,156,0 duplicate(LF_ar05_01) Banadis#LF_ar05_01 111
-arug_cas05,134,62,4 duplicate(LF_ar05_01) Banadis#LF_ar05_02 111
-arug_cas05,149,62,4 duplicate(LF_ar05_01) Banadis#LF_ar05_03 111
-arug_cas05,123,154,0 duplicate(LF_ar05_01) Banadis#LF_ar05_04 111
-arug_cas05,160,154,0 duplicate(LF_ar05_01) Banadis#LF_ar05_05 111
-arug_cas05,135,205,0 duplicate(LF_ar05_01) Banadis#LF_ar05_06 111
-arug_cas05,148,205,0 duplicate(LF_ar05_01) Banadis#LF_ar05_07 111
-arug_cas05,134,260,0 duplicate(LF_ar05_01) Banadis#LF_ar05_08 111
-//arug_cas05,204,142,0 duplicate(LF_ar05_01) Banadis#LF_ar05_09 111
-arug_cas05,148,103,4 script Banadis#LF_ar05_10::LF_ar05_02 722,{
+arug_cas05,122,314,0 script LF-01#arug_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",84,158,"Second Gate House",197,136; }
+arug_cas05,125,314,0 script LF-02#arug_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 1-2",211,97; }
+arug_cas05,128,314,0 script LF-03#arug_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-3",112,73,"Defense Area 1-4",171,73; }
+arug_cas05,131,314,0 script LF-04#arug_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",112,152,"Defense Area 2-2",172,152; }
+arug_cas05,134,314,0 script LF-05#arug_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",120,186,"Defense Area 2-4",162,186; }
+arug_cas05,149,314,0 script LF-06#arug_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",116,235,"Defense Area 3-2",164,235; }
+arug_cas05,152,314,0 script LF-07#arug_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",65,94,"Defense Area 2-1",112,152,"Defense Area 3-1",116,235; }
+arug_cas05,155,314,0 script LF-08#arug_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-2",211,97,"Defense Area 2-2",172,152,"Defense Area 3-2",164,235; }
+arug_cas05,158,314,0 script LF-09#arug_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-4",171,73,"Defense Area 2-4",162,186; }
+arug_cas05,161,314,0 script LF-10#arug_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",321,57; }
+arug_cas05,45,158,0 script Banadis#LF_ar05_01::LF_ar05_01 HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",121,318; }
+arug_cas05,226,156,0 duplicate(LF_ar05_01) Banadis#LF_ar05_01 HIDDEN_NPC
+arug_cas05,134,62,4 duplicate(LF_ar05_01) Banadis#LF_ar05_02 HIDDEN_NPC
+arug_cas05,149,62,4 duplicate(LF_ar05_01) Banadis#LF_ar05_03 HIDDEN_NPC
+arug_cas05,123,154,0 duplicate(LF_ar05_01) Banadis#LF_ar05_04 HIDDEN_NPC
+arug_cas05,160,154,0 duplicate(LF_ar05_01) Banadis#LF_ar05_05 HIDDEN_NPC
+arug_cas05,135,205,0 duplicate(LF_ar05_01) Banadis#LF_ar05_06 HIDDEN_NPC
+arug_cas05,148,205,0 duplicate(LF_ar05_01) Banadis#LF_ar05_07 HIDDEN_NPC
+arug_cas05,134,260,0 duplicate(LF_ar05_01) Banadis#LF_ar05_08 HIDDEN_NPC
+//arug_cas05,204,142,0 duplicate(LF_ar05_01) Banadis#LF_ar05_09 HIDDEN_NPC
+arug_cas05,148,103,4 script Banadis#LF_ar05_10::LF_ar05_02 GUILD_FLAG,{
callfunc "LinkFlag","Emperium Center",121,318;
end;
OnAgitInit2:
@@ -57,11 +57,11 @@ OnRecvCastlear05:
FlagEmblem GetCastleData("arug_cas05",1);
end;
}
-arug_cas05,135,103,4 duplicate(LF_ar05_02) Banadis#LF_ar05_11 722
-arug_cas05,63,51,7 duplicate(LF_ar05_02) Banadis#LF_ar05_12 722
-arug_cas05,214,51,1 duplicate(LF_ar05_02) Banadis#LF_ar05_13 722
+arug_cas05,135,103,4 duplicate(LF_ar05_02) Banadis#LF_ar05_11 GUILD_FLAG
+arug_cas05,63,51,7 duplicate(LF_ar05_02) Banadis#LF_ar05_12 GUILD_FLAG
+arug_cas05,214,51,1 duplicate(LF_ar05_02) Banadis#LF_ar05_13 GUILD_FLAG
-aru_gld,289,103,6 script Banadis#flag_ar05_1::ar05_Flag 722,{
+aru_gld,289,103,6 script Banadis#flag_ar05_1::ar05_Flag GUILD_FLAG,{
callfunc "ReturnFlag","arug_cas05",1;
end;
OnAgitInit2:
@@ -69,8 +69,8 @@ OnRecvCastlear05:
FlagEmblem GetCastleData("arug_cas05",1);
end;
}
-aru_gld,289,112,6 duplicate(ar05_Flag) Banadis#flag_ar05_2 722
-aru_gld,350,98,6 script Banadis#flag_ar05_3::ar05_Flag2 722,{
+aru_gld,289,112,6 duplicate(ar05_Flag) Banadis#flag_ar05_2 GUILD_FLAG
+aru_gld,350,98,6 script Banadis#flag_ar05_3::ar05_Flag2 GUILD_FLAG,{
callfunc "ReturnFlag","arug_cas05",0;
end;
OnAgitInit2:
@@ -78,4 +78,4 @@ OnRecvCastlear05:
FlagEmblem GetCastleData("arug_cas05",1);
end;
}
-aru_gld,350,88,6 duplicate(ar05_Flag2) Banadis#flag_ar05_4 722 \ No newline at end of file
+aru_gld,350,88,6 duplicate(ar05_Flag2) Banadis#flag_ar05_4 GUILD_FLAG \ No newline at end of file
diff --git a/npc/guild2/guild_flags.txt b/npc/guild2/guild_flags.txt
index c5cf9bbc1..fac506f32 100644
--- a/npc/guild2/guild_flags.txt
+++ b/npc/guild2/guild_flags.txt
@@ -11,7 +11,7 @@
//============================================================
// Juno
-yuno,109,167,5 script Himinn 722,{
+yuno,109,167,5 script Himinn GUILD_FLAG,{
end;
OnAgitInit2:
@@ -20,7 +20,7 @@ OnRecvCastlesc01:
end;
}
-yuno,110,171,5 script Andlangr 722,{
+yuno,110,171,5 script Andlangr GUILD_FLAG,{
end;
OnAgitInit2:
@@ -29,7 +29,7 @@ OnRecvCastlesc02:
end;
}
-yuno,111,175,5 script Viblainn 722,{
+yuno,111,175,5 script Viblainn GUILD_FLAG,{
end;
OnAgitInit2:
@@ -38,7 +38,7 @@ OnRecvCastlesc03:
end;
}
-yuno,112,179,5 script Hljod 722,{
+yuno,112,179,5 script Hljod GUILD_FLAG,{
end;
OnAgitInit2:
@@ -47,7 +47,7 @@ OnRecvCastlesc04:
end;
}
-yuno,114,183,5 script Skidbladnir 722,{
+yuno,114,183,5 script Skidbladnir GUILD_FLAG,{
end;
OnAgitInit2:
@@ -57,7 +57,7 @@ OnRecvCastlesc05:
}
// Arunafeltz
-rachel,124,120,3 script Mardol 722,{
+rachel,124,120,3 script Mardol GUILD_FLAG,{
end;
OnAgitInit2:
@@ -66,7 +66,7 @@ OnRecvCastlear01:
end;
}
-rachel,136,120,5 script Cyr 722,{
+rachel,136,120,5 script Cyr GUILD_FLAG,{
end;
OnAgitInit2:
@@ -75,7 +75,7 @@ OnRecvCastlear02:
end;
}
-rachel,138,126,6 script Horn 722,{
+rachel,138,126,6 script Horn GUILD_FLAG,{
end;
OnAgitInit2:
@@ -84,7 +84,7 @@ OnRecvCastlear03:
end;
}
-rachel,135,131,7 script Gefn 722,{
+rachel,135,131,7 script Gefn GUILD_FLAG,{
end;
OnAgitInit2:
@@ -93,7 +93,7 @@ OnRecvCastlear04:
end;
}
-rachel,124,130,1 script Banadis 722,{
+rachel,124,130,1 script Banadis GUILD_FLAG,{
end;
OnAgitInit2:
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index 8200b49a0..ec15ab61d 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -18,30 +18,30 @@
- duplicate(RL#template) RL2#schg_cas01 -1
- duplicate(RL#template) RL3#schg_cas01 -1
-schg_cas01,247,305,3 duplicate(Steward#template) Steward#sc01 55
-schg_cas01,123,306,3 duplicate(Guardian#template) Ef#sc01 868
-schg_cas01,300,287,5 duplicate(Kafra#template) Kafra Employee#sc01 117
-schg_cas01,27,36,0 duplicate(Guardian Stone#template) 1st Guardian Stone#sc01 844
-schg_cas01,208,75,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#sc01 844
-schg_cas01,124,52,0 duplicate(Control#template) Control Device01#sc01 111
-schg_cas01,128,157,0 duplicate(Control#template) Control Device02#sc01 111
-schg_cas01,109,247,0 duplicate(Control#template) Control Device03#sc01 111
-schg_cas01,391,391,0 duplicate(Switch#template) #sch01_switch 111
-schg_cas01,280,391,3 duplicate(Sunflower#template) Mysterious Sunflower#01 976
+schg_cas01,247,305,3 duplicate(Steward#template) Steward#sc01 1_M_JOBTESTER
+schg_cas01,123,306,3 duplicate(Guardian#template) Ef#sc01 4_M_LGTGUARD
+schg_cas01,300,287,5 duplicate(Kafra#template) Kafra Employee#sc01 4_F_KAFRA1
+schg_cas01,27,36,0 duplicate(Guardian Stone#template) 1st Guardian Stone#sc01 CLEAR_NPC
+schg_cas01,208,75,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#sc01 CLEAR_NPC
+schg_cas01,124,52,0 duplicate(Control#template) Control Device01#sc01 HIDDEN_NPC
+schg_cas01,128,157,0 duplicate(Control#template) Control Device02#sc01 HIDDEN_NPC
+schg_cas01,109,247,0 duplicate(Control#template) Control Device03#sc01 HIDDEN_NPC
+schg_cas01,391,391,0 duplicate(Switch#template) #sch01_switch HIDDEN_NPC
+schg_cas01,280,391,3 duplicate(Sunflower#template) Mysterious Sunflower#01 4_BLUE_FLOWER
-schg_cas01,106,302,0 script LF-01#schg_cas01 111,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
-schg_cas01,109,302,0 script LF-02#schg_cas01 111,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
-schg_cas01,112,302,0 script LF-03#schg_cas01 111,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
-schg_cas01,115,302,0 script LF-04#schg_cas01 111,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
-schg_cas01,118,302,0 script LF-05#schg_cas01 111,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
-schg_cas01,121,302,0 script LF-06#schg_cas01 111,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
-schg_cas01,124,302,0 script LF-07#schg_cas01 111,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
-schg_cas01,127,302,0 script LF-08#schg_cas01 111,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
-schg_cas01,130,302,0 script LF-09#schg_cas01 111,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
-schg_cas01,133,302,0 script LF-10#schg_cas01 111,{ callfunc "LinkFlag","Convenience Facility",275,244; }
-schg_cas01,17,45,0 script Himinn#LF_sc01_1::LF_sc01_1 111,{ callfunc "LinkFlag","Emperium Center",120,290; }
-schg_cas01,207,95,0 duplicate(LF_sc01_1) Himinn#LF_sc01_2 111
-schg_cas01,111,46,4 script Himinn#LF_sc01_3::LF_sc01_2 722,{
+schg_cas01,106,302,0 script LF-01#schg_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
+schg_cas01,109,302,0 script LF-02#schg_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
+schg_cas01,112,302,0 script LF-03#schg_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
+schg_cas01,115,302,0 script LF-04#schg_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
+schg_cas01,118,302,0 script LF-05#schg_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
+schg_cas01,121,302,0 script LF-06#schg_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
+schg_cas01,124,302,0 script LF-07#schg_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
+schg_cas01,127,302,0 script LF-08#schg_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
+schg_cas01,130,302,0 script LF-09#schg_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
+schg_cas01,133,302,0 script LF-10#schg_cas01 HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",275,244; }
+schg_cas01,17,45,0 script Himinn#LF_sc01_1::LF_sc01_1 HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",120,290; }
+schg_cas01,207,95,0 duplicate(LF_sc01_1) Himinn#LF_sc01_2 HIDDEN_NPC
+schg_cas01,111,46,4 script Himinn#LF_sc01_3::LF_sc01_2 GUILD_FLAG,{
callfunc "LinkFlag","Emperium Center",120,290;
end;
OnAgitInit2:
@@ -49,19 +49,19 @@ OnRecvCastleSc01:
FlagEmblem GetCastleData("schg_cas01",1);
end;
}
-schg_cas01,129,46,4 duplicate(LF_sc01_2) Himinn#LF_sc01_4 722
-schg_cas01,99,77,0 duplicate(LF_sc01_1) Himinn#LF_sc01_5 111
-schg_cas01,140,77,0 duplicate(LF_sc01_1) Himinn#LF_sc01_6 111
-schg_cas01,109,150,4 duplicate(LF_sc01_2) Himinn#LF_sc01_7 722
-schg_cas01,130,150,4 duplicate(LF_sc01_2) Himinn#LF_sc01_8 722
-schg_cas01,112,212,0 duplicate(LF_sc01_1) Himinn#LF_sc01_9 111
-schg_cas01,127,212,0 duplicate(LF_sc01_1) Himinn#LF_sc01_10 111
-schg_cas01,113,238,0 duplicate(LF_sc01_1) Himinn#LF_sc01_11 111
-schg_cas01,126,238,0 duplicate(LF_sc01_1) Himinn#LF_sc01_12 111
-schg_cas01,95,247,0 duplicate(LF_sc01_1) Himinn#LF_sc01_13 111
-schg_cas01,144,247,0 duplicate(LF_sc01_1) Himinn#LF_sc01_14 111
+schg_cas01,129,46,4 duplicate(LF_sc01_2) Himinn#LF_sc01_4 GUILD_FLAG
+schg_cas01,99,77,0 duplicate(LF_sc01_1) Himinn#LF_sc01_5 HIDDEN_NPC
+schg_cas01,140,77,0 duplicate(LF_sc01_1) Himinn#LF_sc01_6 HIDDEN_NPC
+schg_cas01,109,150,4 duplicate(LF_sc01_2) Himinn#LF_sc01_7 GUILD_FLAG
+schg_cas01,130,150,4 duplicate(LF_sc01_2) Himinn#LF_sc01_8 GUILD_FLAG
+schg_cas01,112,212,0 duplicate(LF_sc01_1) Himinn#LF_sc01_9 HIDDEN_NPC
+schg_cas01,127,212,0 duplicate(LF_sc01_1) Himinn#LF_sc01_10 HIDDEN_NPC
+schg_cas01,113,238,0 duplicate(LF_sc01_1) Himinn#LF_sc01_11 HIDDEN_NPC
+schg_cas01,126,238,0 duplicate(LF_sc01_1) Himinn#LF_sc01_12 HIDDEN_NPC
+schg_cas01,95,247,0 duplicate(LF_sc01_1) Himinn#LF_sc01_13 HIDDEN_NPC
+schg_cas01,144,247,0 duplicate(LF_sc01_1) Himinn#LF_sc01_14 HIDDEN_NPC
-sch_gld,290,90,0 script Himinn#flag_sc01_1::Sc01_Flag 722,{
+sch_gld,290,90,0 script Himinn#flag_sc01_1::Sc01_Flag GUILD_FLAG,{
callfunc "ReturnFlag","schg_cas01",1;
end;
OnAgitInit2:
@@ -69,4 +69,4 @@ OnRecvCastlesc01:
FlagEmblem GetCastleData("schg_cas01",1);
end;
}
-sch_gld,297,90,0 duplicate(Sc01_Flag) Himinn#flag_sc01_2 722 \ No newline at end of file
+sch_gld,297,90,0 duplicate(Sc01_Flag) Himinn#flag_sc01_2 GUILD_FLAG \ No newline at end of file
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index 0a39f484a..a9c8858cd 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -18,42 +18,42 @@
- duplicate(RL#template) RL2#schg_cas02 -1
- duplicate(RL#template) RL3#schg_cas02 -1
-schg_cas02,105,378,3 duplicate(Steward#template) Steward#sc02 55
-schg_cas02,140,184,3 duplicate(Guardian#template) Endeef#sc02 868
-schg_cas02,131,365,3 duplicate(Kafra#template) Kafra Employee#sc02 117
-schg_cas02,231,57,0 duplicate(Guardian Stone#template) 1st Guardian Stone#sc02 844
-schg_cas02,335,231,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#sc02 844
-schg_cas02,288,97,0 duplicate(Control#template) Control Device01#sc02 111
-schg_cas02,230,209,0 duplicate(Control#template) Control Device02#sc02 111
-schg_cas02,159,143,0 duplicate(Control#template) Control Device03#sc02 111
-schg_cas02,257,369,0 duplicate(Switch#template) #sc02_switch 111
-schg_cas02,174,328,3 duplicate(Sunflower#template) Mysterious Sunflower#02 976
+schg_cas02,105,378,3 duplicate(Steward#template) Steward#sc02 1_M_JOBTESTER
+schg_cas02,140,184,3 duplicate(Guardian#template) Endeef#sc02 4_M_LGTGUARD
+schg_cas02,131,365,3 duplicate(Kafra#template) Kafra Employee#sc02 4_F_KAFRA1
+schg_cas02,231,57,0 duplicate(Guardian Stone#template) 1st Guardian Stone#sc02 CLEAR_NPC
+schg_cas02,335,231,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#sc02 CLEAR_NPC
+schg_cas02,288,97,0 duplicate(Control#template) Control Device01#sc02 HIDDEN_NPC
+schg_cas02,230,209,0 duplicate(Control#template) Control Device02#sc02 HIDDEN_NPC
+schg_cas02,159,143,0 duplicate(Control#template) Control Device03#sc02 HIDDEN_NPC
+schg_cas02,257,369,0 duplicate(Switch#template) #sc02_switch HIDDEN_NPC
+schg_cas02,174,328,3 duplicate(Sunflower#template) Mysterious Sunflower#02 4_BLUE_FLOWER
-schg_cas02,143,198,0 script LF-01#schg_cas02 111,{ callfunc "LinkFlag","First Gate House",235,44,"Second Gate House",302,233; }
-schg_cas02,143,202,0 script LF-02#schg_cas02 111,{ callfunc "LinkFlag","Defense Area 1-1",317,83,"Defense Area 1-2",359,83; }
-schg_cas02,143,206,0 script LF-03#schg_cas02 111,{ callfunc "LinkFlag","Defense Area 2-1",283,79,"Defense Area 2-2",280,122; }
-schg_cas02,145,208,0 script LF-04#schg_cas02 111,{ callfunc "LinkFlag","Defense Area 3-1",215,110,"Defense Area 3-2",255,215; }
-schg_cas02,180,208,0 script LF-05#schg_cas02 111,{ callfunc "LinkFlag","Center 1 Area",338,153,"Center 2 Area",213,226; }
-schg_cas02,182,206,0 script LF-06#schg_cas02 111,{ callfunc "LinkFlag","Defense Area 1-1",317,83,"Defense Area 2-1",283,79,"Defense Area 3-1",215,110; }
-schg_cas02,182,202,0 script LF-07#schg_cas02 111,{ callfunc "LinkFlag","Area 1-2",359,83,"Area 2-2",280,122,"Area 3-2",255,215; }
-schg_cas02,182,198,0 script LF-08#schg_cas02 111,{ callfunc "LinkFlag","Convenience Facility",101,306; }
-schg_cas02,235,222,0 script Andlangr#LF_sc02_1::LF_sc02_1 111,{ callfunc "LinkFlag","Emperium Center",136,188; }
-schg_cas02,157,136,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_2 111
-schg_cas02,168,136,4 duplicate(LF_sc02_1) Andlangr#LF_sc02_3 111
-schg_cas02,320,232,4 duplicate(LF_sc02_1) Andlangr#LF_sc02_4 111
-schg_cas02,295,109,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_5 111
-schg_cas02,295,92,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_6 111
-schg_cas02,285,90,4 duplicate(LF_sc02_1) Andlangr#LF_sc02_7 111
-schg_cas02,285,190,4 duplicate(LF_sc02_1) Andlangr#LF_sc02_8 111
-schg_cas02,238,66,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_9 111
-schg_cas02,230,45,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_10 111
-schg_cas02,233,120,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_11 111
-schg_cas02,247,120,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_12 111
-schg_cas02,261,162,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_13 111
-schg_cas02,244,162,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_14 111
-schg_cas02,235,207,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_15 111
+schg_cas02,143,198,0 script LF-01#schg_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",235,44,"Second Gate House",302,233; }
+schg_cas02,143,202,0 script LF-02#schg_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",317,83,"Defense Area 1-2",359,83; }
+schg_cas02,143,206,0 script LF-03#schg_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",283,79,"Defense Area 2-2",280,122; }
+schg_cas02,145,208,0 script LF-04#schg_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",215,110,"Defense Area 3-2",255,215; }
+schg_cas02,180,208,0 script LF-05#schg_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Center 1 Area",338,153,"Center 2 Area",213,226; }
+schg_cas02,182,206,0 script LF-06#schg_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",317,83,"Defense Area 2-1",283,79,"Defense Area 3-1",215,110; }
+schg_cas02,182,202,0 script LF-07#schg_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",359,83,"Area 2-2",280,122,"Area 3-2",255,215; }
+schg_cas02,182,198,0 script LF-08#schg_cas02 HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",101,306; }
+schg_cas02,235,222,0 script Andlangr#LF_sc02_1::LF_sc02_1 HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",136,188; }
+schg_cas02,157,136,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_2 HIDDEN_NPC
+schg_cas02,168,136,4 duplicate(LF_sc02_1) Andlangr#LF_sc02_3 HIDDEN_NPC
+schg_cas02,320,232,4 duplicate(LF_sc02_1) Andlangr#LF_sc02_4 HIDDEN_NPC
+schg_cas02,295,109,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_5 HIDDEN_NPC
+schg_cas02,295,92,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_6 HIDDEN_NPC
+schg_cas02,285,90,4 duplicate(LF_sc02_1) Andlangr#LF_sc02_7 HIDDEN_NPC
+schg_cas02,285,190,4 duplicate(LF_sc02_1) Andlangr#LF_sc02_8 HIDDEN_NPC
+schg_cas02,238,66,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_9 HIDDEN_NPC
+schg_cas02,230,45,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_10 HIDDEN_NPC
+schg_cas02,233,120,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_11 HIDDEN_NPC
+schg_cas02,247,120,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_12 HIDDEN_NPC
+schg_cas02,261,162,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_13 HIDDEN_NPC
+schg_cas02,244,162,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_14 HIDDEN_NPC
+schg_cas02,235,207,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_15 HIDDEN_NPC
-sch_gld,296,247,4 script Andlangr#flag_sc02_1::Sc02_Flag 722,{
+sch_gld,296,247,4 script Andlangr#flag_sc02_1::Sc02_Flag GUILD_FLAG,{
callfunc "ReturnFlag","schg_cas02",1;
end;
OnAgitInit2:
@@ -61,4 +61,4 @@ OnRecvCastlesc02:
FlagEmblem GetCastleData("schg_cas02",1);
end;
}
-sch_gld,280,247,4 duplicate(Sc02_Flag) Andlangr#flag_sc02_2 722 \ No newline at end of file
+sch_gld,280,247,4 duplicate(Sc02_Flag) Andlangr#flag_sc02_2 GUILD_FLAG \ No newline at end of file
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 6adfa0ca1..803fe1a59 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -18,38 +18,38 @@
- duplicate(RL#template) RL2#schg_cas03 -1
- duplicate(RL#template) RL3#schg_cas03 -1
-schg_cas03,88,90,3 duplicate(Steward#template) Steward#sc03 55
-schg_cas03,287,226,5 duplicate(Guardian#template) Elzee#sc03 868
-schg_cas03,50,50,3 duplicate(Kafra#template) Kafra Employee#sc03 117
-schg_cas03,242,309,0 duplicate(Guardian Stone#template) 1st Guardian Stone#sc03 844
-schg_cas03,376,250,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#sc03 844
-schg_cas03,335,298,0 duplicate(Control#template) Control Device01#sc03 111
-schg_cas03,200,227,0 duplicate(Control#template) Control Device02#sc03 111
-schg_cas03,273,205,0 duplicate(Control#template) Control Device03#sc03 111
-schg_cas03,199,25,0 duplicate(Switch#template) #sch03_switch 111
-schg_cas03,25,22,3 duplicate(Sunflower#template) Mysterious Sunflower#03 976
+schg_cas03,88,90,3 duplicate(Steward#template) Steward#sc03 1_M_JOBTESTER
+schg_cas03,287,226,5 duplicate(Guardian#template) Elzee#sc03 4_M_LGTGUARD
+schg_cas03,50,50,3 duplicate(Kafra#template) Kafra Employee#sc03 4_F_KAFRA1
+schg_cas03,242,309,0 duplicate(Guardian Stone#template) 1st Guardian Stone#sc03 CLEAR_NPC
+schg_cas03,376,250,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#sc03 CLEAR_NPC
+schg_cas03,335,298,0 duplicate(Control#template) Control Device01#sc03 HIDDEN_NPC
+schg_cas03,200,227,0 duplicate(Control#template) Control Device02#sc03 HIDDEN_NPC
+schg_cas03,273,205,0 duplicate(Control#template) Control Device03#sc03 HIDDEN_NPC
+schg_cas03,199,25,0 duplicate(Switch#template) #sch03_switch HIDDEN_NPC
+schg_cas03,25,22,3 duplicate(Sunflower#template) Mysterious Sunflower#03 4_BLUE_FLOWER
-schg_cas03,346,211,0 script LF-01#schg_cas03 111,{ callfunc "LinkFlag","First Gate House",262,323,"Second Gate House",378,263; }
-schg_cas03,346,207,0 script LF-02#schg_cas03 111,{ callfunc "LinkFlag","Center 1 Area",306,320; }
-schg_cas03,346,203,0 script LF-03#schg_cas03 111,{ callfunc "LinkFlag","Defense Area 2-1",309,292,"Defense Area 2-2",348,292; }
-schg_cas03,346,199,0 script LF-04#schg_cas03 111,{ callfunc "LinkFlag","Center 2 Area",266,263; }
-schg_cas03,346,195,0 script LF-05#schg_cas03 111,{ callfunc "LinkFlag","Defense Area 3-1",226,220,"Defense Area 3-2",185,249; }
-schg_cas03,346,191,0 script LF-06#schg_cas03 111,{ callfunc "LinkFlag","Center 3 Area",271,226; }
-schg_cas03,301,213,0 script LF-07#schg_cas03 111,{ callfunc "LinkFlag","Area 1-2",262,323,"Area 2-2",378,263,"Area 3-2",306,320; }
-schg_cas03,301,209,0 script LF-08#schg_cas03 111,{ callfunc "LinkFlag","Area 2-1",309,292,"Area 2-2",348,292,"Center 2 Area",326,263; }
-schg_cas03,301,194,0 script LF-09#schg_cas03 111,{ callfunc "LinkFlag","Area 3-1",226,220,"Area 3-2",185,249,"Center 3 Area",271,226; }
-schg_cas03,301,190,0 script LF-10#schg_cas03 111,{ callfunc "LinkFlag","Convenience Facility",57,13; }
-schg_cas03,335,305,0 script Vidblainn#LF_sc03_1::LF_sc03_1 111,{ callfunc "LinkFlag","Emperium Center",308,202; }
-schg_cas03,322,305,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_2 111
-schg_cas03,352,248,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_3 111
-schg_cas03,320,283,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_4 111
-schg_cas03,337,283,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_5 111
-schg_cas03,233,320,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_6 111
-schg_cas03,207,239,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_7 111
-schg_cas03,207,228,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_8 111
-schg_cas03,266,206,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_9 111
-schg_cas03,266,197,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_10 111
-schg_cas03,283,206,2 script Vidblainn#LF_sc03_11::LF_sc03_2 722,{
+schg_cas03,346,211,0 script LF-01#schg_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",262,323,"Second Gate House",378,263; }
+schg_cas03,346,207,0 script LF-02#schg_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Center 1 Area",306,320; }
+schg_cas03,346,203,0 script LF-03#schg_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",309,292,"Defense Area 2-2",348,292; }
+schg_cas03,346,199,0 script LF-04#schg_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Center 2 Area",266,263; }
+schg_cas03,346,195,0 script LF-05#schg_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",226,220,"Defense Area 3-2",185,249; }
+schg_cas03,346,191,0 script LF-06#schg_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Center 3 Area",271,226; }
+schg_cas03,301,213,0 script LF-07#schg_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",262,323,"Area 2-2",378,263,"Area 3-2",306,320; }
+schg_cas03,301,209,0 script LF-08#schg_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Area 2-1",309,292,"Area 2-2",348,292,"Center 2 Area",326,263; }
+schg_cas03,301,194,0 script LF-09#schg_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Area 3-1",226,220,"Area 3-2",185,249,"Center 3 Area",271,226; }
+schg_cas03,301,190,0 script LF-10#schg_cas03 HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",57,13; }
+schg_cas03,335,305,0 script Vidblainn#LF_sc03_1::LF_sc03_1 HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",308,202; }
+schg_cas03,322,305,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_2 HIDDEN_NPC
+schg_cas03,352,248,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_3 HIDDEN_NPC
+schg_cas03,320,283,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_4 HIDDEN_NPC
+schg_cas03,337,283,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_5 HIDDEN_NPC
+schg_cas03,233,320,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_6 HIDDEN_NPC
+schg_cas03,207,239,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_7 HIDDEN_NPC
+schg_cas03,207,228,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_8 HIDDEN_NPC
+schg_cas03,266,206,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_9 HIDDEN_NPC
+schg_cas03,266,197,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_10 HIDDEN_NPC
+schg_cas03,283,206,2 script Vidblainn#LF_sc03_11::LF_sc03_2 GUILD_FLAG,{
callfunc "LinkFlag","Emperium Center",308,202;
end;
OnAgitInit2:
@@ -57,11 +57,11 @@ OnRecvCastlesc03:
FlagEmblem GetCastleData("schg_cas03",1);
end;
}
-schg_cas03,283,197,2 duplicate(LF_sc03_2) Vidblainn#LF_sc03_12 722
-schg_cas03,332,323,6 duplicate(LF_sc03_2) Vidblainn#LF_sc03_13 722
-schg_cas03,343,323,2 duplicate(LF_sc03_2) Vidblainn#LF_sc03_14 722
+schg_cas03,283,197,2 duplicate(LF_sc03_2) Vidblainn#LF_sc03_12 GUILD_FLAG
+schg_cas03,332,323,6 duplicate(LF_sc03_2) Vidblainn#LF_sc03_13 GUILD_FLAG
+schg_cas03,343,323,2 duplicate(LF_sc03_2) Vidblainn#LF_sc03_14 GUILD_FLAG
-sch_gld,91,191,0 script Vidblainn#flag_sc03_1::Sc03_Flag 722,{
+sch_gld,91,191,0 script Vidblainn#flag_sc03_1::Sc03_Flag GUILD_FLAG,{
callfunc "ReturnFlag","schg_cas03",1;
end;
OnAgitInit2:
@@ -69,4 +69,4 @@ OnRecvCastlesc03:
FlagEmblem GetCastleData("schg_cas03",1);
end;
}
-sch_gld,104,191,0 duplicate(Sc03_Flag) Bidblind#flag_sc03_2 722 \ No newline at end of file
+sch_gld,104,191,0 duplicate(Sc03_Flag) Bidblind#flag_sc03_2 GUILD_FLAG \ No newline at end of file
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index 8da46dec5..b4228d6ce 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -18,30 +18,30 @@
- duplicate(RL#template) RL2#schg_cas04 -1
- duplicate(RL#template) RL3#schg_cas04 -1
-schg_cas04,247,305,3 duplicate(Steward#template) Steward#sc04 55
-schg_cas04,123,306,3 duplicate(Guardian#template) Ef#sc04 868
-schg_cas04,300,287,5 duplicate(Kafra#template) Kafra Employee#sc04 117
-schg_cas04,27,36,0 duplicate(Guardian Stone#template) 1st Guardian Stone#sc04 844
-schg_cas04,208,75,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#sc04 844
-schg_cas04,124,52,0 duplicate(Control#template) Control Device01#sc04 111
-schg_cas04,128,157,0 duplicate(Control#template) Control Device02#sc04 111
-schg_cas04,109,247,0 duplicate(Control#template) Control Device03#sc04 111
-schg_cas04,391,391,0 duplicate(Switch#template) #sch04_switch 111
-schg_cas04,280,391,3 duplicate(Sunflower#template) Mysterious Sunflower#04 976
+schg_cas04,247,305,3 duplicate(Steward#template) Steward#sc04 1_M_JOBTESTER
+schg_cas04,123,306,3 duplicate(Guardian#template) Ef#sc04 4_M_LGTGUARD
+schg_cas04,300,287,5 duplicate(Kafra#template) Kafra Employee#sc04 4_F_KAFRA1
+schg_cas04,27,36,0 duplicate(Guardian Stone#template) 1st Guardian Stone#sc04 CLEAR_NPC
+schg_cas04,208,75,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#sc04 CLEAR_NPC
+schg_cas04,124,52,0 duplicate(Control#template) Control Device01#sc04 HIDDEN_NPC
+schg_cas04,128,157,0 duplicate(Control#template) Control Device02#sc04 HIDDEN_NPC
+schg_cas04,109,247,0 duplicate(Control#template) Control Device03#sc04 HIDDEN_NPC
+schg_cas04,391,391,0 duplicate(Switch#template) #sch04_switch HIDDEN_NPC
+schg_cas04,280,391,3 duplicate(Sunflower#template) Mysterious Sunflower#04 4_BLUE_FLOWER
-schg_cas04,106,302,0 script LF-01#schg_cas04 111,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
-schg_cas04,109,302,0 script LF-02#schg_cas04 111,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
-schg_cas04,112,302,0 script LF-03#schg_cas04 111,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
-schg_cas04,115,302,0 script LF-04#schg_cas04 111,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
-schg_cas04,118,302,0 script LF-05#schg_cas04 111,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
-schg_cas04,121,302,0 script LF-06#schg_cas04 111,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
-schg_cas04,124,302,0 script LF-07#schg_cas04 111,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
-schg_cas04,127,302,0 script LF-08#schg_cas04 111,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
-schg_cas04,130,302,0 script LF-09#schg_cas04 111,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
-schg_cas04,133,302,0 script LF-10#schg_cas04 111,{ callfunc "LinkFlag","Convenience Facility",275,244; }
-schg_cas04,17,45,0 script Hljod#LF_sc04_1::LF_sc04_1 111,{ callfunc "LinkFlag","Emperium Center",120,290; }
-schg_cas04,207,95,0 duplicate(LF_sc04_1) Hljod#LF_sc04_2 111
-schg_cas04,111,46,4 script Hljod#LF_sc04_3::LF_sc04_2 722,{
+schg_cas04,106,302,0 script LF-01#schg_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
+schg_cas04,109,302,0 script LF-02#schg_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
+schg_cas04,112,302,0 script LF-03#schg_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
+schg_cas04,115,302,0 script LF-04#schg_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
+schg_cas04,118,302,0 script LF-05#schg_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
+schg_cas04,121,302,0 script LF-06#schg_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
+schg_cas04,124,302,0 script LF-07#schg_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
+schg_cas04,127,302,0 script LF-08#schg_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
+schg_cas04,130,302,0 script LF-09#schg_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
+schg_cas04,133,302,0 script LF-10#schg_cas04 HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",275,244; }
+schg_cas04,17,45,0 script Hljod#LF_sc04_1::LF_sc04_1 HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",120,290; }
+schg_cas04,207,95,0 duplicate(LF_sc04_1) Hljod#LF_sc04_2 HIDDEN_NPC
+schg_cas04,111,46,4 script Hljod#LF_sc04_3::LF_sc04_2 GUILD_FLAG,{
callfunc "LinkFlag","Emperium Center",120,290;
end;
OnAgitInit2:
@@ -49,19 +49,19 @@ OnRecvCastlesc04:
FlagEmblem GetCastleData("schg_cas04",1);
end;
}
-schg_cas04,129,46,4 duplicate(LF_sc04_2) Hljod#LF_sc04_4 722
-schg_cas04,99,77,0 duplicate(LF_sc04_1) Hljod#LF_sc04_5 111
-schg_cas04,140,77,0 duplicate(LF_sc04_1) Hljod#LF_sc04_6 111
-schg_cas04,109,150,4 duplicate(LF_sc04_2) Hljod#LF_sc04_7 722
-schg_cas04,130,150,4 duplicate(LF_sc04_2) Hljod#LF_sc04_8 722
-schg_cas04,112,212,0 duplicate(LF_sc04_1) Hljod#LF_sc04_9 111
-schg_cas04,127,212,0 duplicate(LF_sc04_1) Hljod#LF_sc04_10 111
-schg_cas04,113,238,0 duplicate(LF_sc04_1) Hljod#LF_sc04_11 111
-schg_cas04,126,238,0 duplicate(LF_sc04_1) Hljod#LF_sc04_12 111
-schg_cas04,95,247,0 duplicate(LF_sc04_1) Hljod#LF_sc04_13 111
-schg_cas04,144,247,0 duplicate(LF_sc04_1) Hljod#LF_sc04_14 111
+schg_cas04,129,46,4 duplicate(LF_sc04_2) Hljod#LF_sc04_4 GUILD_FLAG
+schg_cas04,99,77,0 duplicate(LF_sc04_1) Hljod#LF_sc04_5 HIDDEN_NPC
+schg_cas04,140,77,0 duplicate(LF_sc04_1) Hljod#LF_sc04_6 HIDDEN_NPC
+schg_cas04,109,150,4 duplicate(LF_sc04_2) Hljod#LF_sc04_7 GUILD_FLAG
+schg_cas04,130,150,4 duplicate(LF_sc04_2) Hljod#LF_sc04_8 GUILD_FLAG
+schg_cas04,112,212,0 duplicate(LF_sc04_1) Hljod#LF_sc04_9 HIDDEN_NPC
+schg_cas04,127,212,0 duplicate(LF_sc04_1) Hljod#LF_sc04_10 HIDDEN_NPC
+schg_cas04,113,238,0 duplicate(LF_sc04_1) Hljod#LF_sc04_11 HIDDEN_NPC
+schg_cas04,126,238,0 duplicate(LF_sc04_1) Hljod#LF_sc04_12 HIDDEN_NPC
+schg_cas04,95,247,0 duplicate(LF_sc04_1) Hljod#LF_sc04_13 HIDDEN_NPC
+schg_cas04,144,247,0 duplicate(LF_sc04_1) Hljod#LF_sc04_14 HIDDEN_NPC
-sch_gld,134,97,4 script Hljod#flag_sc04_1::sc04_Flag 722,{
+sch_gld,134,97,4 script Hljod#flag_sc04_1::sc04_Flag GUILD_FLAG,{
callfunc "ReturnFlag","schg_cas04",1;
end;
OnAgitInit2:
@@ -69,4 +69,4 @@ OnRecvCastlesc04:
FlagEmblem GetCastleData("schg_cas04",1);
end;
}
-sch_gld,141,97,4 duplicate(sc04_Flag) Hljod#flag_sc04_2 722 \ No newline at end of file
+sch_gld,141,97,4 duplicate(sc04_Flag) Hljod#flag_sc04_2 GUILD_FLAG \ No newline at end of file
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt
index 46b03e8bd..d3a2a0aac 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/guild2/schg_cas05.txt
@@ -18,30 +18,30 @@
- duplicate(RL#template) RL2#schg_cas05 -1
- duplicate(RL#template) RL3#schg_cas05 -1
-schg_cas05,247,305,3 duplicate(Steward#template) Steward#sc05 55
-schg_cas05,123,306,3 duplicate(Guardian#template) Ef#sc05 868
-schg_cas05,300,287,5 duplicate(Kafra#template) Kafra Employee#sc05 117
-schg_cas05,27,36,0 duplicate(Guardian Stone#template) 1st Guardian Stone#sc05 844
-schg_cas05,208,75,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#sc05 844
-schg_cas05,124,52,0 duplicate(Control#template) Control Device01#sc05 111
-schg_cas05,128,157,0 duplicate(Control#template) Control Device02#sc05 111
-schg_cas05,109,247,0 duplicate(Control#template) Control Device03#sc05 111
-schg_cas05,391,391,0 duplicate(Switch#template) #sch05_switch 111
-schg_cas05,280,391,3 duplicate(Sunflower#template) Mysterious Sunflower#05 976
+schg_cas05,247,305,3 duplicate(Steward#template) Steward#sc05 1_M_JOBTESTER
+schg_cas05,123,306,3 duplicate(Guardian#template) Ef#sc05 4_M_LGTGUARD
+schg_cas05,300,287,5 duplicate(Kafra#template) Kafra Employee#sc05 4_F_KAFRA1
+schg_cas05,27,36,0 duplicate(Guardian Stone#template) 1st Guardian Stone#sc05 CLEAR_NPC
+schg_cas05,208,75,0 duplicate(Guardian Stone#template) 2nd Guardian Stone#sc05 CLEAR_NPC
+schg_cas05,124,52,0 duplicate(Control#template) Control Device01#sc05 HIDDEN_NPC
+schg_cas05,128,157,0 duplicate(Control#template) Control Device02#sc05 HIDDEN_NPC
+schg_cas05,109,247,0 duplicate(Control#template) Control Device03#sc05 HIDDEN_NPC
+schg_cas05,391,391,0 duplicate(Switch#template) #sch05_switch HIDDEN_NPC
+schg_cas05,280,391,3 duplicate(Sunflower#template) Mysterious Sunflower#05 4_BLUE_FLOWER
-schg_cas05,106,302,0 script LF-01#schg_cas05 111,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
-schg_cas05,109,302,0 script LF-02#schg_cas05 111,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
-schg_cas05,112,302,0 script LF-03#schg_cas05 111,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
-schg_cas05,115,302,0 script LF-04#schg_cas05 111,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
-schg_cas05,118,302,0 script LF-05#schg_cas05 111,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
-schg_cas05,121,302,0 script LF-06#schg_cas05 111,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
-schg_cas05,124,302,0 script LF-07#schg_cas05 111,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
-schg_cas05,127,302,0 script LF-08#schg_cas05 111,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
-schg_cas05,130,302,0 script LF-09#schg_cas05 111,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
-schg_cas05,133,302,0 script LF-10#schg_cas05 111,{ callfunc "LinkFlag","Convenience Facility",275,244; }
-schg_cas05,17,45,0 script Skidbladnir#LF_sc05_1::LF_sc05_1 111,{ callfunc "LinkFlag","Emperium Center",120,290; }
-schg_cas05,207,95,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_2 111
-schg_cas05,111,46,4 script Skidbladnir#LF_sc05_3::LF_sc05_2 722,{
+schg_cas05,106,302,0 script LF-01#schg_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","First Gate House",19,26,"Second Gate House",219,90; }
+schg_cas05,109,302,0 script LF-02#schg_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 1-1",89,43,"Defense Area 1-2",141,45; }
+schg_cas05,112,302,0 script LF-03#schg_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-1",137,54,"Defense Area 2-2",102,54; }
+schg_cas05,115,302,0 script LF-04#schg_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",94,147,"Defense Area 2-4",163,140; }
+schg_cas05,118,302,0 script LF-05#schg_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 2-3",87,220,"Defense Area 2-4",151,220; }
+schg_cas05,121,302,0 script LF-06#schg_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Defense Area 3-1",100,242,"Defense Area 3-2",136,242; }
+schg_cas05,124,302,0 script LF-07#schg_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Center 1 Area",120,168,"Center 2 Area",119,211; }
+schg_cas05,127,302,0 script LF-08#schg_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-1",89,43,"Area 2-1",94,147,"Area 3-1",100,242; }
+schg_cas05,130,302,0 script LF-09#schg_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Area 1-2",141,45,"Area 2-3",163,140,"Area 3-2",136,243; }
+schg_cas05,133,302,0 script LF-10#schg_cas05 HIDDEN_NPC,{ callfunc "LinkFlag","Convenience Facility",275,244; }
+schg_cas05,17,45,0 script Skidbladnir#LF_sc05_1::LF_sc05_1 HIDDEN_NPC,{ callfunc "LinkFlag","Emperium Center",120,290; }
+schg_cas05,207,95,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_2 HIDDEN_NPC
+schg_cas05,111,46,4 script Skidbladnir#LF_sc05_3::LF_sc05_2 GUILD_FLAG,{
callfunc "LinkFlag","Emperium Center",120,290;
end;
OnAgitInit2:
@@ -49,19 +49,19 @@ OnRecvCastlesc05:
FlagEmblem GetCastleData("schg_cas05",1);
end;
}
-schg_cas05,129,46,4 duplicate(LF_sc05_2) Skidbladnir#LF_sc05_4 722
-schg_cas05,99,77,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_5 111
-schg_cas05,140,77,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_6 111
-schg_cas05,109,150,4 duplicate(LF_sc05_2) Skidbladnir#LF_sc05_7 722
-schg_cas05,130,150,4 duplicate(LF_sc05_2) Skidbladnir#LF_sc05_8 722
-schg_cas05,112,212,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_9 111
-schg_cas05,127,212,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_10 111
-schg_cas05,113,238,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_11 111
-schg_cas05,126,238,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_12 111
-schg_cas05,95,247,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_13 111
-schg_cas05,144,247,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_14 111
+schg_cas05,129,46,4 duplicate(LF_sc05_2) Skidbladnir#LF_sc05_4 GUILD_FLAG
+schg_cas05,99,77,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_5 HIDDEN_NPC
+schg_cas05,140,77,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_6 HIDDEN_NPC
+schg_cas05,109,150,4 duplicate(LF_sc05_2) Skidbladnir#LF_sc05_7 GUILD_FLAG
+schg_cas05,130,150,4 duplicate(LF_sc05_2) Skidbladnir#LF_sc05_8 GUILD_FLAG
+schg_cas05,112,212,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_9 HIDDEN_NPC
+schg_cas05,127,212,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_10 HIDDEN_NPC
+schg_cas05,113,238,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_11 HIDDEN_NPC
+schg_cas05,126,238,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_12 HIDDEN_NPC
+schg_cas05,95,247,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_13 HIDDEN_NPC
+schg_cas05,144,247,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_14 HIDDEN_NPC
-sch_gld,101,284,4 script Skidbladnir#flag_sc05_1::sc05_Flag 722,{
+sch_gld,101,284,4 script Skidbladnir#flag_sc05_1::sc05_Flag GUILD_FLAG,{
callfunc "ReturnFlag","schg_cas05",1;
end;
OnAgitInit2:
@@ -69,6 +69,6 @@ OnRecvCastlesc05:
FlagEmblem GetCastleData("schg_cas05",1);
end;
}
-sch_gld,91,284,4 duplicate(sc05_Flag) Skidbladnir#flag_sc05_2 722
-sch_gld,66,320,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_3 722
-sch_gld,66,310,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_4 722 \ No newline at end of file
+sch_gld,91,284,4 duplicate(sc05_Flag) Skidbladnir#flag_sc05_2 GUILD_FLAG
+sch_gld,66,320,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_3 GUILD_FLAG
+sch_gld,66,310,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_4 GUILD_FLAG \ No newline at end of file
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index 80015ffc8..7d1bee6aa 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -43,7 +43,7 @@
5@tower mapflag src4instance
6@tower mapflag src4instance
//============================================================
-alberta,214,77,6 script Captain Janssen 709,{
+alberta,214,77,6 script Captain Janssen 4_M_SEAMAN,{
if (checkweight(1201,1) == 0) {
mes "^008800Wait here!!";
mes "You're carrying too much stuff. Why don't you put some of it away, and then come back.^000000";
@@ -207,7 +207,7 @@ alberta,214,77,6 script Captain Janssen 709,{
}
}
-e_tower,81,105,0 script Tower Protection Stone 406,{
+e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{
set .@party_id,getcharid(1);
set .@p_name$,getpartyname(.@party_id);
@@ -326,7 +326,7 @@ L_Enter:
}
}
-e_tower,30,30,2 script Huge Vortex 844,2,2,{
+e_tower,30,30,2 script Huge Vortex CLEAR_NPC,2,2,{
end;
OnTouch:
mapannounce "e_tower","[ " + strcharinfo(0) + " ], seems to be engulfed by a huge vortex",bc_map,"0x00ff99",FW_NORMAL,12;
@@ -335,7 +335,7 @@ OnTouch:
}
// Original name: "#102Administrator Mode104"
-e_tower,1,1,2 script #102Administrator Mode 844,{
+e_tower,1,1,2 script #102Administrator Mode CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "Please enter the password";
set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -361,7 +361,7 @@ e_tower,1,1,2 script #102Administrator Mode 844,{
}
}
-e_tower,69,117,4 script Purification Stone#et1 406,{
+e_tower,69,117,4 script Purification Stone#et1 2_MONEMUS,{
set etower_timer,0;
mes "^0000ffThe records and aftereffects related to the Endless Tower have been removed. You can generate and enter the Endless Tower again.^000000";
close;
@@ -392,7 +392,7 @@ OnTimer1800000:
end;
}
-e_tower,151,185,4 script Purification Stone#et2 844,{
+e_tower,151,185,4 script Purification Stone#et2 CLEAR_NPC,{
callfunc "F_GM_NPC";
set etower_timer,0;
mes "^0000ffThe records and aftereffects related to the Endless Tower have been removed. You can generate and enter the Endless Tower again.^000000";
@@ -1196,7 +1196,7 @@ function script F_Tower_Warp {
// Levels 1-25
//============================================================
-1@tower,50,360,0 script Immortal Brazier# 844,{
+1@tower,50,360,0 script Immortal Brazier# CLEAR_NPC,{
mes "- A Message is Engraved on the Brazier -";
mes "The one who scatters the ashes of the darkness in this place shall become one step closer to Nacht Sieger, the Hegemon King of the Darkness...";
next;
@@ -1225,7 +1225,7 @@ OnTimer10000:
end;
}
-1@tower,29,365,1 script #1F Controller 844,{
+1@tower,29,365,1 script #1F Controller CLEAR_NPC,{
end;
OnInstanceInit:
@@ -1299,29 +1299,29 @@ L_Display:
else if (.@mod == 3 && getarg(0) != 13) return getarg(0)+"rd";
else return getarg(0)+"th";
}
-1@tower,96,393,0 duplicate(1FGate102tower) 2FGate102tower 45,2,2
-1@tower,184,393,0 duplicate(1FGate102tower) 3FGate102tower 45,2,2
-1@tower,270,393,0 duplicate(1FGate102tower) 4FGate102tower 45,2,2
-1@tower,355,393,0 duplicate(1FGate102tower) 5FGate102tower 45,2,2
-1@tower,12,309,0 duplicate(1FGate102tower) 6FGate102tower 45,2,2
-1@tower,96,309,0 duplicate(1FGate102tower) 7FGate102tower 45,2,2
-1@tower,184,309,0 duplicate(1FGate102tower) 8FGate102tower 45,2,2
-1@tower,270,309,0 duplicate(1FGate102tower) 9FGate102tower 45,2,2
-1@tower,355,309,0 duplicate(1FGate102tower) 10FGate102tower 45,2,2
-1@tower,12,222,0 duplicate(1FGate102tower) 11FGate102tower 45,2,2
-1@tower,96,222,0 duplicate(1FGate102tower) 12FGate102tower 45,2,2
-1@tower,184,222,0 duplicate(1FGate102tower) 13FGate102tower 45,2,2
-1@tower,270,222,0 duplicate(1FGate102tower) 14FGate102tower 45,2,2
-1@tower,355,222,0 duplicate(1FGate102tower) 15FGate102tower 45,2,2
-1@tower,12,138,0 duplicate(1FGate102tower) 16FGate102tower 45,2,2
-1@tower,96,138,0 duplicate(1FGate102tower) 17FGate102tower 45,2,2
-1@tower,184,138,0 duplicate(1FGate102tower) 18FGate102tower 45,2,2
-1@tower,270,138,0 duplicate(1FGate102tower) 19FGate102tower 45,2,2
-1@tower,355,138,0 duplicate(1FGate102tower) 20FGate102tower 45,2,2
-1@tower,12,51,0 duplicate(1FGate102tower) 21FGate102tower 45,2,2
-1@tower,96,51,0 duplicate(1FGate102tower) 22FGate102tower 45,2,2
-1@tower,184,51,0 duplicate(1FGate102tower) 23FGate102tower 45,2,2
-1@tower,270,51,0 duplicate(1FGate102tower) 24FGate102tower 45,2,2
+1@tower,96,393,0 duplicate(1FGate102tower) 2FGate102tower WARPNPC,2,2
+1@tower,184,393,0 duplicate(1FGate102tower) 3FGate102tower WARPNPC,2,2
+1@tower,270,393,0 duplicate(1FGate102tower) 4FGate102tower WARPNPC,2,2
+1@tower,355,393,0 duplicate(1FGate102tower) 5FGate102tower WARPNPC,2,2
+1@tower,12,309,0 duplicate(1FGate102tower) 6FGate102tower WARPNPC,2,2
+1@tower,96,309,0 duplicate(1FGate102tower) 7FGate102tower WARPNPC,2,2
+1@tower,184,309,0 duplicate(1FGate102tower) 8FGate102tower WARPNPC,2,2
+1@tower,270,309,0 duplicate(1FGate102tower) 9FGate102tower WARPNPC,2,2
+1@tower,355,309,0 duplicate(1FGate102tower) 10FGate102tower WARPNPC,2,2
+1@tower,12,222,0 duplicate(1FGate102tower) 11FGate102tower WARPNPC,2,2
+1@tower,96,222,0 duplicate(1FGate102tower) 12FGate102tower WARPNPC,2,2
+1@tower,184,222,0 duplicate(1FGate102tower) 13FGate102tower WARPNPC,2,2
+1@tower,270,222,0 duplicate(1FGate102tower) 14FGate102tower WARPNPC,2,2
+1@tower,355,222,0 duplicate(1FGate102tower) 15FGate102tower WARPNPC,2,2
+1@tower,12,138,0 duplicate(1FGate102tower) 16FGate102tower WARPNPC,2,2
+1@tower,96,138,0 duplicate(1FGate102tower) 17FGate102tower WARPNPC,2,2
+1@tower,184,138,0 duplicate(1FGate102tower) 18FGate102tower WARPNPC,2,2
+1@tower,270,138,0 duplicate(1FGate102tower) 19FGate102tower WARPNPC,2,2
+1@tower,355,138,0 duplicate(1FGate102tower) 20FGate102tower WARPNPC,2,2
+1@tower,12,51,0 duplicate(1FGate102tower) 21FGate102tower WARPNPC,2,2
+1@tower,96,51,0 duplicate(1FGate102tower) 22FGate102tower WARPNPC,2,2
+1@tower,184,51,0 duplicate(1FGate102tower) 23FGate102tower WARPNPC,2,2
+1@tower,270,51,0 duplicate(1FGate102tower) 24FGate102tower WARPNPC,2,2
1@tower,355,51,0 script 25FGate102tower 45,2,2,{
end;
@@ -1363,7 +1363,7 @@ OnTouch_:
end;
}
-1@tower,71,4,0 script #Broadcast Mode1 844,{
+1@tower,71,4,0 script #Broadcast Mode1 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -1380,7 +1380,7 @@ OnTimer120000:
end;
}
-1@tower,71,1,0 script #Manager Mode1 844,{
+1@tower,71,1,0 script #Manager Mode1 CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "Please enter the password.";
set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -1403,7 +1403,7 @@ OnTimer120000:
// Levels 26-50
//============================================================
-2@tower,29,365,2 script Immortal Furnace#1 844,{
+2@tower,29,365,2 script Immortal Furnace#1 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -1431,32 +1431,32 @@ OnTimer5000:
end;
}
-2@tower,12,393,0 duplicate(1FGate102tower) 26FGate102tower 45,2,2
-2@tower,96,393,0 duplicate(1FGate102tower) 27FGate102tower 45,2,2
-2@tower,184,393,0 duplicate(1FGate102tower) 28FGate102tower 45,2,2
-2@tower,270,393,0 duplicate(1FGate102tower) 29FGate102tower 45,2,2
-2@tower,355,393,0 duplicate(1FGate102tower) 30FGate102tower 45,2,2
-2@tower,12,309,0 duplicate(1FGate102tower) 31FGate102tower 45,2,2
-2@tower,96,309,0 duplicate(1FGate102tower) 32FGate102tower 45,2,2
-2@tower,184,309,0 duplicate(1FGate102tower) 33FGate102tower 45,2,2
-2@tower,270,309,0 duplicate(1FGate102tower) 34FGate102tower 45,2,2
-2@tower,355,309,0 duplicate(1FGate102tower) 35FGate102tower 45,2,2
-2@tower,12,222,0 duplicate(1FGate102tower) 36FGate102tower 45,2,2
-2@tower,96,222,0 duplicate(1FGate102tower) 37FGate102tower 45,2,2
-2@tower,184,222,0 duplicate(1FGate102tower) 38FGate102tower 45,2,2
-2@tower,270,222,0 duplicate(1FGate102tower) 39FGate102tower 45,2,2
-2@tower,355,222,0 duplicate(1FGate102tower) 40FGate102tower 45,2,2
-2@tower,12,138,0 duplicate(1FGate102tower) 41FGate102tower 45,2,2
-2@tower,96,138,0 duplicate(1FGate102tower) 42FGate102tower 45,2,2
-2@tower,184,138,0 duplicate(1FGate102tower) 43FGate102tower 45,2,2
-2@tower,270,138,0 duplicate(1FGate102tower) 44FGate102tower 45,2,2
-2@tower,355,138,0 duplicate(1FGate102tower) 45FGate102tower 45,2,2
-2@tower,12,51,0 duplicate(1FGate102tower) 46FGate102tower 45,2,2
-2@tower,96,51,0 duplicate(1FGate102tower) 47FGate102tower 45,2,2
-2@tower,184,51,0 duplicate(1FGate102tower) 48FGate102tower 45,2,2
-2@tower,270,51,0 duplicate(1FGate102tower) 49FGate102tower 45,2,2
-
-2@tower,355,51,0 script 50FGate102tower 45,2,2,{
+2@tower,12,393,0 duplicate(1FGate102tower) 26FGate102tower WARPNPC,2,2
+2@tower,96,393,0 duplicate(1FGate102tower) 27FGate102tower WARPNPC,2,2
+2@tower,184,393,0 duplicate(1FGate102tower) 28FGate102tower WARPNPC,2,2
+2@tower,270,393,0 duplicate(1FGate102tower) 29FGate102tower WARPNPC,2,2
+2@tower,355,393,0 duplicate(1FGate102tower) 30FGate102tower WARPNPC,2,2
+2@tower,12,309,0 duplicate(1FGate102tower) 31FGate102tower WARPNPC,2,2
+2@tower,96,309,0 duplicate(1FGate102tower) 32FGate102tower WARPNPC,2,2
+2@tower,184,309,0 duplicate(1FGate102tower) 33FGate102tower WARPNPC,2,2
+2@tower,270,309,0 duplicate(1FGate102tower) 34FGate102tower WARPNPC,2,2
+2@tower,355,309,0 duplicate(1FGate102tower) 35FGate102tower WARPNPC,2,2
+2@tower,12,222,0 duplicate(1FGate102tower) 36FGate102tower WARPNPC,2,2
+2@tower,96,222,0 duplicate(1FGate102tower) 37FGate102tower WARPNPC,2,2
+2@tower,184,222,0 duplicate(1FGate102tower) 38FGate102tower WARPNPC,2,2
+2@tower,270,222,0 duplicate(1FGate102tower) 39FGate102tower WARPNPC,2,2
+2@tower,355,222,0 duplicate(1FGate102tower) 40FGate102tower WARPNPC,2,2
+2@tower,12,138,0 duplicate(1FGate102tower) 41FGate102tower WARPNPC,2,2
+2@tower,96,138,0 duplicate(1FGate102tower) 42FGate102tower WARPNPC,2,2
+2@tower,184,138,0 duplicate(1FGate102tower) 43FGate102tower WARPNPC,2,2
+2@tower,270,138,0 duplicate(1FGate102tower) 44FGate102tower WARPNPC,2,2
+2@tower,355,138,0 duplicate(1FGate102tower) WARPNPCFGate102tower WARPNPC,2,2
+2@tower,12,51,0 duplicate(1FGate102tower) 46FGate102tower WARPNPC,2,2
+2@tower,96,51,0 duplicate(1FGate102tower) 47FGate102tower WARPNPC,2,2
+2@tower,184,51,0 duplicate(1FGate102tower) 48FGate102tower WARPNPC,2,2
+2@tower,270,51,0 duplicate(1FGate102tower) 49FGate102tower WARPNPC,2,2
+
+2@tower,355,51,0 script 50FGate102tower WARPNPC,2,2,{
end;
OnInstanceInit:
@@ -1480,7 +1480,7 @@ OnTimer120000:
end;
}
-2@tower,355,51,0 script 50FGate102tower-2 45,2,2,{
+2@tower,355,51,0 script 50FGate102tower-2 WARPNPC,2,2,{
end;
OnInstanceInit:
@@ -1496,7 +1496,7 @@ OnTouch_:
end;
}
-2@tower,71,1,0 script #Manager Mode2 844,{
+2@tower,71,1,0 script #Manager Mode2 CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "Please enter the password.";
set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -1519,7 +1519,7 @@ OnTouch_:
// Levels 51-75
//============================================================
-3@tower,29,365,2 script Immortal Furnace#2 844,{
+3@tower,29,365,2 script Immortal Furnace#2 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -1547,32 +1547,32 @@ OnTimer5000:
end;
}
-3@tower,12,393,0 duplicate(1FGate102tower) 51FGate102tower 45,2,2
-3@tower,96,393,0 duplicate(1FGate102tower) 52FGate102tower 45,2,2
-3@tower,184,393,0 duplicate(1FGate102tower) 53FGate102tower 45,2,2
-3@tower,270,393,0 duplicate(1FGate102tower) 54FGate102tower 45,2,2
-3@tower,355,393,0 duplicate(1FGate102tower) 55FGate102tower 45,2,2
-3@tower,12,309,0 duplicate(1FGate102tower) 56FGate102tower 45,2,2
-3@tower,96,309,0 duplicate(1FGate102tower) 57FGate102tower 45,2,2
-3@tower,184,309,0 duplicate(1FGate102tower) 58FGate102tower 45,2,2
-3@tower,270,309,0 duplicate(1FGate102tower) 59FGate102tower 45,2,2
-3@tower,355,309,0 duplicate(1FGate102tower) 60FGate102tower 45,2,2
-3@tower,12,222,0 duplicate(1FGate102tower) 61FGate102tower 45,2,2
-3@tower,96,222,0 duplicate(1FGate102tower) 62FGate102tower 45,2,2
-3@tower,184,222,0 duplicate(1FGate102tower) 63FGate102tower 45,2,2
-3@tower,270,222,0 duplicate(1FGate102tower) 64FGate102tower 45,2,2
-3@tower,355,222,0 duplicate(1FGate102tower) 65FGate102tower 45,2,2
-3@tower,12,138,0 duplicate(1FGate102tower) 66FGate102tower 45,2,2
-3@tower,96,138,0 duplicate(1FGate102tower) 67FGate102tower 45,2,2
-3@tower,184,138,0 duplicate(1FGate102tower) 68FGate102tower 45,2,2
-3@tower,270,138,0 duplicate(1FGate102tower) 69FGate102tower 45,2,2
-3@tower,355,138,0 duplicate(1FGate102tower) 70FGate102tower 45,2,2
-3@tower,12,51,0 duplicate(1FGate102tower) 71FGate102tower 45,2,2
-3@tower,96,51,0 duplicate(1FGate102tower) 72FGate102tower 45,2,2
-3@tower,184,51,0 duplicate(1FGate102tower) 73FGate102tower 45,2,2
-3@tower,270,51,0 duplicate(1FGate102tower) 74FGate102tower 45,2,2
-
-3@tower,355,51,0 script 75FGate102tower 45,1,1,{
+3@tower,12,393,0 duplicate(1FGate102tower) 51FGate102tower WARPNPC,2,2
+3@tower,96,393,0 duplicate(1FGate102tower) 52FGate102tower WARPNPC,2,2
+3@tower,184,393,0 duplicate(1FGate102tower) 53FGate102tower WARPNPC,2,2
+3@tower,270,393,0 duplicate(1FGate102tower) 54FGate102tower WARPNPC,2,2
+3@tower,355,393,0 duplicate(1FGate102tower) 55FGate102tower WARPNPC,2,2
+3@tower,12,309,0 duplicate(1FGate102tower) 56FGate102tower WARPNPC,2,2
+3@tower,96,309,0 duplicate(1FGate102tower) 57FGate102tower WARPNPC,2,2
+3@tower,184,309,0 duplicate(1FGate102tower) 58FGate102tower WARPNPC,2,2
+3@tower,270,309,0 duplicate(1FGate102tower) 59FGate102tower WARPNPC,2,2
+3@tower,355,309,0 duplicate(1FGate102tower) 60FGate102tower WARPNPC,2,2
+3@tower,12,222,0 duplicate(1FGate102tower) 61FGate102tower WARPNPC,2,2
+3@tower,96,222,0 duplicate(1FGate102tower) 62FGate102tower WARPNPC,2,2
+3@tower,184,222,0 duplicate(1FGate102tower) 63FGate102tower WARPNPC,2,2
+3@tower,270,222,0 duplicate(1FGate102tower) 64FGate102tower WARPNPC,2,2
+3@tower,355,222,0 duplicate(1FGate102tower) 65FGate102tower WARPNPC,2,2
+3@tower,12,138,0 duplicate(1FGate102tower) 66FGate102tower WARPNPC,2,2
+3@tower,96,138,0 duplicate(1FGate102tower) 67FGate102tower WARPNPC,2,2
+3@tower,184,138,0 duplicate(1FGate102tower) 68FGate102tower WARPNPC,2,2
+3@tower,270,138,0 duplicate(1FGate102tower) 69FGate102tower WARPNPC,2,2
+3@tower,355,138,0 duplicate(1FGate102tower) 70FGate102tower WARPNPC,2,2
+3@tower,12,51,0 duplicate(1FGate102tower) 71FGate102tower WARPNPC,2,2
+3@tower,96,51,0 duplicate(1FGate102tower) 72FGate102tower WARPNPC,2,2
+3@tower,184,51,0 duplicate(1FGate102tower) 73FGate102tower WARPNPC,2,2
+3@tower,270,51,0 duplicate(1FGate102tower) 74FGate102tower WARPNPC,2,2
+
+3@tower,355,51,0 script 75FGate102tower WARPNPC,1,1,{
end;
OnInstanceInit:
@@ -1596,7 +1596,7 @@ OnTimer120000:
end;
}
-3@tower,355,51,0 script 75FGate102tower-2 45,2,2,{
+3@tower,355,51,0 script 75FGate102tower-2 WARPNPC,2,2,{
end;
OnInstanceInit:
@@ -1612,7 +1612,7 @@ OnTouch_:
end;
}
-3@tower,71,1,0 script #Manager Mode3 844,{
+3@tower,71,1,0 script #Manager Mode3 CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "Please enter the password.";
set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -1635,7 +1635,7 @@ OnTouch_:
// Levels 76-99
//============================================================
-4@tower,29,365,2 script Immortal Furnace#3 844,{
+4@tower,29,365,2 script Immortal Furnace#3 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -1663,31 +1663,31 @@ OnTimer5000:
end;
}
-4@tower,12,393,0 duplicate(1FGate102tower) 76FGate102tower 45,2,2
-4@tower,96,393,0 duplicate(1FGate102tower) 77FGate102tower 45,2,2
-4@tower,184,393,0 duplicate(1FGate102tower) 78FGate102tower 45,2,2
-4@tower,270,393,0 duplicate(1FGate102tower) 79FGate102tower 45,2,2
-4@tower,355,393,0 duplicate(1FGate102tower) 80FGate102tower 45,2,2
-4@tower,12,309,0 duplicate(1FGate102tower) 81FGate102tower 45,2,2
-4@tower,96,309,0 duplicate(1FGate102tower) 82FGate102tower 45,2,2
-4@tower,184,309,0 duplicate(1FGate102tower) 83FGate102tower 45,2,2
-4@tower,270,309,0 duplicate(1FGate102tower) 84FGate102tower 45,2,2
-4@tower,355,309,0 duplicate(1FGate102tower) 85FGate102tower 45,2,2
-4@tower,12,222,0 duplicate(1FGate102tower) 86FGate102tower 45,2,2
-4@tower,96,222,0 duplicate(1FGate102tower) 87FGate102tower 45,2,2
-4@tower,184,222,0 duplicate(1FGate102tower) 88FGate102tower 45,2,2
-4@tower,270,222,0 duplicate(1FGate102tower) 89FGate102tower 45,2,2
-4@tower,355,222,0 duplicate(1FGate102tower) 90FGate102tower 45,2,2
-4@tower,12,138,0 duplicate(1FGate102tower) 91FGate102tower 45,2,2
-4@tower,96,138,0 duplicate(1FGate102tower) 92FGate102tower 45,2,2
-4@tower,184,138,0 duplicate(1FGate102tower) 93FGate102tower 45,2,2
-4@tower,270,138,0 duplicate(1FGate102tower) 94FGate102tower 45,2,2
-4@tower,355,138,0 duplicate(1FGate102tower) 95FGate102tower 45,2,2
-4@tower,12,51,0 duplicate(1FGate102tower) 96FGate102tower 45,2,2
-4@tower,96,51,0 duplicate(1FGate102tower) 97FGate102tower 45,2,2
-4@tower,184,51,0 duplicate(1FGate102tower) 98FGate102tower 45,2,2
-
-4@tower,271,51,0 script 99FGate102tower 45,2,2,{
+4@tower,12,393,0 duplicate(1FGate102tower) 76FGate102tower WARPNPC,2,2
+4@tower,96,393,0 duplicate(1FGate102tower) 77FGate102tower WARPNPC,2,2
+4@tower,184,393,0 duplicate(1FGate102tower) 78FGate102tower WARPNPC,2,2
+4@tower,270,393,0 duplicate(1FGate102tower) 79FGate102tower WARPNPC,2,2
+4@tower,355,393,0 duplicate(1FGate102tower) 80FGate102tower WARPNPC,2,2
+4@tower,12,309,0 duplicate(1FGate102tower) 81FGate102tower WARPNPC,2,2
+4@tower,96,309,0 duplicate(1FGate102tower) 82FGate102tower WARPNPC,2,2
+4@tower,184,309,0 duplicate(1FGate102tower) 83FGate102tower WARPNPC,2,2
+4@tower,270,309,0 duplicate(1FGate102tower) 84FGate102tower WARPNPC,2,2
+4@tower,355,309,0 duplicate(1FGate102tower) 85FGate102tower WARPNPC,2,2
+4@tower,12,222,0 duplicate(1FGate102tower) 86FGate102tower WARPNPC,2,2
+4@tower,96,222,0 duplicate(1FGate102tower) 87FGate102tower WARPNPC,2,2
+4@tower,184,222,0 duplicate(1FGate102tower) 88FGate102tower WARPNPC,2,2
+4@tower,270,222,0 duplicate(1FGate102tower) 89FGate102tower WARPNPC,2,2
+4@tower,355,222,0 duplicate(1FGate102tower) 90FGate102tower WARPNPC,2,2
+4@tower,12,138,0 duplicate(1FGate102tower) 91FGate102tower WARPNPC,2,2
+4@tower,96,138,0 duplicate(1FGate102tower) 92FGate102tower WARPNPC,2,2
+4@tower,184,138,0 duplicate(1FGate102tower) 93FGate102tower WARPNPC,2,2
+4@tower,270,138,0 duplicate(1FGate102tower) 94FGate102tower WARPNPC,2,2
+4@tower,355,138,0 duplicate(1FGate102tower) 95FGate102tower WARPNPC,2,2
+4@tower,12,51,0 duplicate(1FGate102tower) 96FGate102tower WARPNPC,2,2
+4@tower,96,51,0 duplicate(1FGate102tower) 97FGate102tower WARPNPC,2,2
+4@tower,184,51,0 duplicate(1FGate102tower) 98FGate102tower WARPNPC,2,2
+
+4@tower,271,51,0 script 99FGate102tower WARPNPC,2,2,{
end;
OnInstanceInit:
@@ -1711,7 +1711,7 @@ OnTimer120000:
end;
}
-4@tower,271,51,0 script 99FGate102tower-2 45,2,2,{
+4@tower,271,51,0 script 99FGate102tower-2 WARPNPC,2,2,{
end;
OnInstanceInit:
@@ -1727,7 +1727,7 @@ OnTouch_:
end;
}
-4@tower,71,1,0 script #Manager Mode4 844,{
+4@tower,71,1,0 script #Manager Mode4 CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "Please enter the password.";
set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -1750,7 +1750,7 @@ OnTouch_:
// Level 100
//============================================================
-5@tower,106,109,2 script Lucid Crystal#102 844,{
+5@tower,106,109,2 script Lucid Crystal#102 CLEAR_NPC,{
if (in_102tower < 10) {
mes "^0000ffA mysterious voice echoes through the room as you touch the lucid crystal radiating a strong light.^000000";
next;
@@ -1802,7 +1802,7 @@ OnEnable:
end;
}
-5@tower,106,109,2 script #102Effect1 844,{
+5@tower,106,109,2 script #102Effect1 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -1825,7 +1825,7 @@ OnTimer500:
end;
}
-5@tower,106,109,2 script #102Effect2 844,{
+5@tower,106,109,2 script #102Effect2 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -1848,7 +1848,7 @@ OnTimer500:
end;
}
-5@tower,82,112,2 script #102FShadowDust1 844,{
+5@tower,82,112,2 script #102FShadowDust1 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -1868,7 +1868,7 @@ OnMyMobDead:
end;
}
-5@tower,82,113,2 script #102FShadowDust 844,{
+5@tower,82,113,2 script #102FShadowDust CLEAR_NPC,{
end;
OnInstanceInit:
@@ -1919,7 +1919,7 @@ OnEnable:
end;
}
-5@tower,71,1,0 script #Manager Mode5 844,{
+5@tower,71,1,0 script #Manager Mode5 CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "This NPC manages the crystal on the 100th Level. Please enter the password.";
set .@i, callfunc("F_GM_NPC","dmc2008",1);
@@ -1934,7 +1934,7 @@ OnEnable:
// Level 101
//============================================================
-6@tower,45,89,2 script Life Spring#1 844,{
+6@tower,45,89,2 script Life Spring#1 CLEAR_NPC,{
mes "^0066ffYou took a sip of the spring's clear water, and you feel invigorated.^000000";
heal (MaxHp-Hp),(MaxSp-Sp);
close;
@@ -1944,7 +1944,7 @@ OnInstanceInit:
end;
}
-6@tower,45,89,2 script Life Spring#2 844,{
+6@tower,45,89,2 script Life Spring#2 CLEAR_NPC,{
end;
OnEnable:
@@ -1958,7 +1958,7 @@ OnTimer2000:
end;
}
-6@tower,45,89,2 script Life Spring#3 844,{
+6@tower,45,89,2 script Life Spring#3 CLEAR_NPC,{
end;
OnEnable:
@@ -1974,7 +1974,7 @@ OnTimer2000:
6@tower,32,100,0 warp 102FGate102tower 2,2,6@tower,155,64
-6@tower,156,151,2 script Tyrant's Throne# 844,{
+6@tower,156,151,2 script Tyrant's Throne# CLEAR_NPC,{
end;
OnInstanceInit:
@@ -1990,7 +1990,7 @@ OnMyMobDead:
end;
}
-6@tower,156,151,2 script #1st Beeper 844,{
+6@tower,156,151,2 script #1st Beeper CLEAR_NPC,{
end;
OnEnable:
@@ -2033,7 +2033,7 @@ OnMyMobDead:
end;
}
-6@tower,156,151,2 script #2nd Beeper 844,{
+6@tower,156,151,2 script #2nd Beeper CLEAR_NPC,{
end;
OnEnable:
@@ -2068,7 +2068,7 @@ OnMyMobDead:
end;
}
-6@tower,156,151,2 script #3rd Beeper 844,{
+6@tower,156,151,2 script #3rd Beeper CLEAR_NPC,{
end;
OnEnable:
@@ -2103,7 +2103,7 @@ OnMyMobDead:
end;
}
-6@tower,156,151,2 script #4th Beeper 844,{
+6@tower,156,151,2 script #4th Beeper CLEAR_NPC,{
end;
OnEnable:
@@ -2130,7 +2130,7 @@ OnMyMobDead:
end;
}
-6@tower,169,127,2 script Lost Soul#102 796,{
+6@tower,169,127,2 script Lost Soul#102 4_M_NFDEADSWDMAN,{
if (checkweight(1201,1) == 0) {
mes "You're carrying too much stuff. Why don't you put some of it away, and then come back?";
close;
@@ -2210,7 +2210,7 @@ OnTimer10500:
end;
}
-6@tower,169,127,2 script #Effect30 844,{
+6@tower,169,127,2 script #Effect30 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -2228,7 +2228,7 @@ OnTimer1000:
end;
}
-6@tower,169,127,2 script #Effect31 844,{
+6@tower,169,127,2 script #Effect31 CLEAR_NPC,{
end;
OnInstanceInit:
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index f17db1b7d..82e0b7a70 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -21,7 +21,7 @@
1@nyd mapflag src4instance
2@nyd mapflag src4instance
//============================================================
-nyd_dun02,100,201,3 script Yggdrasil Gatekeeper 111,8,8,{
+nyd_dun02,100,201,3 script Yggdrasil Gatekeeper HIDDEN_NPC,8,8,{
if (ins_nyd == 0) {
mes "A great stone gate stands before you. The sculpture of a terrible dragon spreads its powerful looking wings.";
next;
@@ -224,7 +224,7 @@ OnTouch_:
end;
}
-mid_camp,271,299,3 script Historian Magnifier#edq 755,3,3,{
+mid_camp,271,299,3 script Historian Magnifier#edq 4_M_SAGE_C,3,3,{
mes "[Historian Magniffer]";
if (ins_nyd == 1) {
mes "Sure, the mainland also has lots of interesting adventures... Hello, I am Magnifier, a historian dispatched from the Prontera royal court.";
@@ -410,7 +410,7 @@ mid_camp,271,299,3 script Historian Magnifier#edq 755,3,3,{
}
}
-prt_in,171,94,3 script Assistant Naomi#edq 893,3,3,{
+prt_in,171,94,3 script Assistant Naomi#edq 4_F_HUWOMAN,3,3,{
mes "[Assistant Naomi]";
set .@name$,strcharinfo(0);
if (ins_nyd == 3) {
@@ -596,7 +596,7 @@ prt_in,171,94,3 script Assistant Naomi#edq 893,3,3,{
}
}
-splendide,198,178,3 script Grumbling Soldier#edq 447,3,3,{
+splendide,198,178,3 script Grumbling Soldier#edq 4_M_FAIRYSOLDIER,3,3,{
mes "[Grumbling Soldier]";
if (isequipped(2782) == 1) {
mes "Nowadays, the world has turned unstable. I can't even fly comfortably anymore.";
@@ -656,7 +656,7 @@ splendide,198,178,3 script Grumbling Soldier#edq 447,3,3,{
}
}
-splendide,240,164,3 script Sighing Soldier#edq 461,3,3,{
+splendide,240,164,3 script Sighing Soldier#edq 4_M_FAIRYSOLDIER2,3,3,{
mes "[Sighing Soldier]";
if (isequipped(2782) == 1) {
mes "When will we be finished with this combat with the Sapha? Ugghhhh...";
@@ -713,7 +713,7 @@ splendide,240,164,3 script Sighing Soldier#edq 461,3,3,{
}
}
-spl_in01,109,60,3 script Commander Lebiordirr#edq 435,3,3,{
+spl_in01,109,60,3 script Commander Lebiordirr#edq 4_F_FAIRY,3,3,{
mes "[Commander Lebiordirr]";
if (isequipped(2782) == 1) {
if (ins_nyd == 51) {
@@ -927,7 +927,7 @@ spl_in01,109,60,3 script Commander Lebiordirr#edq 435,3,3,{
}
}
-spl_in01,104,56,3 script Aide Arioss#edq 437,3,3,{
+spl_in01,104,56,3 script Aide Arioss#edq 4_F_FAIRYKID2,3,3,{
mes "[Aide Arioss]";
if (isequipped(2782) == 1) {
if (ins_nyd == 91) {
@@ -1072,21 +1072,21 @@ OnTouch_:
end;
}
-spl_in01,101,52,5 script Splendide Guard#1_edq 447,1,1,{
+spl_in01,101,52,5 script Splendide Guard#1_edq 4_M_FAIRYSOLDIER,1,1,{
mes "[Splendide Guard]";
if (isequipped(2782) == 1) mes "This is the Splendide office. Don't act impolitely.";
else mes "ThusDurnah Ra SharVeldIyaz U UorAmanDur Yee neaOsaAdor Yee ";
close;
}
-spl_in01,118,52,3 script Splendide Guard#2_edq 447,1,1,{
+spl_in01,118,52,3 script Splendide Guard#2_edq 4_M_FAIRYSOLDIER,1,1,{
mes "[Splendide Guard]";
if (isequipped(2782) == 1) mes "This is the Splendide office. Don't act impolitely.";
else mes "ThusDurnah Ra SharVeldIyaz U UorAmanDur Yee neaOsaAdor Yee ";
close;
}
-man_in01,311,57,3 script Neat Etorr#edq 453,3,3,{
+man_in01,311,57,3 script Neat Etorr#edq 4_MAN_NITT,3,3,{
mes "[Neat Etorr]";
if (isequipped(2782) == 1) {
if (ins_nyd == 52) {
@@ -1293,21 +1293,21 @@ man_in01,311,57,3 script Neat Etorr#edq 453,3,3,{
}
}
-man_in01,286,61,5 script Manuk Guard#1_edq 450,1,1,{
+man_in01,286,61,5 script Manuk Guard#1_edq 4_MAN_GALTUN,1,1,{
mes "[Manuk Guard]";
if (isequipped(2782) == 1) mes "I'm guarding this Laphine prisoner. Leave me alone.";
else mes "Klekod Oi Thekd Pheid Okei.";
close;
}
-man_in01,295,61,3 script Manuk Guard#2_edq 450,1,1,{
+man_in01,295,61,3 script Manuk Guard#2_edq 4_MAN_GALTUN,1,1,{
mes "[Manuk Guard]";
if (isequipped(2782) == 1) mes "I'm guarding this Laphine prisoner. Leave me alone.";
else mes "Liek QUekdk Ohei Vue.";
close;
}
-man_in01,291,62,3 script Laphine Prisoner#edq 437,3,3,{
+man_in01,291,62,3 script Laphine Prisoner#edq 4_F_FAIRYKID2,3,3,{
mes "[Laphine Prisoner]";
if (isequipped(2782) == 1) {
if (ins_nyd == 5) {
@@ -1516,7 +1516,7 @@ OnTouch_:
// First floor
//============================================================
-1@nyd,213,277,5 script Murdered Yggdrasilid#1F 437,5,5,{
+1@nyd,213,277,5 script Murdered Yggdrasilid#1F 4_F_FAIRYKID2,5,5,{
if ('ins_nyd2 == 0) {
mes "When a faint light enters your heart, a voice sounds in your head.";
next;
@@ -1752,7 +1752,7 @@ OnTimer1850000:
end;
}
-1@nyd,195,320,0 script nyd_to2f_warp 45,5,5,{
+1@nyd,195,320,0 script nyd_to2f_warp WARPNPC,5,5,{
OnInstanceInit:
OnDisable:
disablenpc instance_npcname("nyd_to2f_warp");
@@ -1952,7 +1952,7 @@ OnTimer180000:
end;
}
-2@nyd,202,324,5 script World Tree Yggdrasil#2F 437,3,3,{
+2@nyd,202,324,5 script World Tree Yggdrasil#2F 4_F_FAIRYKID2,3,3,{
mes "[World Tree Yggdrasil]";
mes "Thank you. You're the saviour of humans and the Laphine Tribe.";
next;
@@ -2181,7 +2181,7 @@ OnMyPingDead:
// GM Management NPCs
//============================================================
-sec_in02,36,167,3 script Nidhoggur Manager 447,1,1,{
+sec_in02,36,167,3 script Nidhoggur Manager 4_M_FAIRYSOLDIER,1,1,{
callfunc "F_GM_NPC";
mes "Enter the password.";
next;
@@ -2225,7 +2225,7 @@ sec_in02,36,167,3 script Nidhoggur Manager 447,1,1,{
}
}
-nyd_dun02,7,7,2 script Purification Admin#nyd2 844,2,0,{
+nyd_dun02,7,7,2 script Purification Admin#nyd2 CLEAR_NPC,2,0,{
callfunc "F_GM_NPC";
mes "Please enter the password";
set .@i, callfunc("F_GM_NPC","dragonslayer",1);
@@ -2256,7 +2256,7 @@ nyd_dun02,7,7,2 script Purification Admin#nyd2 844,2,0,{
}
}
-nyd_dun02,88,195,4 script Purification Stone#nyd2 406,{
+nyd_dun02,88,195,4 script Purification Stone#nyd2 2_MONEMUS,{
erasequest 3135;
erasequest 3136;
set ins_nyd,200;
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index 9b26e5138..d06db682e 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -40,7 +40,7 @@
// Entrance
//============================================================
-gef_fild10,242,202,0 script Dimensional Gorge Piece 406,{
+gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{
set .@party_id,getcharid(1);
set .@p_name$,getpartyname(.@party_id);
@@ -116,7 +116,7 @@ L_Enter:
}
}
-gef_fild10,238,202,6 script Mad Scientist#orc 865,{
+gef_fild10,238,202,6 script Mad Scientist#orc 4_LGTSCIENCE,{
if (BaseLevel < 50) {
mes "The Mad Scientist doesn't seem to notice you and keeps mumbling to himself...";
close;
@@ -177,7 +177,7 @@ gef_fild10,238,202,6 script Mad Scientist#orc 865,{
// Orc's Memory Floor 1
//============================================================
-1@orcs,180,30,0 script #Resurrect Monsters1 844,{
+1@orcs,180,30,0 script #Resurrect Monsters1 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -238,7 +238,7 @@ OnTimer4010:
end;
}
-1@orcs,180,30,0 script #Resurrect Monsters2 844,{
+1@orcs,180,30,0 script #Resurrect Monsters2 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -270,7 +270,7 @@ OnMyMobDead:
end;
}
-1@orcs,180,30,0 script #Resurrect Monsters3 844,{
+1@orcs,180,30,0 script #Resurrect Monsters3 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -311,7 +311,7 @@ OnMyMobDead:
end;
}
-1@orcs,180,30,0 script #Resurrect Monsters4 844,{
+1@orcs,180,30,0 script #Resurrect Monsters4 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -332,12 +332,12 @@ OnDisable:
end;
}
-1@orcs,180,29,4 script Kruger#1-1 433,{
+1@orcs,180,29,4 script Kruger#1-1 4_ORCWARRIOR,{
donpcevent instance_npcname("Kruger#1-2")+"::OnEnable";
end;
}
-1@orcs,180,29,4 script Kruger#1-2 433,{
+1@orcs,180,29,4 script Kruger#1-2 4_ORCWARRIOR,{
end;
OnInstanceInit:
@@ -397,7 +397,7 @@ OnTimer60000:
}
-1@orcs,168,125,0 script B1 Area 1 45,3,3,{
+1@orcs,168,125,0 script B1 Area 1 WARPNPC,3,3,{
OnInstanceInit:
disablenpc instance_npcname("B1 Area 1");
end;
@@ -426,7 +426,7 @@ OnTimer18700:
end;
}
-1@orcs,89,94,0 script B1 Area 2 45,3,3,{
+1@orcs,89,94,0 script B1 Area 2 WARPNPC,3,3,{
OnInstanceInit:
disablenpc instance_npcname("B1 Area 2");
end;
@@ -455,7 +455,7 @@ OnTimer37600:
end;
}
-1@orcs,38,105,0 script B1 Area 3 45,3,3,{
+1@orcs,38,105,0 script B1 Area 3 WARPNPC,3,3,{
OnInstanceInit:
disablenpc instance_npcname("B1 Area 3");
end;
@@ -484,7 +484,7 @@ OnTimer32700:
end;
}
-1@orcs,21,189,0 script B1 Area 4 45,3,3,{
+1@orcs,21,189,0 script B1 Area 4 WARPNPC,3,3,{
OnInstanceInit:
disablenpc instance_npcname("B1 Area 4");
end;
@@ -524,7 +524,7 @@ OnMyMobDead3:
// Orc's Memory Floor 2
//============================================================
-2@orcs,36,171,0 script #2Resurrect Monsters1 844,{
+2@orcs,36,171,0 script #2Resurrect Monsters1 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -582,7 +582,7 @@ OnTimer4010:
end;
}
-2@orcs,36,171,0 script #2Resurrect Monsters3 844,{
+2@orcs,36,171,0 script #2Resurrect Monsters3 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -623,7 +623,7 @@ OnDisable:
end;
}
-2@orcs,180,30,0 script #2Resurrect Monsters4 844,{
+2@orcs,180,30,0 script #2Resurrect Monsters4 CLEAR_NPC,{
end;
OnInstanceInit:
@@ -640,12 +640,12 @@ OnMyMobDead:
end;
}
-2@orcs,35,169,4 script Kruger#2-1 433,{
+2@orcs,35,169,4 script Kruger#2-1 4_ORCWARRIOR,{
donpcevent instance_npcname("Kruger#2-2")+"::OnEnable";
end;
}
-2@orcs,35,169,4 script Kruger#2-2 433,{
+2@orcs,35,169,4 script Kruger#2-2 4_ORCWARRIOR,{
end;
OnInstanceInit:
@@ -687,7 +687,7 @@ OnTimer23910:
end;
}
-2@orcs,26,164,0 script Torch#1-1 844,{
+2@orcs,26,164,0 script Torch#1-1 CLEAR_NPC,{
if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
setarray .@id[0], atoi(charat(strnpcinfo(2),0)), atoi(charat(strnpcinfo(2),2));
@@ -717,11 +717,11 @@ OnTimer2000:
stopnpctimer;
end;
}
-2@orcs,55,155,0 duplicate(Torch#1-1) Torch#1-2 844
-2@orcs,108,146,0 duplicate(Torch#1-1) Torch#1-3 844
-2@orcs,98,171,0 duplicate(Torch#1-1) Torch#1-4 844
+2@orcs,55,155,0 duplicate(Torch#1-1) Torch#1-2 CLEAR_NPC
+2@orcs,108,146,0 duplicate(Torch#1-1) Torch#1-3 CLEAR_NPC
+2@orcs,98,171,0 duplicate(Torch#1-1) Torch#1-4 CLEAR_NPC
-2@orcs,48,100,0 script #Warp2-1 45,3,3,{
+2@orcs,48,100,0 script #Warp2-1 WARPNPC,3,3,{
OnInstanceInit:
disablenpc instance_npcname("#Warp2-1");
end;
@@ -747,12 +747,12 @@ OnTouch:
end;
}
-2@orcs,35,92,0 duplicate(Torch#1-1) Torch#2-1 844
-2@orcs,32,70,0 duplicate(Torch#1-1) Torch#2-2 844
-2@orcs,70,31,0 duplicate(Torch#1-1) Torch#2-3 844
-2@orcs,84,51,0 duplicate(Torch#1-1) Torch#2-4 844
+2@orcs,35,92,0 duplicate(Torch#1-1) Torch#2-1 CLEAR_NPC
+2@orcs,32,70,0 duplicate(Torch#1-1) Torch#2-2 CLEAR_NPC
+2@orcs,70,31,0 duplicate(Torch#1-1) Torch#2-3 CLEAR_NPC
+2@orcs,84,51,0 duplicate(Torch#1-1) Torch#2-4 CLEAR_NPC
-2@orcs,101,55,0 script #Warp2-2 45,3,3,{
+2@orcs,101,55,0 script #Warp2-2 WARPNPC,3,3,{
OnInstanceInit:
disablenpc instance_npcname("#Warp2-2");
end;
@@ -778,12 +778,12 @@ OnTouch:
end;
}
-2@orcs,142,145,0 duplicate(Torch#1-1) Torch#3-1 844
-2@orcs,162,134,0 duplicate(Torch#1-1) Torch#3-2 844
-2@orcs,144,117,0 duplicate(Torch#1-1) Torch#3-3 844
-2@orcs,136,98,0 duplicate(Torch#1-1) Torch#3-4 844
+2@orcs,142,145,0 duplicate(Torch#1-1) Torch#3-1 CLEAR_NPC
+2@orcs,162,134,0 duplicate(Torch#1-1) Torch#3-2 CLEAR_NPC
+2@orcs,144,117,0 duplicate(Torch#1-1) Torch#3-3 CLEAR_NPC
+2@orcs,136,98,0 duplicate(Torch#1-1) Torch#3-4 CLEAR_NPC
-2@orcs,167,104,0 script #Warp2-3 45,3,3,{
+2@orcs,167,104,0 script #Warp2-3 WARPNPC,3,3,{
OnInstanceInit:
disablenpc instance_npcname("#Warp2-3");
end;
@@ -823,7 +823,7 @@ OnTouch:
end;
}
-2@orcs,36,171,0 script #Boss Control 844,{
+2@orcs,36,171,0 script #Boss Control CLEAR_NPC,{
end;
OnInstanceInit:
@@ -862,7 +862,7 @@ OnMyMobDead:
end;
}
-2@orcs,182,8,0 script #Warp Outside Orc Dun 45,3,3,{
+2@orcs,182,8,0 script #Warp Outside Orc Dun WARPNPC,3,3,{
OnInstanceInit:
disablenpc instance_npcname("#Warp Outside Orc Dun");
end;
@@ -876,7 +876,7 @@ OnTouch:
end;
}
-2@orcs,172,13,0 script Kruger# 434,{
+2@orcs,172,13,0 script Kruger# 4_ORCWARRIOR2,{
if (yong_odun < 2) {
mes "[Kruger]";
mes "*Coughing*";
@@ -917,7 +917,7 @@ OnEnable:
end;
}
-2@orcs,36,171,0 script #Mobs Control 844,{
+2@orcs,36,171,0 script #Mobs Control CLEAR_NPC,{
end;
OnMyMobDead1:
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index b5fc61cc3..c565b182c 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -33,7 +33,7 @@
// Sealed Catacomb Entrance
//============================================================
-monk_test,309,146,3 script Friar Patrick#edq 412,{
+monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{
cutin "ins_cata_pri_n",2;
mes "[Friar Patrick]";
mes "The peace of this world cannot last forever... The hands of Evil are reaching into the world again...";
@@ -216,7 +216,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
end;
}
-monk_test,306,151,3 script Grave of Baphomet#edq 111,{
+monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{
if (countitem(6002)) delitem 6002,countitem(6002); //Token_Of_Apostle
mes "This gravestone has a carving of a wicked devil with large horns. It arouses an ominous feeling.";
next;
@@ -260,7 +260,7 @@ monk_test,306,151,3 script Grave of Baphomet#edq 111,{
}
}
-prt_monk,261,91,3 script Rust Blackhand#edq 826,{
+prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{
set .@new_maje,checkquest(3043);
mes "[Rust Blackhand]";
mes "Who are you? What do you want me for?";
@@ -483,7 +483,7 @@ OnMyMobDead:
// Soul of hero near the north grave
//============================================================
-1@cata,141,221,0 script Gravestone# 844,3,3,{
+1@cata,141,221,0 script Gravestone# CLEAR_NPC,3,3,{
set .@party_id,getcharid(1);
if ('ins_baphomet == 0) {
mes "The gravestone is trembling...";
@@ -590,7 +590,7 @@ OnInstanceInit: // Temporary fix for @reloadscript.
end;
}
-1@cata,176,119,4 script Ancient Hero's Soul#1F 411,{
+1@cata,176,119,4 script Ancient Hero's Soul#1F 4_M_CHAMPSOUL,{
set .@party_id,getcharid(1);
cutin "ins_cata_champ_n",2;
if ('ins_baphomet == 2) {
@@ -811,7 +811,7 @@ OnInstanceInit:
// To 2F Warp
//============================================================
-1@cata,281,12,0 script ins_bapho_to_2f 45,1,1,{
+1@cata,281,12,0 script ins_bapho_to_2f WARPNPC,1,1,{
OnTouch:
if (countitem(6002) > 0) {
delitem 6002,countitem(6002); //Token_Of_Apostle
@@ -847,37 +847,37 @@ OnInstanceInit:
close;
}
}
-1@cata,86,214,0 duplicate(Gravestone#SS1) Gravestone#1F_1T 844
-1@cata,200,209,0 duplicate(Gravestone#SS1) Gravestone#1F_2T 844
-1@cata,230,195,0 duplicate(Gravestone#SS1) Gravestone#1F_3T 844
-1@cata,118,182,0 duplicate(Gravestone#SS1) Gravestone#1F_4T 844
-1@cata,193,182,0 duplicate(Gravestone#SS1) Gravestone#1F_5T 844
-1@cata,253,156,0 duplicate(Gravestone#SS1) Gravestone#1F_6T 844
-1@cata,88,154,0 duplicate(Gravestone#SS1) Gravestone#1F_7T 844
-1@cata,127,116,0 duplicate(Gravestone#SS1) Gravestone#1F_8T 844
-1@cata,90,98,0 duplicate(Gravestone#SS1) Gravestone#1F_9T 844
-1@cata,188,84,0 duplicate(Gravestone#SS1) Gravestone#1F_10T 844
-1@cata,244,42,0 duplicate(Gravestone#SS1) Gravestone#1F_11T 844
-1@cata,127,32,0 duplicate(Gravestone#SS1) Gravestone#1F_12T 844
-1@cata,267,30,0 duplicate(Gravestone#SS1) Gravestone#1F_13T 844
+1@cata,86,214,0 duplicate(Gravestone#SS1) Gravestone#1F_1T CLEAR_NPC
+1@cata,200,209,0 duplicate(Gravestone#SS1) Gravestone#1F_2T CLEAR_NPC
+1@cata,230,195,0 duplicate(Gravestone#SS1) Gravestone#1F_3T CLEAR_NPC
+1@cata,118,182,0 duplicate(Gravestone#SS1) Gravestone#1F_4T CLEAR_NPC
+1@cata,193,182,0 duplicate(Gravestone#SS1) Gravestone#1F_5T CLEAR_NPC
+1@cata,253,156,0 duplicate(Gravestone#SS1) Gravestone#1F_6T CLEAR_NPC
+1@cata,88,154,0 duplicate(Gravestone#SS1) Gravestone#1F_7T CLEAR_NPC
+1@cata,127,116,0 duplicate(Gravestone#SS1) Gravestone#1F_8T CLEAR_NPC
+1@cata,90,98,0 duplicate(Gravestone#SS1) Gravestone#1F_9T CLEAR_NPC
+1@cata,188,84,0 duplicate(Gravestone#SS1) Gravestone#1F_10T CLEAR_NPC
+1@cata,244,42,0 duplicate(Gravestone#SS1) Gravestone#1F_11T CLEAR_NPC
+1@cata,127,32,0 duplicate(Gravestone#SS1) Gravestone#1F_12T CLEAR_NPC
+1@cata,267,30,0 duplicate(Gravestone#SS1) Gravestone#1F_13T CLEAR_NPC
- script Gravestone#SS2 -1,{
mes "I can only feel gloom from this Gravestone.";
close;
}
-1@cata,86,214,0 duplicate(Gravestone#SS2) Gravestone#1F_1F 844
-1@cata,200,209,0 duplicate(Gravestone#SS2) Gravestone#1F_2F 844
-1@cata,230,195,0 duplicate(Gravestone#SS2) Gravestone#1F_3F 844
-1@cata,118,182,0 duplicate(Gravestone#SS2) Gravestone#1F_4F 844
-1@cata,193,182,0 duplicate(Gravestone#SS2) Gravestone#1F_5F 844
-1@cata,253,156,0 duplicate(Gravestone#SS2) Gravestone#1F_6F 844
-1@cata,88,154,0 duplicate(Gravestone#SS2) Gravestone#1F_7F 844
-1@cata,127,116,0 duplicate(Gravestone#SS2) Gravestone#1F_8F 844
-1@cata,90,98,0 duplicate(Gravestone#SS2) Gravestone#1F_9F 844
-1@cata,188,84,0 duplicate(Gravestone#SS2) Gravestone#1F_10F 844
-1@cata,244,42,0 duplicate(Gravestone#SS2) Gravestone#1F_11F 844
-1@cata,127,32,0 duplicate(Gravestone#SS2) Gravestone#1F_12F 844
-1@cata,267,30,0 duplicate(Gravestone#SS2) Gravestone#1F_13F 844
+1@cata,86,214,0 duplicate(Gravestone#SS2) Gravestone#1F_1F CLEAR_NPC
+1@cata,200,209,0 duplicate(Gravestone#SS2) Gravestone#1F_2F CLEAR_NPC
+1@cata,230,195,0 duplicate(Gravestone#SS2) Gravestone#1F_3F CLEAR_NPC
+1@cata,118,182,0 duplicate(Gravestone#SS2) Gravestone#1F_4F CLEAR_NPC
+1@cata,193,182,0 duplicate(Gravestone#SS2) Gravestone#1F_5F CLEAR_NPC
+1@cata,253,156,0 duplicate(Gravestone#SS2) Gravestone#1F_6F CLEAR_NPC
+1@cata,88,154,0 duplicate(Gravestone#SS2) Gravestone#1F_7F CLEAR_NPC
+1@cata,127,116,0 duplicate(Gravestone#SS2) Gravestone#1F_8F CLEAR_NPC
+1@cata,90,98,0 duplicate(Gravestone#SS2) Gravestone#1F_9F CLEAR_NPC
+1@cata,188,84,0 duplicate(Gravestone#SS2) Gravestone#1F_10F CLEAR_NPC
+1@cata,244,42,0 duplicate(Gravestone#SS2) Gravestone#1F_11F CLEAR_NPC
+1@cata,127,32,0 duplicate(Gravestone#SS2) Gravestone#1F_12F CLEAR_NPC
+1@cata,267,30,0 duplicate(Gravestone#SS2) Gravestone#1F_13F CLEAR_NPC
// Bobbing Torches
//============================================================
@@ -918,18 +918,18 @@ OnInstanceInit:
disablenpc instance_npcname(strnpcinfo(0));
end;
}
-1@cata,267,210,0 duplicate(Bobbing Torch#SS) Bobbing Torch#1 844
-1@cata,85,182,0 duplicate(Bobbing Torch#SS) Bobbing Torch#2 844
-1@cata,267,154,0 duplicate(Bobbing Torch#SS) Bobbing Torch#3 844
-1@cata,157,139,0 duplicate(Bobbing Torch#SS) Bobbing Torch#4 844
-1@cata,193,138,0 duplicate(Bobbing Torch#SS) Bobbing Torch#5 844
-1@cata,193,102,0 duplicate(Bobbing Torch#SS) Bobbing Torch#6 844
-1@cata,157,102,0 duplicate(Bobbing Torch#SS) Bobbing Torch#7 844
-1@cata,113,112,0 duplicate(Bobbing Torch#SS) Bobbing Torch#8 844
-1@cata,253,56,0 duplicate(Bobbing Torch#SS) Bobbing Torch#9 844
-1@cata,239,56,0 duplicate(Bobbing Torch#SS) Bobbing Torch#10 844
-1@cata,71,42,0 duplicate(Bobbing Torch#SS) Bobbing Torch#11 844
-1@cata,155,14,0 duplicate(Bobbing Torch#SS) Bobbing Torch#12 844
+1@cata,267,210,0 duplicate(Bobbing Torch#SS) Bobbing Torch#1 CLEAR_NPC
+1@cata,85,182,0 duplicate(Bobbing Torch#SS) Bobbing Torch#2 CLEAR_NPC
+1@cata,267,154,0 duplicate(Bobbing Torch#SS) Bobbing Torch#3 CLEAR_NPC
+1@cata,157,139,0 duplicate(Bobbing Torch#SS) Bobbing Torch#4 CLEAR_NPC
+1@cata,193,138,0 duplicate(Bobbing Torch#SS) Bobbing Torch#5 CLEAR_NPC
+1@cata,193,102,0 duplicate(Bobbing Torch#SS) Bobbing Torch#6 CLEAR_NPC
+1@cata,157,102,0 duplicate(Bobbing Torch#SS) Bobbing Torch#7 CLEAR_NPC
+1@cata,113,112,0 duplicate(Bobbing Torch#SS) Bobbing Torch#8 CLEAR_NPC
+1@cata,253,56,0 duplicate(Bobbing Torch#SS) Bobbing Torch#9 CLEAR_NPC
+1@cata,239,56,0 duplicate(Bobbing Torch#SS) Bobbing Torch#10 CLEAR_NPC
+1@cata,71,42,0 duplicate(Bobbing Torch#SS) Bobbing Torch#11 CLEAR_NPC
+1@cata,155,14,0 duplicate(Bobbing Torch#SS) Bobbing Torch#12 CLEAR_NPC
1@cata,1,1,0 script ins_baphomet_1f_timer -1,{
OnInstanceInit:
@@ -1114,13 +1114,13 @@ OnInstanceInit:
disablenpc instance_npcname(strnpcinfo(0));
end;
}
-2@cata,79,81,0 duplicate(Magical Seal#SS) Magical Seal#0 844
-2@cata,123,109,0 duplicate(Magical Seal#SS) Magical Seal#2 844
-2@cata,123,22,0 duplicate(Magical Seal#SS) Magical Seal#4 844
-2@cata,35,21,0 duplicate(Magical Seal#SS) Magical Seal#8 844
-2@cata,35,109,0 duplicate(Magical Seal#SS) Magical Seal#10 844
+2@cata,79,81,0 duplicate(Magical Seal#SS) Magical Seal#0 CLEAR_NPC
+2@cata,123,109,0 duplicate(Magical Seal#SS) Magical Seal#2 CLEAR_NPC
+2@cata,123,22,0 duplicate(Magical Seal#SS) Magical Seal#4 CLEAR_NPC
+2@cata,35,21,0 duplicate(Magical Seal#SS) Magical Seal#8 CLEAR_NPC
+2@cata,35,109,0 duplicate(Magical Seal#SS) Magical Seal#10 CLEAR_NPC
-2@cata,79,65,0 script The Main Altar#ss 844,{
+2@cata,79,65,0 script The Main Altar#ss CLEAR_NPC,{
set .@party_id,getcharid(1);
if (('ins_baphomet == 5) && (getpartyleader(.@party_id,2) == getcharid(0))) {
mes "An evil power, too terrible to describe, lies under the great altar radiating a violet color.";
@@ -1147,7 +1147,7 @@ OnInstanceInit:
end;
}
-2@cata,80,63,4 script Ancient Hero's Soul#2F 411,{
+2@cata,80,63,4 script Ancient Hero's Soul#2F 4_M_CHAMPSOUL,{
cutin "ins_cata_champ_s",2;
if (checkquest(3041)>=0) erasequest 3041;
mes "[Ancient Hero's Soul]";
diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index a34a8252a..aafe2d0c4 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -26,7 +26,7 @@
//= 2.2 Updated to match AEGIS script and Added Quest Log commands. [Kisuka]
//============================================================
-que_ng,152,167,3 script Master Miller 901,{
+que_ng,152,167,3 script Master Miller 4_M_HUOLDARMY,{
if (Upper == 2) {
mes "[Master Miller]";
mes "Well, aren't you an";
@@ -208,7 +208,7 @@ que_ng,152,167,3 script Master Miller 901,{
}
}
-payon,184,65,3 script Wise Bull Horn 866,{
+payon,184,65,3 script Wise Bull Horn 4_M_LGTGRAND,{
if (GUNS_Q == 1) {
mes "[Wise Bull Horn]";
mes "Hello, young wolf.";
diff --git a/npc/jobs/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt
index d74ed85d6..90cc08edc 100644
--- a/npc/jobs/1-1e/ninja.txt
+++ b/npc/jobs/1-1e/ninja.txt
@@ -15,7 +15,7 @@
//= 1.6 Fixed AEGIS amatsu warp typo. [Kisuka]
//============================================================
-alberta,30,65,3 script Akagi 730,{
+alberta,30,65,3 script Akagi 4_M_JOB_ASSASSIN,{
if (Class == Job_Novice) {
if (JobLevel == 10) {
mes "[Akagi]";
@@ -71,7 +71,7 @@ alberta,30,65,3 script Akagi 730,{
}
}
-que_ng,30,65,3 script Cougar#nq 730,{
+que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{
if (Upper == 2) {
mes "[Cougar]";
mes "I... I've never";
@@ -371,7 +371,7 @@ que_ng,30,65,3 script Cougar#nq 730,{
}
}
-einbroch,184,194,3 script Suspicious Man#nq 881,{
+einbroch,184,194,3 script Suspicious Man#nq 4_M_SITDOWN,{
if (NINJ_Q == 1) {
mes "[Suspicious Man]";
mes "I've traveled to many";
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index dffae4639..6403c2648 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -14,7 +14,7 @@
//= 1.4 Removed use of 'goto', and fixed some indentation. [L0ne_W0lf]
//============================================================
-payon,157,141,5 script Phoenix#TKJobChange 753,{
+payon,157,141,5 script Phoenix#TKJobChange 4_M_MONK,{
if(Upper == 2) {
mes "[Phoenix]";
mes "Hello, child.";
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index b0550c12f..e4b231fcf 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -49,7 +49,7 @@
//= 3.6 Fixed broken event calls. [Euphy]
//============================================================
-in_moc_16,19,33,1 script Guildsman#asn 55,{
+in_moc_16,19,33,1 script Guildsman#asn 1_M_JOBTESTER,{
if (Upper == 1) {
mes "[Ferocious-looking guy]";
mes "Hm? You....?";
@@ -290,7 +290,7 @@ in_moc_16,19,33,1 script Guildsman#asn 55,{
}
}
-in_moc_16,25,90,1 script Guildsman#ASN2 730,2,2,{
+in_moc_16,25,90,1 script Guildsman#ASN2 4_M_JOB_ASSASSIN,2,2,{
mes "[Assassin 'Khai']";
mes "Umm?!";
emotion e_gasp;
@@ -1094,7 +1094,7 @@ OnTouch:
}
}
-in_moc_16,21,165,2 script Standby Room#ASNTEST 725,{
+in_moc_16,21,165,2 script Standby Room#ASNTEST 4_F_JOB_ASSASSIN,{
end;
OnInit:
@@ -1121,7 +1121,7 @@ OnStart:
end;
}
-in_moc_16,21,165,2 script Test Guide#ASN 725,4,4,{
+in_moc_16,21,165,2 script Test Guide#ASN 4_F_JOB_ASSASSIN,4,4,{
end;
OnTouch:
@@ -1444,7 +1444,7 @@ in_moc_16,86,147,0 duplicate(SinTrap) 18_2 -1,0,0
in_moc_16,87,146,0 duplicate(SinTrap) 18_3 -1,0,0
in_moc_16,87,147,0 duplicate(SinTrap) 18_4 -1,0,0
-in_moc_16,87,137,0 script Keeper of the Door#ASN 45,2,1,{
+in_moc_16,87,137,0 script Keeper of the Door#ASN WARPNPC,2,1,{
OnInit:
disablenpc "Keeper of the Door#ASN";
end;
@@ -1492,7 +1492,7 @@ OnMyMobDead:
end;
}
-in_moc_16,89,98,1 script Thomas#ASNTEST 118,5,1,{
+in_moc_16,89,98,1 script Thomas#ASNTEST 2_M_THIEFMASTER,5,1,{
end;
OnTouch:
@@ -1582,7 +1582,7 @@ OnDisable:
end;
}
-in_moc_16,87,48,2 script Barcardi#ASN 725,2,2,{
+in_moc_16,87,48,2 script Barcardi#ASN 4_F_JOB_ASSASSIN,2,2,{
OnTouch:
donpcevent "timestopper#1::OnDisable";
donpcevent "Thomas#ASNTEST::OnDisable";
@@ -1596,7 +1596,7 @@ OnTouch:
end;
}
-in_moc_16,182,169,0 script Maze Assistant 45,1,1,{
+in_moc_16,182,169,0 script Maze Assistant WARPNPC,1,1,{
OnTouch:
if (ASSIN_Q == 5 || ASSIN_Q == 6) {
warp "in_moc_16",181,183;
@@ -1633,7 +1633,7 @@ OnCast:
end;
}
-in_moc_16,149,80,4 script Guildmaster#ASN2 106,1,1,{
+in_moc_16,149,80,4 script Guildmaster#ASN2 1_M_MOC_LORD,1,1,{
OnTouch:
savepoint "morocc",100,100;
if (ASSIN_Q == 7 && BaseJob == Job_Thief) {
@@ -2172,7 +2172,7 @@ OnTouch:
}
}
-in_moc_16,186,81,1 script Master Assist 55,1,1,{
+in_moc_16,186,81,1 script Master Assist 1_M_JOBTESTER,1,1,{
mes "[Assistent Gayle Maroubitz]";
mes "Sorry, but I'm not in charge of job changes. Go to the Guildmaster, as he has told you.";
close;
@@ -2246,10 +2246,10 @@ OnInit:
disablenpc strnpcinfo(0);
end;
}
-in_moc_16,156,87,1 duplicate(#moc_assin_dup) [Huey] 55
-in_moc_16,156,85,1 duplicate(#moc_assin_dup) [Khai] 730
-in_moc_16,156,83,1 duplicate(#moc_assin_dup) [The Anonymous One] 106
-in_moc_16,156,81,2 duplicate(#moc_assin_dup) [Barcardi] 725
-in_moc_16,156,79,1 duplicate(#moc_assin_dup) [Beholder] 118
-in_moc_16,156,77,1 duplicate(#moc_assin_dup) [Thomas] 118
-in_moc_16,156,75,1 duplicate(#moc_assin_dup) [Gayle Maroubitz] 55
+in_moc_16,156,87,1 duplicate(#moc_assin_dup) [Huey] 1_M_JOBTESTER
+in_moc_16,156,85,1 duplicate(#moc_assin_dup) [Khai] 4_M_JOB_ASSASSIN
+in_moc_16,156,83,1 duplicate(#moc_assin_dup) [The Anonymous One] 1_M_MOC_LORD
+in_moc_16,156,81,2 duplicate(#moc_assin_dup) [Barcardi] 4_F_JOB_ASSASSIN
+in_moc_16,156,79,1 duplicate(#moc_assin_dup) [Beholder] 2_M_THIEFMASTER
+in_moc_16,156,77,1 duplicate(#moc_assin_dup) [Thomas] 2_M_THIEFMASTER
+in_moc_16,156,75,1 duplicate(#moc_assin_dup) [Gayle Maroubitz] 1_M_JOBTESTER
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index f58158be3..c8cfd8a2d 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -40,7 +40,7 @@
//= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
//==============================================================
-ein_in01,18,28,4 script Guildsman#BLS 731,{
+ein_in01,18,28,4 script Guildsman#BLS 4_M_JOB_BLACKSMITH,{
if (Upper == 1) {
mes "[Altiregen]";
mes "Hey hey. I don't have time for chit-chat, I'm a pretty busy guy. There's all these Merchants working hard to become Blacksmiths.";
@@ -276,7 +276,7 @@ ein_in01,18,28,4 script Guildsman#BLS 731,{
}
}
-ein_in01,201,27,3 script Guildsman#alberta 63,{
+ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{
mes "[Geschupenschte]";
mes "Hello there!";
mes "I'm ^8E6B23Geschupenschte^000000,";
@@ -931,7 +931,7 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{
}
}
-geffen,46,164,1 script Baisulist#BLS 69,{
+geffen,46,164,1 script Baisulist#BLS 1_F_04,{
if (BSMITH_Q == 9 && countitem(1610) > 0) {
mes "[Baisulist]";
mes "Oh, hello!";
@@ -1006,7 +1006,7 @@ geffen,46,164,1 script Baisulist#BLS 69,{
}
}
-morocc,27,112,4 script Wickebine#BLS 725,{
+morocc,27,112,4 script Wickebine#BLS 4_F_JOB_ASSASSIN,{
if (BSMITH_Q == 10 && countitem(1219) > 0) {
cutin "Job_Black_hucke01",2;
mes "[Wickebine]";
@@ -1107,7 +1107,7 @@ morocc,27,112,4 script Wickebine#BLS 725,{
}
}
-lighthalzen,209,80,4 script Krongast#BLS 734,{
+lighthalzen,209,80,4 script Krongast#BLS 4_M_JOB_KNIGHT2,{
if (BSMITH_Q == 11 && countitem(1119) > 0) {
mes "[Krongast]";
mes "Ohhhhhh~";
@@ -1185,7 +1185,7 @@ lighthalzen,209,80,4 script Krongast#BLS 734,{
}
}
-payon,214,79,4 script Talpiz#BLS 59,{
+payon,214,79,4 script Talpiz#BLS 1_M_ORIENT01,{
if (BSMITH_Q == 12 && countitem(1713) > 0) {
mes "[Talpiz]";
mes "Oh~";
@@ -1259,7 +1259,7 @@ payon,214,79,4 script Talpiz#BLS 59,{
}
}
-hugel,168,183,1 script Bismarc#BLS 118,{
+hugel,168,183,1 script Bismarc#BLS 2_M_THIEFMASTER,{
if (BSMITH_Q == 13 && countitem(1122) > 0) {
mes "[Bismarc]";
mes "Sweet God...";
@@ -1356,7 +1356,7 @@ hugel,168,183,1 script Bismarc#BLS 118,{
}
}
-ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
+ein_in01,24,41,5 script Blacksmith Guildsman#moc 4_F_JOB_BLACKSMITH,{
if (BSMITH_Q == 16) {
emotion e_hmm;
mes "[Mitehmaeeuh]";
@@ -1578,7 +1578,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
}
}
-geffen_in,109,170,3 script Blacksmith Guildsman#gef 726,{
+geffen_in,109,170,3 script Blacksmith Guildsman#gef 4_F_JOB_BLACKSMITH,{
mes "[Blacksmith Guildsman]";
mes "Good day, are you here to visit Blacksmith Guild?";
next;
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 326ef5fbb..d8e36f6af 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -55,7 +55,7 @@
// Notices in the old Hunter Guild.
//============================================================
-in_hunter,99,99,4 script Hunter Info#hnt::HntNotice 727,{
+in_hunter,99,99,4 script Hunter Info#hnt::HntNotice 4_F_JOB_HUNTER,{
mes "============Notice ============";
mes "We would like to inform that the Hunter Job Change Location";
mes "has been moved to ^ff0000Hugel^000000 in the Schwaltzvalt Republic.";
@@ -72,11 +72,11 @@ in_hunter,99,99,4 script Hunter Info#hnt::HntNotice 727,{
close;
}
-pay_fild10,148,252,3 duplicate(HntNotice) Job Change Location#hu 857
+pay_fild10,148,252,3 duplicate(HntNotice) Job Change Location#hu 4_BOARD3
// Actual Job quest start
//============================================================
-hu_in01,386,373,4 script Hunter Guildsman#hnt 727,{
+hu_in01,386,373,4 script Hunter Guildsman#hnt 4_F_JOB_HUNTER,{
if (Upper == 1) {
mes "[Hunter Sherin]";
mes "Oh, how have you been? It's been a long time, hasn't it?";
@@ -468,7 +468,7 @@ hu_in01,386,373,4 script Hunter Guildsman#hnt 727,{
close;
}
-hu_in01,382,382,4 script Guild Receptionist#hnt 732,{
+hu_in01,382,382,4 script Guild Receptionist#hnt 4_M_JOB_HUNTER,{
if (HNTR_Q == 2) {
mes "[Guild Receptionist]";
mes "Greetings. They call me... ^660000The Demon Hunter^000000. I am the one in charge of processing applications. Your name is ... " + strcharinfo(0) + ", correct?";
@@ -612,7 +612,7 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 732,{
}
}
-payon_in03,131,7,3 script Hunter#htnGM 59,{
+payon_in03,131,7,3 script Hunter#htnGM 1_M_ORIENT01,{
if (HNTR_Q == 10) {
mes "[Hunter Guildmaster]";
mes "Hmpf. You must be here for the Hunter job test. Let me tell you about the testing process. What would you like to know?";
@@ -765,7 +765,7 @@ payon_in03,131,7,3 script Hunter#htnGM 59,{
}
}
-payon_in02,21,31,1 script Hunter#htnGM2 59,{
+payon_in02,21,31,1 script Hunter#htnGM2 1_M_ORIENT01,{
cutin "job_huntermaster",2;
if (HNTR_Q == 11) {
mes "[Hunter Guildmaster]";
@@ -966,7 +966,7 @@ payon_in02,21,31,1 script Hunter#htnGM2 59,{
}
}
-job_hunte,178,32,1 script Guide#hnt 107,5,2,{
+job_hunte,178,32,1 script Guide#hnt 1_M_PAY_ELDER,5,2,{
OnTouch:
if (HNTR_Q == 12) {
mes "[Guide]";
@@ -1023,7 +1023,7 @@ OnTouch:
end;
}
-job_hunte,178,38,1 script Waiting Room#hnt 66,{
+job_hunte,178,38,1 script Waiting Room#hnt 1_F_01,{
end;
OnInit:
@@ -1042,7 +1042,7 @@ OnStart:
end;
}
-job_hunte,1,1,1 script Manager#hnt 66,{
+job_hunte,1,1,1 script Manager#hnt 1_F_01,{
OnInit:
disablenpc "Manager#hnt";
end;
@@ -1203,7 +1203,7 @@ OnTimer197000:
end;
}
-job_hunte,93,101,1 script Switch#hnt 723,1,1,{
+job_hunte,93,101,1 script Switch#hnt 1_SHADOW_NPC,1,1,{
OnTouch:
mes "^3355FFThere are 3 buttons";
mes "on the escape switch.^000000";
@@ -1246,7 +1246,7 @@ OnEnable:
end;
}
-job_hunte,89,139,0 script exit#hnttest 45,2,2,{
+job_hunte,89,139,0 script exit#hnttest WARPNPC,2,2,{
OnInit:
disablenpc "exit#hnttest";
end;
@@ -1633,7 +1633,7 @@ job_hunte,64,92,0 duplicate(HntTrap) 57-1 -1,0,0
job_hunte,64,93,0 duplicate(HntTrap) 57-2 -1,0,0
job_hunte,65,92,0 duplicate(HntTrap) 57-3 -1,0,0
-job_hunte,65,93,0 script 57-4::HntTrap2 -1,{
+job_hunte,65,93,0 script 1_M_LIBRARYMASTER-4::HntTrap2 -1,{
OnTouch:
mapannounce "job_hunte",strcharinfo(0) + ", has failed me! Go back to where you started!",bc_map;
set HNTR_Q,13;
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index cde608454..0b988998e 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -40,7 +40,7 @@
//= 3.3 Fixed missing changequest. [Joseph]
//============================================================
-prt_in,88,101,4 script Chivalry Captain#knt 56,{
+prt_in,88,101,4 script Chivalry Captain#knt 1_M_KNIGHTMASTER,{
mes "[Captain Herman]";
if (Upper == 1) {
mes "Hm? You're... What is it about you? I've been an honorable Knight for a long time, but I cannot understand this feeling I'm getting from you...";
@@ -464,7 +464,7 @@ L_Mission:
}
}
-prt_in,75,107,4 script Sir Andrew#knt 65,{
+prt_in,75,107,4 script Sir Andrew#knt 1_M_YOUNGKNIGHT,{
mes "[Sir Andrew]";
if (BaseJob != Job_Swordman) {
if (BaseJob == Job_Knight) {
@@ -668,7 +668,7 @@ prt_in,75,107,4 script Sir Andrew#knt 65,{
}
}
-prt_in,71,91,0 script Sir Siracuse#knt 65,{
+prt_in,71,91,0 script Sir Siracuse#knt 1_M_YOUNGKNIGHT,{
mes "[Sir Siracuse]";
if (BaseJob != Job_Swordman) {
if (BaseJob == Job_Knight) {
@@ -1053,7 +1053,7 @@ prt_in,71,91,0 script Sir Siracuse#knt 65,{
}
}
-prt_in,79,94,4 script Sir Windsor#knt 733,{
+prt_in,79,94,4 script Sir Windsor#knt 4_M_JOB_KNIGHT1,{
mes "[Sir Windsor]";
mes "...";
next;
@@ -1148,7 +1148,7 @@ prt_in,79,94,4 script Sir Windsor#knt 733,{
// Test 2 part 1
//==========================================================
-job_knt,89,106,4 script Knight Windsor#knt 733,{
+job_knt,89,106,4 script Knight Windsor#knt 4_M_JOB_KNIGHT1,{
mes "[Sir Windsor]";
mes "...";
next;
@@ -1221,7 +1221,7 @@ job_knt,89,106,4 script Knight Windsor#knt 733,{
}
}
-job_knt,89,106,4 script Windsor Benedict#knt 733,{
+job_knt,89,106,4 script Windsor Benedict#knt 4_M_JOB_KNIGHT1,{
end;
OnInit:
@@ -1443,7 +1443,7 @@ OnTimer182000:
// Test 3 (Manners)
//==========================================================
-prt_in,69,107,6 script Lady Amy#knt 728,{
+prt_in,69,107,6 script Lady Amy#knt 4_F_JOB_KNIGHT,{
mes "[Lady Amy]";
if (BaseJob != Job_Swordman) {
if (BaseJob == Job_Knight) {
@@ -1785,7 +1785,7 @@ prt_in,69,107,6 script Lady Amy#knt 728,{
// Test 4 (patience)
//==========================================================
-prt_in,70,99,6 script Sir Edmond#knt 734,{
+prt_in,70,99,6 script Sir Edmond#knt 4_M_JOB_KNIGHT2,{
mes "[Sir Edmond]";
if (BaseJob != Job_Swordman) {
if (BaseJob == Job_Knight) {
@@ -1938,7 +1938,7 @@ prt_in,70,99,6 script Sir Edmond#knt 734,{
}
}
-job_knt,1,1,1 script Timer#knt 107,{
+job_knt,1,1,1 script Timer#knt 1_M_PAY_ELDER,{
OnTimer300000:
enablenpc "Warp#knt";
end;
@@ -1987,7 +1987,7 @@ OnMyMobDead:
end;
}
-job_knt,145,57,1 script Warp#knt 107,22,22,{
+job_knt,145,57,1 script Warp#knt 1_M_PAY_ELDER,22,22,{
OnInit:
disablenpc "Warp#knt";
end;
@@ -2000,7 +2000,7 @@ OnTouch:
// Test 5, and creates Claymores for knights
//==========================================================
-prt_in,87,92,4 script Sir Gray#knt 119,{
+prt_in,87,92,4 script Sir Gray#knt 2_M_SWORDMASTER,{
mes "[Sir Gray]";
if (BaseJob != Job_Swordman) {
if (BaseJob == Job_Knight) {
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index cca2860a0..e5aceea72 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -30,7 +30,7 @@
//= 2.6 Removed the need for use of 'goto.' [L0ne_W0lf]
//==========================================================
-prt_church,16,41,4 script High Bishop#prst 60,{
+prt_church,16,41,4 script High Bishop#prst 1_M_PASTOR,{
// Uncomment the following 'if' statement to allow High Priests to assist Acolytes with the job change quest.
// Officially High Priests are blocked from helping by an indiscriminate check if you are a transcended character.
//if (Class == Job_High_Priest) set .@AllowHPAssist,1;
@@ -530,7 +530,7 @@ prt_church,16,41,4 script High Bishop#prst 60,{
}
}
-prt_church,27,24,1 script Sister Cecilia 79,{
+prt_church,27,24,1 script Sister Cecilia 1_F_PRIEST,{
mes "[Sister Cecilia]";
if (BaseJob != Job_Acolyte) {
if (BaseJob == Job_Priest) {
@@ -842,7 +842,7 @@ prt_church,27,24,1 script Sister Cecilia 79,{
// 2nd Test
//==========================================================
-job_prist,24,187,4 script Peter S. Alberto 110,{
+job_prist,24,187,4 script Peter S. Alberto 4_M_MINISTER,{
mes "[Father Peter]";
if (BaseJob == Job_Priest) {
mes "Welcome!";
@@ -1030,7 +1030,7 @@ OnDisable:
end;
}
-job_prist,23,187,1 script Peter S. Alberto#2 110,{
+job_prist,23,187,1 script Peter S. Alberto#2 4_M_MINISTER,{
mes "[Father Peter]";
if (BaseJob == Job_Priest) {
mes "Welcome!";
@@ -1085,7 +1085,7 @@ OnDisable:
end;
}
-- script Zombie_Generator#prst 110,{
+- script Zombie_Generator#prst 4_M_MINISTER,{
OnInit:
disablenpc "Zombie_Generator#prst";
end;
@@ -1290,7 +1290,7 @@ OnDisable:
disablenpc "Zombie5_1";
}
-job_prist,24,109,4 script prst1_1 45,3,3,{
+job_prist,24,109,4 script prst1_1 WARPNPC,3,3,{
OnTouch:
set .@mobs,getvariableofnpc(.MyMobs,"Zombie_Generator#prst");
if (BaseJob == Job_Priest) warp "job_prist",168,17;
@@ -1533,7 +1533,7 @@ OnTouch:
}
}
-job_prist,168,150,4 script Baphomet#prst 736,8,1,{
+job_prist,168,150,4 script Baphomet#prst 4_BAPHOMET,8,1,{
OnTouch:
if (BaseJob == Job_Priest) {
mes "[Baphomet]";
@@ -1595,7 +1595,7 @@ OnTouch:
}
}
-job_prist,168,180,4 script prst2_1 45,3,3,{
+job_prist,168,180,4 script prst2_1 WARPNPC,3,3,{
OnTouch:
if (BaseJob == Job_Priest) warp "job_prist",98,40;
else if (BaseClass == Job_Acolyte) {
@@ -1607,7 +1607,7 @@ OnTouch:
// 4th Test
//==========================================================
-job_prist,1,2,1 script Mummy_Generator 110,1,1,{
+job_prist,1,2,1 script Mummy_Generator 4_M_MINISTER,1,1,{
OnInit:
disablenpc "Mummy_Generator";
end;
@@ -1702,7 +1702,7 @@ OnDisable:
end;
}
-job_prist,98,105,4 script prst3_1 45,3,3,{
+job_prist,98,105,4 script prst3_1 WARPNPC,3,3,{
OnTouch:
if (BaseJob == Job_Priest) {
warp "prt_church",15,36;
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index 549ebcc95..b1b4d05ab 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -27,7 +27,7 @@
//= 3.3 Fixed waitingroom bug. [Euphy]
//============================================================
-gef_tower,111,37,4 script Wizard Guildsman 70,{
+gef_tower,111,37,4 script Wizard Guildsman 1_F_GYPSY,{
if (Upper == 1) {
mes "[Catherine]";
mes "? Excuse me, I am wondering if we have met before...?";
@@ -446,7 +446,7 @@ gef_tower,111,37,4 script Wizard Guildsman 70,{
}
}
-gef_tower,102,24,2 script Gloomy Wizard 735,{
+gef_tower,102,24,2 script Gloomy Wizard 4_M_JOB_WIZARD,{
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Wizard) {
mes "[Raulel]";
@@ -1053,7 +1053,7 @@ gef_tower,102,24,2 script Gloomy Wizard 735,{
}
}
-job_wiz,50,165,4 script Arena Assistant 700,{
+job_wiz,50,165,4 script Arena Assistant 8_F_GIRL,{
mes "[Arena Assistant]";
mes "Welcome to the Wizard Job Change Arena.";
mes "If you would like to take the final test, then please enter the waiting room.";
@@ -1086,7 +1086,7 @@ OnStart:
// Water Room (Test 2 part 1)
//==========================================================
-job_wiz,1,1,1 script Room of Water 66,{
+job_wiz,1,1,1 script Room of Water 1_F_01,{
OnInit:
disablenpc "Room of Water";
end;
@@ -1180,7 +1180,7 @@ OnTimer186000:
end;
}
-job_wiz,1,2,1 script Room of Water#Door 66,{
+job_wiz,1,2,1 script Room of Water#Door 1_F_01,{
OnInit:
disablenpc "Room of Water#Door";
end;
@@ -1259,7 +1259,7 @@ OnTouch:
// Earth Room (Test 2 part 2)
//==========================================================
-job_wiz,1,3,1 script Room of Earth 66,{
+job_wiz,1,3,1 script Room of Earth 1_F_01,{
OnInit:
disablenpc "Room of Earth";
end;
@@ -1354,7 +1354,7 @@ OnTimer186000:
end;
}
-job_wiz,1,4,1 script Room of Earth#Door 66,{
+job_wiz,1,4,1 script Room of Earth#Door 1_F_01,{
OnInit:
disablenpc "Room of Earth#Door";
end;
@@ -1439,7 +1439,7 @@ OnTouch:
// Fire Room (Test 2 part 3)
//==========================================================
-job_wiz,1,5,1 script Room of Fire 66,{
+job_wiz,1,5,1 script Room of Fire 1_F_01,{
OnInit:
disablenpc "Room of Fire";
end;
@@ -1532,7 +1532,7 @@ OnTimer186000:
end;
}
-job_wiz,1,6,1 script Room of Fire#Door 66,{
+job_wiz,1,6,1 script Room of Fire#Door 1_F_01,{
OnInit:
disablenpc "Room of Fire#Door";
end;
@@ -1619,7 +1619,7 @@ OnTouch:
end;
}
-job_wiz,1,7,1 script Test Helper#wiz 66,{
+job_wiz,1,7,1 script Test Helper#wiz 1_F_01,{
end;
OnInit:
@@ -1657,7 +1657,7 @@ OnTimer9000:
end;
}
-gef_tower,107,36,4 script White Dog#wiz 81,{
+gef_tower,107,36,4 script White Dog#wiz 4_DOG01,{
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Wizard) {
mes "[Maria]";
diff --git a/npc/jobs/2-1a/AssassinCross.txt b/npc/jobs/2-1a/AssassinCross.txt
index ff15ab302..a9fdee622 100644
--- a/npc/jobs/2-1a/AssassinCross.txt
+++ b/npc/jobs/2-1a/AssassinCross.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,44,58,5 script Assassin Cross#Valkyrie 725,{
+valkyrie,44,58,5 script Assassin Cross#Valkyrie 4_F_JOB_ASSASSIN,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/HighPriest.txt b/npc/jobs/2-1a/HighPriest.txt
index 9c6109dba..e7dffe9b9 100644
--- a/npc/jobs/2-1a/HighPriest.txt
+++ b/npc/jobs/2-1a/HighPriest.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,44,42,5 script High Priest#Valkyrie 60,{
+valkyrie,44,42,5 script High Priest#Valkyrie 1_M_PASTOR,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/HighWizard.txt b/npc/jobs/2-1a/HighWizard.txt
index 6a152a5cb..12517e04c 100644
--- a/npc/jobs/2-1a/HighWizard.txt
+++ b/npc/jobs/2-1a/HighWizard.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,44,47,5 script High Wizard#Valkyrie 735,{
+valkyrie,44,47,5 script High Wizard#Valkyrie 4_M_JOB_WIZARD,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/LordKnight.txt b/npc/jobs/2-1a/LordKnight.txt
index f1254c08a..eb310e360 100644
--- a/npc/jobs/2-1a/LordKnight.txt
+++ b/npc/jobs/2-1a/LordKnight.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,44,39,5 script Lord Knight#Valkyrie 56,{
+valkyrie,44,39,5 script Lord Knight#Valkyrie 1_M_KNIGHTMASTER,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/Sniper.txt b/npc/jobs/2-1a/Sniper.txt
index de9b8e44e..c7060cdf6 100644
--- a/npc/jobs/2-1a/Sniper.txt
+++ b/npc/jobs/2-1a/Sniper.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,44,55,5 script Sniper#Valkyrie 727,{
+valkyrie,44,55,5 script Sniper#Valkyrie 4_F_JOB_HUNTER,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1a/WhiteSmith.txt b/npc/jobs/2-1a/WhiteSmith.txt
index 174fb2582..d917d3988 100644
--- a/npc/jobs/2-1a/WhiteSmith.txt
+++ b/npc/jobs/2-1a/WhiteSmith.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,44,50,5 script MasterSmith#Valkyrie 731,{
+valkyrie,44,50,5 script MasterSmith#Valkyrie 4_M_JOB_BLACKSMITH,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt
index d5797edd3..ca04c46c9 100644
--- a/npc/jobs/2-1e/StarGladiator.txt
+++ b/npc/jobs/2-1e/StarGladiator.txt
@@ -17,7 +17,7 @@
//= 1.3 Added Quest Log commands. [Kisuka]
//============================================================
-payon,215,102,3 script Moohyun#job_star 828,3,3,{
+payon,215,102,3 script Moohyun#job_star 4_M_ROGUE,3,3,{
if (Class == Job_Taekwon) {
if (STGL_Q == 0) {
mes "[Moohyun]";
@@ -353,7 +353,7 @@ OnTouch:
close;
}
-comodo,172,230,3 script Wandering Master#job_sta 730,{
+comodo,172,230,3 script Wandering Master#job_sta 4_M_JOB_ASSASSIN,{
if (Class == Job_Taekwon) {
if (STGL_Q == 1) {
mes "[Moogang]";
@@ -816,7 +816,7 @@ comodo,172,230,3 script Wandering Master#job_sta 730,{
close;
}
-job_star,29,33,0 script Daru#job_star 59,{
+job_star,29,33,0 script Daru#job_star 1_M_ORIENT01,{
if (Class == Job_Taekwon) {
if (STGL_Q == 3) {
mes "[Daru]";
@@ -1101,7 +1101,7 @@ job_star,29,33,0 script Daru#job_star 59,{
close;
}
-job_star,95,33,0 script Beeryu#job_star 106,{
+job_star,95,33,0 script Beeryu#job_star 1_M_MOC_LORD,{
if (Class == Job_Taekwon) {
if (STGL_Q == 4) {
mes "[Beeryu]";
@@ -1413,7 +1413,7 @@ job_star,95,33,0 script Beeryu#job_star 106,{
close;
}
-job_star,161,33,0 script Cheehee#job_star 77,{
+job_star,161,33,0 script Cheehee#job_star 1_F_ORIENT_03,{
if (Class == Job_Taekwon) {
if (STGL_Q == 6) {
mes "[Cheehee]";
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index e0ea187ea..59504aadd 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -17,7 +17,7 @@
//= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
-alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
+alde_alche,27,185,5 script Alchemist Guildsman#am 4_F_ALCHE,{
mes "[Parmy Gianino]";
if (Upper == 1) {
mes "Welcome to the";
@@ -320,7 +320,7 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
}
}
-alde_alche,175,107,3 script Fastidious Alchemist#am 749,{
+alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{
mes "[Raspuchin Gregory]";
if (BaseJob != Job_Merchant) {
if (BaseJob == Job_Alchemist) {
@@ -789,7 +789,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 749,{
close;
}
-alde_alche,13,15,7 script Studying Man#am 750,{
+alde_alche,13,15,7 script Studying Man#am 4_M_ALCHE_C,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
mes "- Currently you are carrying -";
@@ -1333,7 +1333,7 @@ alde_alche,13,15,7 script Studying Man#am 750,{
}
}
-alde_alche,79,19,5 script Experiment Expert#am 748,{
+alde_alche,79,19,5 script Experiment Expert#am 4_M_ALCHE_A,{
mes "[Van Helmont]";
if (BaseJob != Job_Merchant) {
if (BaseJob == Job_Alchemist) {
@@ -1585,7 +1585,7 @@ alde_alche,79,19,5 script Experiment Expert#am 748,{
}
}
-alde_alche,101,184,4 script Master Alchemist#am 122,{
+alde_alche,101,184,4 script Master Alchemist#am 2_M_DYEINGER,{
cutin "job_alche_vincent",2;
mes "[Vincent Carsciallo]";
if (Upper == 1) {
@@ -1767,7 +1767,7 @@ alde_alche,101,184,4 script Master Alchemist#am 122,{
}
}
-alde_alche,145,19,1 script Chief Researcher#am 57,{
+alde_alche,145,19,1 script Chief Researcher#am 1_M_LIBRARYMASTER,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
mes "- Currently you are carrying -";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 3b7c5d509..6bb4945a6 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -25,7 +25,7 @@
// Ayealo
//============================================================
-comodo,226,123,5 script Wandering Bard 741,{
+comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{
if(Upper == 1) {
mes "[Lalo]";
mes "Chosen ones who are destined to become Gods";
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index e11a45382..ba841ea5e 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -34,7 +34,7 @@
// Senior Crusader: 1st Collect Items Test
//============================================================
-prt_castle,45,169,5 script Senior Crusader 752,{
+prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{
mes "[Michael Halig]";
if (Upper == 1) { //the baby classes were totally blocked... due to missing == 1
mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it.";
@@ -314,7 +314,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
// Suffering Man: 2nd Endurance Test
//============================================================
-prt_castle,164,32,1 script Man in Anguish 733,{
+prt_castle,164,32,1 script Man in Anguish 4_M_JOB_KNIGHT1,{
mes "[Murnak Mijoul]";
if(BaseJob != Job_Swordman) {
if (BaseJob == Job_Crusader) {
@@ -448,7 +448,7 @@ prt_castle,164,32,1 script Man in Anguish 733,{
// Gabriel Valentine: 3rd Knowledge Test
//============================================================
-prt_church,95,127,3 script Crusader 745,{
+prt_church,95,127,3 script Crusader 4_F_CRU,{
mes "[Gabriel Valentine]";
if(BaseJob != Job_Swordman) {
if (BaseJob == Job_Crusader) {
@@ -797,7 +797,7 @@ prt_church,95,127,3 script Crusader 745,{
// Crusader: 4th Purification Test
//============================================================
-prt_castle,35,151,5 script Patron Knight 751,{
+prt_castle,35,151,5 script Patron Knight 4_M_CRU,{
mes "[Bliant Piyord]";
mes "Welcome.";
if(BaseJob != Job_Swordman) {
@@ -1202,7 +1202,7 @@ OnDead:
}
-job_cru,98,105,4 script Summoner#cr5 45,3,3,{
+job_cru,98,105,4 script Summoner#cr5 WARPNPC,3,3,{
OnTouch:
set CRUS_Q,6;
changequest 3010,3011;
@@ -1213,7 +1213,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Purification Test
//----------------------------------------------------------------------------
-job_cru,24,187,4 script Patron Knight#2 751,{
+job_cru,24,187,4 script Patron Knight#2 4_M_CRU,{
mes "[Bliant Piyord]";
mes "Welcome.";
mes "You will take";
@@ -1230,7 +1230,7 @@ job_cru,24,187,4 script Patron Knight#2 751,{
close;
}
-job_cru,24,187,2 script Waiting Room#cr1 700,{
+job_cru,24,187,2 script Waiting Room#cr1 8_F_GIRL,{
end;
OnInit:
@@ -1408,7 +1408,7 @@ OnDead:
end;
}
-job_cru,168,180,4 script Monster Summon#cr5 45,3,3,{
+job_cru,168,180,4 script Monster Summon#cr5 WARPNPC,3,3,{
OnInit:
disablenpc "Monster Summon#cr5";
end;
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 88157d40b..4075ce51f 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -21,7 +21,7 @@
//= 3.7a Fixed a label execution. [Euphy]
//============================================================
-comodo,180,153,4 script Sonotora#1 90,{
+comodo,180,153,4 script Sonotora#1 4_F_01,{
mes "[Athena Sonotora]";
mes "They say the";
mes "famous dance school";
@@ -41,7 +41,7 @@ comodo,180,153,4 script Sonotora#1 90,{
close;
}
-comodo,193,151,4 script Bor Robin#1 86,{
+comodo,193,151,4 script Bor Robin#1 4_M_04,{
mes "[Bor Robin]";
mes "Aah....";
mes "A prima donna";
@@ -74,7 +74,7 @@ comodo,193,151,4 script Bor Robin#1 86,{
close;
}
-job_duncer,43,93,4 script Aile#da 724,{
+job_duncer,43,93,4 script Aile#da 4_F_07,{
if (Upper == 1) {
mes "[Aile]";
mes "One two three four,";
@@ -408,7 +408,7 @@ job_duncer,43,93,4 script Aile#da 724,{
}
}
-job_duncer,95,93,4 script Bijou#da 101,{
+job_duncer,95,93,4 script Bijou#da 4W_F_01,{
if (SkillPoint) {
mes "[Bijou]";
mes "You can't change jobs";
@@ -893,7 +893,7 @@ job_duncer,95,93,4 script Bijou#da 101,{
// Waiting Room
//============================================================
-job_duncer,32,154,1 script Waiting Room#dance 66,{
+job_duncer,32,154,1 script Waiting Room#dance 1_F_01,{
end;
OnInit:
@@ -918,7 +918,7 @@ OnEnable:
end;
}
-job_duncer,32,154,1 script Waiting Room#click 66,{
+job_duncer,32,154,1 script Waiting Room#click 1_F_01,{
mes "[Pyorgin]";
mes "Please wait in";
mes "the waiting room.";
@@ -1322,7 +1322,7 @@ OnDisable:
// Backup Dancers
//============================================================
-job_duncer,63,110,4 script Backdancer#1 724,{
+job_duncer,63,110,4 script Backdancer#1 4_F_07,{
end;
OnSmile:
@@ -1340,7 +1340,7 @@ OnOmg:
end;
}
-job_duncer,66,113,4 script Backdancer#2 724,{
+job_duncer,66,113,4 script Backdancer#2 4_F_07,{
end;
OnSmile:
@@ -1352,7 +1352,7 @@ OnOmg:
end;
}
-job_duncer,72,113,4 script Backdancer#3 724,{
+job_duncer,72,113,4 script Backdancer#3 4_F_07,{
end;
OnSmile:
@@ -1364,7 +1364,7 @@ OnOmg:
end;
}
-job_duncer,75,110,4 script Backdancer#4 724,{
+job_duncer,75,110,4 script Backdancer#4 4_F_07,{
end;
OnSmile:
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index ddcce606c..221828908 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -16,7 +16,7 @@
//= 2.5 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
-prt_monk,59,247,1 script Guarding Monk#mk 120,6,2,{
+prt_monk,59,247,1 script Guarding Monk#mk 2_M_PHARMACIST,6,2,{
if (Upper == 1) {
mes "[Tohobu]";
mes "Hmm? What business do you have here?";
@@ -321,7 +321,7 @@ OnTouch:
end;
}
-monk_in,99,58,1 script Sensei Moohae#mk 60,{
+monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{
mes "[Sensei Moohae]";
mes "Greetings, you seem to be on a pure path.";
mes "Come in, come in, what can I do for you today?";
@@ -901,7 +901,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
}
}
-prt_monk,251,255,1 script Touha#mk 79,{
+prt_monk,251,255,1 script Touha#mk 1_F_PRIEST,{
if (MONK_Q >= 10 && MONK_Q < 14) {
if (MONK_Q == 10) {
mes "[Touha]";
@@ -1680,7 +1680,7 @@ prt_monk,251,255,1 script Touha#mk 79,{
}
}
-prt_monk,57,179,1 script Boohae#mk 110,{
+prt_monk,57,179,1 script Boohae#mk 4_M_MINISTER,{
if (MONK_Q == 14 && BaseJob == Job_Acolyte) {
mes "[Boohae]";
mes "...";
@@ -1846,7 +1846,7 @@ prt_monk,57,179,1 script Boohae#mk 110,{
}
}
-prt_monk,199,169,3 script Door Keeper#mk 746,{
+prt_monk,199,169,3 script Door Keeper#mk 4_F_MONK,{
mes "[Keeper Chorip]";
mes "....this place is for those";
mes " in testing for becoming a monk.";
@@ -1879,7 +1879,7 @@ prt_monk,199,169,3 script Door Keeper#mk 746,{
}
}
-monk_test,329,61,3 script Bashu#mk 753,{
+monk_test,329,61,3 script Bashu#mk 4_M_MONK,{
if (MONK_Q > 14 && MONK_Q < 25) {
if (MONK_Q == 15) {
mes "[Bashu]";
@@ -1930,7 +1930,7 @@ monk_test,329,61,3 script Bashu#mk 753,{
}
}
-monk_test,386,388,4 script Apprentice Monk#mk 110,{
+monk_test,386,388,4 script Apprentice Monk#mk 4_M_MINISTER,{
mes "[Monk Apprentice]";
mes "W... welcome!";
mes "Th... this place is for testing the tolerance of monk candidates!";
@@ -1965,7 +1965,7 @@ monk_test,386,388,4 script Apprentice Monk#mk 110,{
close;
}
-monk_test,387,350,0 script Supervisor#race_monk 45,2,2,{
+monk_test,387,350,0 script Supervisor#race_monk WARPNPC,2,2,{
OnTouch:
if (MONK_Q >= 15 && MONK_Q <= 23) {
set MONK_Q,MONK_Q+1;
@@ -2023,7 +2023,7 @@ monk_test,387,42,0 duplicate(MonkTrap) Trap#t_monk7_2 -1,1,0
monk_test,389,43,0 duplicate(MonkTrap) Trap#t_monk7_3 -1
monk_test,389,42,0 duplicate(MonkTrap) Trap#t_monk7_4 -1
-job_monk,225,180,1 script Hyunmoo#mk 89,{
+job_monk,225,180,1 script Hyunmoo#mk 4_M_ORIENT02,{
if ((countitem(1069) > 0 || countitem(1070) > 0) && (countitem(1069) < 30 || countitem(1070) < 30)) {
mes "[Hyunmoo]";
mes "You didn't bring enough mushrooms... go get some more.";
@@ -2115,7 +2115,7 @@ job_monk,225,180,1 script Hyunmoo#mk 89,{
}
}
-prt_monk,225,180,1 script Hyunmoo#mk2 89,{
+prt_monk,225,180,1 script Hyunmoo#mk2 4_M_ORIENT02,{
if (MONK_Q < 25) {
mes "[Hyunmoo]";
mes "As I see vegetables growing, I feel myself growing within.";
@@ -2156,7 +2156,7 @@ prt_monk,225,180,1 script Hyunmoo#mk2 89,{
}
}
-monk_test,319,139,1 script Tomoon#mk 52,{
+monk_test,319,139,1 script Tomoon#mk 1_M_HOF,{
if (MONK_Q == 25) {
mes "[Tomoon]";
mes "Welcome young one.";
@@ -2227,7 +2227,7 @@ monk_test,319,139,1 script Tomoon#mk 52,{
}
}
-monk_test,82,85,1 script Proctor#mk 95,{
+monk_test,82,85,1 script Proctor#mk 4_F_SISTER,{
mes "[Proctor]";
mes "So, are you ready to undergo the spiritual training?";
next;
@@ -2319,7 +2319,7 @@ OnDisable:
end;
}
-monk_test,166,278,0 script exit_monk#1 45,1,1,{
+monk_test,166,278,0 script exit_monk#1 WARPNPC,1,1,{
OnTouch:
mes "[Proctor]";
mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2334,7 +2334,7 @@ OnTouch:
end;
}
-monk_test,88,91,1 script Proctor#mk2 52,{
+monk_test,88,91,1 script Proctor#mk2 1_M_HOF,{
mes "[Proctor]";
mes "So, are you ready to undergo this spiritual training?";
next;
@@ -2426,7 +2426,7 @@ OnDisable:
end;
}
-monk_test,166,178,0 script exit_monk#2 45,1,1,{
+monk_test,166,178,0 script exit_monk#2 WARPNPC,1,1,{
OnTouch:
mes "[Proctor]";
mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2441,7 +2441,7 @@ OnTouch:
end;
}
-monk_test,95,85,1 script Proctor#btl#3 79,{
+monk_test,95,85,1 script Proctor#btl#3 1_F_PRIEST,{
mes "[Proctor]";
mes "So, are you ready to undergo this spiritual training?";
next;
@@ -2533,7 +2533,7 @@ OnDisable:
end;
}
-monk_test,270,278,0 script exit_monk#3 45,1,1,{
+monk_test,270,278,0 script exit_monk#3 WARPNPC,1,1,{
OnTouch:
mes "[Proctor]";
mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2575,7 +2575,7 @@ OnEnable:
end;
}
-monk_test,137,338,1 script switchreset#monkmonk 79,{
+monk_test,137,338,1 script switchreset#monkmonk 1_F_PRIEST,{
mes "Grrrr...";
mes "All monsters in the monk job chance place have been reset.";
mes "Timer's activated.";
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 4c7b5ac4f..4ce7fe424 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -21,7 +21,7 @@
//= 2.9 Added Quest Log commands. [Kisuka]
//============================================================
-moc_ruins,86,103,1 script Thug#rg 118,{
+moc_ruins,86,103,1 script Thug#rg 2_M_THIEFMASTER,{
mes "[Thug]";
mes "*Sigh...*";
mes "What is life?";
@@ -52,7 +52,7 @@ moc_ruins,86,103,1 script Thug#rg 118,{
close;
}
-in_rogue,363,122,4 script Rogue Guildsman#rg 747,{
+in_rogue,363,122,4 script Rogue Guildsman#rg 4_F_ROGUE,{
if (Upper == 1) {
mes "[Markie]";
mes "Eh? You...you...?!";
@@ -487,7 +487,7 @@ in_rogue,363,122,4 script Rogue Guildsman#rg 747,{
}
}
-in_rogue,376,23,1 script Mr. Smith#rg 57,{
+in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{
if (ROGUE_Q == 2) {
mes "[Mr. Smith]";
mes "Welcome to";
@@ -1009,7 +1009,7 @@ S_CheckItems:
close;
}
-cmd_fild09,106,195,0 script Warp#1 45,1,1,{
+cmd_fild09,106,195,0 script Warp#1 WARPNPC,1,1,{
OnTouch:
mes "[???]";
mes "Who's there?!";
@@ -1079,7 +1079,7 @@ OnTouch:
}
}
-cmd_fild09,335,143,0 script Warp#2 45,1,1,{
+cmd_fild09,335,143,0 script Warp#2 WARPNPC,1,1,{
OnTouch:
mes "[???]";
mes "Who's there?!";
@@ -1149,7 +1149,7 @@ OnTouch:
}
}
-cmd_fild04,304,180,0 script Warp#3 45,1,1,{
+cmd_fild04,304,180,0 script Warp#3 WARPNPC,1,1,{
OnTouch:
mes "[???]";
mes "Who's there?!";
@@ -1219,7 +1219,7 @@ OnTouch:
}
}
-in_rogue,272,135,1 script Hermanthorn Jr#rg 85,{
+in_rogue,272,135,1 script Hermanthorn Jr#rg 4_M_03,{
if (ROGUE_Q == 8) {
mes "[HermanthornJr.]";
mes "I see...";
@@ -1269,7 +1269,7 @@ in_rogue,272,135,1 script Hermanthorn Jr#rg 85,{
}
}
-in_rogue,270,130,0 script he_to_rogue#rg 45,1,1,{
+in_rogue,270,130,0 script he_to_rogue#rg WARPNPC,1,1,{
OnTouch:
mes "^3355FFThe door is locked. You'll need to enter the four number combination to open it.^000000";
next;
@@ -1382,7 +1382,7 @@ OnMyMobDead:
end;
}
-in_rogue,9,389,0 script oneway_to_gu 45,1,1,{
+in_rogue,9,389,0 script oneway_to_gu WARPNPC,1,1,{
OnTouch:
donpcevent "gen_ro#4::OnDisable";
set ROGUE_Q,17;
@@ -1390,7 +1390,7 @@ OnTouch:
end;
}
-in_rogue,244,39,1 script Aragham Junior#rg 99,{
+in_rogue,244,39,1 script Aragham Junior#rg 4W_M_03,{
if (ROGUE_Q == 9) {
mes "[Aragham Jr.]";
mes "Oh, you must be";
@@ -1476,7 +1476,7 @@ in_rogue,244,39,1 script Aragham Junior#rg 99,{
}
}
-in_rogue,160,34,1 script Hollgrehenn junior#rg 85,{
+in_rogue,160,34,1 script Hollgrehenn junior#rg 4_M_03,{
if (ROGUE_Q == 11) {
mes "[Hollgrehenn Jr.]";
mes "Huh...";
@@ -1562,7 +1562,7 @@ in_rogue,160,34,1 script Hollgrehenn junior#rg 85,{
}
}
-in_rogue,177,109,1 script Antonio junior#rg 88,{
+in_rogue,177,109,1 script Antonio junior#rg 4_M_ORIENT01,{
if (ROGUE_Q == 10) {
mes "[Antonio Jr.]";
mes "You're from";
@@ -1647,7 +1647,7 @@ in_rogue,177,109,1 script Antonio junior#rg 88,{
}
}
-in_rogue,370,320,0 script quest_out 45,1,1,{
+in_rogue,370,320,0 script quest_out WARPNPC,1,1,{
OnTouch:
set ROGUE_Q,16;
warp "in_rogue",378,113;
@@ -1988,7 +1988,7 @@ OnInit:
end;
}
-in_rogue,399,286,1 script switch#rogreset 88,{
+in_rogue,399,286,1 script switch#rogreset 4_M_ORIENT01,{
mes "^F08080Tah dah~";
mes "Monsters for the";
mes "Rogue Job Change";
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index a425495b3..4f93ba7db 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -27,7 +27,7 @@
//= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
-yuno_in02,38,61,5 script Dean of the Academy#sa 743,{
+yuno_in02,38,61,5 script Dean of the Academy#sa 2_M_SAGE_OLD,{
cutin "job_sage_kayron",2;
mes "[Kayron Grik]";
if (Upper == 1) {
@@ -193,7 +193,7 @@ yuno_in02,38,61,5 script Dean of the Academy#sa 743,{
end;
}
-yuno_in03,154,35,4 script Staff of the Academy#a 742,{
+yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{
mes "[Metheus Sylphe]";
if (Upper == 1) {
mes "Welcome to the";
@@ -634,7 +634,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
}
}
-yuno_in03,105,177,5 script Written Test Professor#s 754,{
+yuno_in03,105,177,5 script Written Test Professor#s 4_M_SAGE_A,{
mes "[Claytos Verdo]";
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Sage) {
@@ -1054,7 +1054,7 @@ L_AskQuestions:
}
//Practical Examination Professer
-yuno_in03,169,180,3 script Practical Examination P 755,{
+yuno_in03,169,180,3 script Practical Examination P 4_M_SAGE_C,{
mes "[Hermes Tris]";
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Sage) {
@@ -1255,7 +1255,7 @@ yuno_in03,169,180,3 script Practical Examination P 755,{
}
}
-yuno_in03,62,176,2 script History Professor#sa 109,{
+yuno_in03,62,176,2 script History Professor#sa 4_M_MANAGER,{
mes "[Saphien Layless]";
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Sage) {
@@ -1696,7 +1696,7 @@ yuno_in03,62,176,2 script History Professor#sa 109,{
}
}
-yuno_in03,32,102,1 script Biology Professor#sa 755,{
+yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{
mes "[Lucius Celsus]";
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Sage) {
@@ -2123,7 +2123,7 @@ yuno_in03,32,102,1 script Biology Professor#sa 755,{
}
}
-yuno_in03,244,31,3 script Physics Professor#sa 120,{
+yuno_in03,244,31,3 script Physics Professor#sa 2_M_PHARMACIST,{
mes "[Aebecee George]";
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Sage) {
@@ -2542,7 +2542,7 @@ yuno_in03,244,31,3 script Physics Professor#sa 120,{
}
}
-job_sage,50,165,4 script Test Helper#talk 700,{
+job_sage,50,165,4 script Test Helper#talk 8_F_GIRL,{
mes "[Test Helper]";
mes "Welcome to the Sage practical examination hall.";
mes "If you wish to take the test right now, please enter the waiting room.";
@@ -2557,7 +2557,7 @@ job_sage,50,165,4 script Test Helper#talk 700,{
close;
}
-job_sage,50,165,4 script Waiting Room#sg 700,{
+job_sage,50,165,4 script Waiting Room#sg 8_F_GIRL,{
end;
OnInit:
@@ -2577,7 +2577,7 @@ OnEnable:
end;
}
-- script Arena#1 66,{
+- script Arena#1 1_F_01,{
OnInit:
disablenpc "Arena#1";
end;
diff --git a/npc/jobs/2-2a/Champion.txt b/npc/jobs/2-2a/Champion.txt
index 706722504..7f0f743cd 100644
--- a/npc/jobs/2-2a/Champion.txt
+++ b/npc/jobs/2-2a/Champion.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,53,42,3 script Champion#Valkyrie 52,{
+valkyrie,53,42,3 script Champion#Valkyrie 1_M_HOF,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt
index 3c007abe7..1d9b200bf 100644
--- a/npc/jobs/2-2a/Clown.txt
+++ b/npc/jobs/2-2a/Clown.txt
@@ -15,7 +15,7 @@
//= Thanks to Myllena.
//============================================================
-valkyrie,53,54,3 script Minstrel#Valkyrie 741,{
+valkyrie,53,54,3 script Minstrel#Valkyrie 2_M_BARD_ORIENT,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt
index 0c93c49b2..a8a81f0c9 100644
--- a/npc/jobs/2-2a/Creator.txt
+++ b/npc/jobs/2-2a/Creator.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,53,50,3 script Biochemist#Valkyrie 122,{
+valkyrie,53,50,3 script Biochemist#Valkyrie 2_M_DYEINGER,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Gypsy.txt b/npc/jobs/2-2a/Gypsy.txt
index f0a2c2c18..f8d80cc29 100644
--- a/npc/jobs/2-2a/Gypsy.txt
+++ b/npc/jobs/2-2a/Gypsy.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,53,56,3 script Gypsy#Valkyrie 101,{
+valkyrie,53,56,3 script Gypsy#Valkyrie 4W_F_01,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Paladin.txt b/npc/jobs/2-2a/Paladin.txt
index ea240bba2..9bd6a46f0 100644
--- a/npc/jobs/2-2a/Paladin.txt
+++ b/npc/jobs/2-2a/Paladin.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,53,39,3 script Paladin#Valkyrie 752,{
+valkyrie,53,39,3 script Paladin#Valkyrie 4_M_CRU_OLD,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index cffe3c0e4..b42e1627a 100644
--- a/npc/jobs/2-2a/Professor.txt
+++ b/npc/jobs/2-2a/Professor.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,53,47,3 script Scholar#Valkyrie 743,{
+valkyrie,53,47,3 script Scholar#Valkyrie 2_M_SAGE_OLD,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2a/Stalker.txt b/npc/jobs/2-2a/Stalker.txt
index 6f6f86235..fbc1e060c 100644
--- a/npc/jobs/2-2a/Stalker.txt
+++ b/npc/jobs/2-2a/Stalker.txt
@@ -13,7 +13,7 @@
//= 1.3 Now saves/restores all the quest skills [Lupus]
//============================================================
-valkyrie,53,58,3 script Stalker#Valkyrie 747,{
+valkyrie,53,58,3 script Stalker#Valkyrie 4_F_ROGUE,{
if (ADVJOB == 0 || Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index 98e8084c1..225b4ee7b 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -21,7 +21,7 @@
//= 1.6 Updated to match the latest official script. [Euphy]
//============================================================
-morocc_in,174,30,6 script Kid#link1 716,{
+morocc_in,174,30,6 script Kid#link1 4_M_KID2,{
if (Class == Job_Soul_Linker) {
mes "[Maia]";
mes "Best of luck in your";
@@ -489,9 +489,9 @@ OnTouch:
end;
}
-job_soul,35,30,6 duplicate(SLTester) Maia#link6 716
+job_soul,35,30,6 duplicate(SLTester) Maia#link6 4_M_KID2
-job_soul,30,35,6 script Monk Spirit#link4 827,{
+job_soul,30,35,6 script Monk Spirit#link4 4_M_GRANDMONK,{
if (SOUL_Q == 2) {
mes "[Monk Spirit]";
mes "Who am I...?";
@@ -536,7 +536,7 @@ job_soul,30,35,6 script Monk Spirit#link4 827,{
close;
}
-job_soul,30,25,7 script Sage Spirit#link5 754,{
+job_soul,30,25,7 script Sage Spirit#link5 4_M_SAGE_A,{
if (SOUL_Q == 2) {
mes "[Sage Spirit]";
mes "Speak to Maia.";
@@ -585,7 +585,7 @@ job_soul,30,25,7 script Sage Spirit#link5 754,{
close;
}
-job_soul,25,30,5 script Alchemist Spirit#link7 744,{
+job_soul,25,30,5 script Alchemist Spirit#link7 4_F_ALCHE,{
if (SOUL_Q == 2) {
mes "[Alchemist Spirit]";
mes "Oh! I really want to";
@@ -631,7 +631,7 @@ job_soul,25,30,5 script Alchemist Spirit#link7 744,{
close;
}
-job_soul,1,5,0 script Timer#link3 111,{
+job_soul,1,5,0 script Timer#link3 HIDDEN_NPC,{
end;
OnEnable:
@@ -663,7 +663,7 @@ OnTimer183000:
stopnpctimer;
}
-sec_in02,35,153,0 script Soul Linker Var 871,{
+sec_in02,35,153,0 script Soul Linker Var 4_M_OPERATION,{
callfunc "F_GM_NPC";
mes "[Soul Linker Var]";
mes "I can reset the Soul Linker";
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index 434ead038..cf9ea7b87 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -18,7 +18,7 @@
//= 2.4 Added an Ex. Super Novice dialog check. [Euphy]
//============================================================
-aldeba_in,223,167,3 script Tzerero#sn 709,{
+aldeba_in,223,167,3 script Tzerero#sn 4_M_SEAMAN,{
if (BaseJob == Job_SuperNovice) {
mes "[Tzerero]";
mes "I trust that you are enjoying";
@@ -326,7 +326,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{
}
}
-aldeba_in,216,169,5 script Esseray#sn 86,{
+aldeba_in,216,169,5 script Esseray#sn 4_M_04,{
if (Class == Job_Super_Novice_E || Class == Job_Super_Baby_E) {
mes "[Esseray]";
mes "You! Stronger than before.";
@@ -382,7 +382,7 @@ aldeba_in,216,169,5 script Esseray#sn 86,{
}
}
-aldebaran,54,238,5 script Kafra Employee#sn 117,{
+aldebaran,54,238,5 script Kafra Employee#sn 4_F_KAFRA1,{
if (BaseJob == Job_SuperNovice) {
mes "[Kafra Employee]";
if (Sex )
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index 8b44c6d34..e105c2e4b 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -38,7 +38,7 @@
//= 3.1 Added Izlude Renewal coordinates.
//============================================================
-valkyrie,48,86,4 script Valkyrie# 811,{
+valkyrie,48,86,4 script Valkyrie# 4_F_VALKYRIE,{
if (ADVJOB != 0 || Upper == 1) {
mes "[Valkyrie]";
mes "Welcome";
@@ -210,7 +210,7 @@ valkyrie,48,86,4 script Valkyrie# 811,{
}
}
-yuno_in02,88,164,5 script Metheus Sylphe#Library 742,{
+yuno_in02,88,164,5 script Metheus Sylphe#Library 2_M_SAGE_B,{
if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
if (valkyrie_Q == 0) {
mes "[Metheus Sylphe]";
@@ -257,7 +257,7 @@ yuno_in02,88,164,5 script Metheus Sylphe#Library 742,{
close;
}
-yuno_in02,93,207,1 script Book of Ymir 111,{
+yuno_in02,93,207,1 script Book of Ymir HIDDEN_NPC,{
if (ADVJOB != 0 || Upper == 1) {
mes "[The Book of Ymir]";
mes "...The entrance to the Hall of Honor is open to anyone who has moved forward into their next life. It is there to help heroes decide what they want to do, and can lead them to anywhere in this world.";
@@ -343,14 +343,14 @@ yuno_in02,93,207,1 script Book of Ymir 111,{
close;
}
-yuno_in05,49,43,1 script Heart of Ymir 111,{
+yuno_in05,49,43,1 script Heart of Ymir HIDDEN_NPC,{
if (BaseLevel > 98 && JobLevel > 49 && Class >= Job_Knight && Class <= Job_Crusader2) {
if (valkyrie_Q == 2) warp "valkyrie",48,8;
}
end;
}
-valkyrie,44,33,5 script Teleporter 124,{
+valkyrie,44,33,5 script Teleporter 4_F_TELEPORTER,{
if (Upper != 1) {
set .@karma_d,rand(1,10);
if (.@karma_d > 4) {
diff --git a/npc/kafras/cool_event_corp.txt b/npc/kafras/cool_event_corp.txt
index ced4714f2..e06f0dedc 100644
--- a/npc/kafras/cool_event_corp.txt
+++ b/npc/kafras/cool_event_corp.txt
@@ -18,7 +18,7 @@
//= 1.5 Cool Event Corp staff is now more iRO like. [L0ne_W0lf]
//============================================================
-hugel,88,168,4 script Cool Event Corp. Staff::CoolEventCorpStaffHugel 874,{
+hugel,88,168,4 script Cool Event Corp. Staff::CoolEventCorpStaffHugel 4_M_ZONDAMAN,{
cutin "zonda_01",2;
mes "[Cool Event Corp. Staff]";
mes "Welcome to Cool Event Corp.";
@@ -134,7 +134,7 @@ hugel,88,168,4 script Cool Event Corp. Staff::CoolEventCorpStaffHugel 874,{
end;
}
-rachel,109,138,5 script Cool Event Corp. Staff::CoolEventCorpStaffRachel 874,{
+rachel,109,138,5 script Cool Event Corp. Staff::CoolEventCorpStaffRachel 4_M_ZONDAMAN,{
cutin "zonda_01",2;
mes "[Cool Event Corp. Staff]";
mes "Welcome to Cool Event Corp.";
@@ -276,7 +276,7 @@ rachel,109,138,5 script Cool Event Corp. Staff::CoolEventCorpStaffRachel 874,{
end;
}
-veins,208,128,5 script Cool Event Corp. Staff::CoolEventCorpStaffVeins 874,{
+veins,208,128,5 script Cool Event Corp. Staff::CoolEventCorpStaffVeins 4_M_ZONDAMAN,{
cutin "zonda_01",2;
mes "[Cool Event Corp. Staff]";
mes "Welcome to Cool Event Corp.";
diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt
index 8819779d9..3a76e8259 100644
--- a/npc/kafras/dts_warper.txt
+++ b/npc/kafras/dts_warper.txt
@@ -682,32 +682,32 @@ function script F_VoteKafra {
end;
}
-yuno,162,191,4 script Kafra Voting Staff#yuno 861,{
+yuno,162,191,4 script Kafra Voting Staff#yuno 4_F_KAFRA9,{
callfunc "F_VoteKafra",9;
}
-prontera,164,125,4 script Kafra Voting Staff#prt 116,{
+prontera,164,125,4 script Kafra Voting Staff#prt 4_F_KAFRA2,{
callfunc "F_VoteKafra",2;
}
-moc_ruins,97,133,4 script Kafra Voting Staff#moc 116,{
+moc_ruins,97,133,4 script Kafra Voting Staff#moc 4_F_KAFRA2,{
callfunc "F_VoteKafra",2;
}
-geffen,122,37,4 script Kafra Voting Staff#gef 116,{
+geffen,122,37,4 script Kafra Voting Staff#gef 4_F_KAFRA2,{
callfunc "F_VoteKafra",2;
}
-payon,158,182,4 script Kafra Voting Staff#pay 116,{
+payon,158,182,4 script Kafra Voting Staff#pay 4_F_KAFRA2,{
callfunc "F_VoteKafra",2;
}
-alberta,119,70,4 script Kafra Voting Staff#alb 116,{
+alberta,119,70,4 script Kafra Voting Staff#alb 4_F_KAFRA2,{
callfunc "F_VoteKafra",2;
}
-aldebaran,145,102,4 script Kafra Voting Staff#alde 116,{
+aldebaran,145,102,4 script Kafra Voting Staff#alde 4_F_KAFRA2,{
callfunc "F_VoteKafra",2;
}
-lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{
+lighthalzen,163,60,4 script Kafra Voting Staff#lght 4_F_KAFRA9,{
callfunc "F_VoteKafra",9;
}
-- script Cool Event Staff::VotingStaffCCE 874,{
+- script Cool Event Staff::VotingStaffCCE 4_M_ZONDAMAN,{
callfunc "F_ClearGarbage"; //Clear outdated, unused variables
cutin "zonda_01",2;
mes "[Cool Event Corp. Voting Staff]";
@@ -1099,14 +1099,14 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{
end;
}
-yuno,153,191,6 duplicate(VotingStaffCCE) Cool Event Staff#yuno 874
-prontera,147,125,6 duplicate(VotingStaffCCE) Cool Event Staff#prt 874
-moc_ruins,104,133,6 duplicate(VotingStaffCCE) Cool Event Staff#moc 874
-geffen,117,37,6 duplicate(VotingStaffCCE) Cool Event Staff#gef 874
-payon,153,182,6 duplicate(VotingStaffCCE) Cool Event Staff#pay 874
-alberta,114,70,6 duplicate(VotingStaffCCE) Cool Event Staff#alb 874
-aldebaran,138,102,6 duplicate(VotingStaffCCE) Cool Event Staff#alde 874
-lighthalzen,154,60,6 duplicate(VotingStaffCCE) Cool Event Staff#lhz 874
+yuno,153,191,6 duplicate(VotingStaffCCE) Cool Event Staff#yuno 4_M_ZONDAMAN
+prontera,147,125,6 duplicate(VotingStaffCCE) Cool Event Staff#prt 4_M_ZONDAMAN
+moc_ruins,104,133,6 duplicate(VotingStaffCCE) Cool Event Staff#moc 4_M_ZONDAMAN
+geffen,117,37,6 duplicate(VotingStaffCCE) Cool Event Staff#gef 4_M_ZONDAMAN
+payon,153,182,6 duplicate(VotingStaffCCE) Cool Event Staff#pay 4_M_ZONDAMAN
+alberta,114,70,6 duplicate(VotingStaffCCE) Cool Event Staff#alb 4_M_ZONDAMAN
+aldebaran,138,102,6 duplicate(VotingStaffCCE) Cool Event Staff#alde 4_M_ZONDAMAN
+lighthalzen,154,60,6 duplicate(VotingStaffCCE) Cool Event Staff#lhz 4_M_ZONDAMAN
yuno,103,225,0 script Scrutiny Association#5 -1,{
OnInit:
@@ -1175,7 +1175,7 @@ OnTimer15000:
/*
// GM only NPC used for modifying values related to the DTS system.
// Disabled in official script.
-sec_in02,17,160,4 script Vote Globalvar Girl#yuno 864,{
+sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{
callfunc "F_GM_NPC";
mes "[Christy's Maid]";
mes "Lady Christy!";
diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt
index 8b867f00d..acdff608d 100644
--- a/npc/kafras/kafras.txt
+++ b/npc/kafras/kafras.txt
@@ -24,7 +24,7 @@
// Aldebaran
//============================================================
-aldeba_in,96,181,4 script Kafra Service 113,{
+aldeba_in,96,181,4 script Kafra Service 4_F_KAFRA5,{
cutin "kafra_05",2;
mes "[Kafra Leilah]";
mes "Hm...?";
@@ -110,7 +110,7 @@ aldeba_in,96,181,4 script Kafra Service 113,{
end;
}
-aldebaran,143,119,4 script Kafra Employee::kaf_aldebaran 113,{
+aldebaran,143,119,4 script Kafra Employee::kaf_aldebaran 4_F_KAFRA5,{
cutin "kafra_05",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -125,7 +125,7 @@ aldebaran,143,119,4 script Kafra Employee::kaf_aldebaran 113,{
// Geffen
//============================================================
-geffen,120,62,0 script Kafra Employee::kaf_geffen 115,{
+geffen,120,62,0 script Kafra Employee::kaf_geffen 4_F_KAFRA3,{
cutin "kafra_03",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -138,7 +138,7 @@ geffen,120,62,0 script Kafra Employee::kaf_geffen 115,{
callfunc "F_KafEnd",0,1,"in the city of Geffen";
}
-geffen,203,123,2 script Kafra Employee::geffen2 114,{
+geffen,203,123,2 script Kafra Employee::geffen2 4_F_KAFRA4,{
cutin "kafra_04",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -155,7 +155,7 @@ geffen,203,123,2 script Kafra Employee::geffen2 114,{
// Morocc
//============================================================
-morocc,156,97,4 script Kafra Employee::kaf_morocc 113,{
+morocc,156,97,4 script Kafra Employee::kaf_morocc 4_F_KAFRA5,{
cutin "kafra_05",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -168,7 +168,7 @@ morocc,156,97,4 script Kafra Employee::kaf_morocc 113,{
callfunc "F_KafEnd",0,1,"in the city of Morroc";
}
-morocc,160,258,4 script Kafra::kaf_morocc2 114,{
+morocc,160,258,4 script Kafra::kaf_morocc2 4_F_KAFRA4,{
cutin "kafra_04",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -185,7 +185,7 @@ morocc,160,258,4 script Kafra::kaf_morocc2 114,{
// Payon
//============================================================
-payon,181,104,4 script Kafra Employee::kaf_payon 113,{
+payon,181,104,4 script Kafra Employee::kaf_payon 4_F_KAFRA5,{
cutin "kafra_05",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -198,7 +198,7 @@ payon,181,104,4 script Kafra Employee::kaf_payon 113,{
callfunc "F_KafEnd",0,1,"in the city of Payon";
}
-payon,175,226,4 script Kafra Employee::kaf_payon2 116,{
+payon,175,226,4 script Kafra Employee::kaf_payon2 4_F_KAFRA2,{
cutin "kafra_02",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -212,7 +212,7 @@ payon,175,226,4 script Kafra Employee::kaf_payon2 116,{
callfunc "F_KafEnd",0,1,"in the city of Payon";
}
-pay_arche,55,123,0 script Kafra Employee::kaf_payon3 115,{
+pay_arche,55,123,0 script Kafra Employee::kaf_payon3 4_F_KAFRA3,{
cutin "kafra_03",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -228,7 +228,7 @@ pay_arche,55,123,0 script Kafra Employee::kaf_payon3 115,{
// Prontera
//============================================================
-prontera,152,326,3 script Kafra Employee::kaf_prontera 112,{
+prontera,152,326,3 script Kafra Employee::kaf_prontera 4_F_KAFRA6,{
cutin "kafra_06",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -243,7 +243,7 @@ prontera,152,326,3 script Kafra Employee::kaf_prontera 112,{
callfunc "F_KafEnd",0,1,"in the city of Prontera";
}
-prontera,151,29,0 script Kafra Employee::kaf_prontera2 115,{
+prontera,151,29,0 script Kafra Employee::kaf_prontera2 4_F_KAFRA3,{
cutin "kafra_03",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -256,7 +256,7 @@ prontera,151,29,0 script Kafra Employee::kaf_prontera2 115,{
callfunc "F_KafEnd",0,1,"in the city of Prontera";
}
-prontera,29,207,6 script Kafra Employee::kaf_prontera3 113,{
+prontera,29,207,6 script Kafra Employee::kaf_prontera3 4_F_KAFRA5,{
cutin "kafra_05",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -269,7 +269,7 @@ prontera,29,207,6 script Kafra Employee::kaf_prontera3 113,{
callfunc "F_KafEnd",0,1,"in the city of Prontera";
}
-prontera,282,200,2 script Kafra Employee::kaf_prontera4 114,{
+prontera,282,200,2 script Kafra Employee::kaf_prontera4 4_F_KAFRA4,{
cutin "kafra_04",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -284,7 +284,7 @@ prontera,282,200,2 script Kafra Employee::kaf_prontera4 114,{
callfunc "F_KafEnd",0,1,"in the city of Prontera";
}
-prontera,146,89,6 script Kafra Employee::kaf_prontera5 117,{
+prontera,146,89,6 script Kafra Employee::kaf_prontera5 4_F_KAFRA1,{
cutin "kafra_01",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -300,7 +300,7 @@ prontera,146,89,6 script Kafra Employee::kaf_prontera5 117,{
// Yuno
//============================================================
-yuno,152,187,4 script Kafra Employee::kaf_yuno 860,{
+yuno,152,187,4 script Kafra Employee::kaf_yuno 4_F_KAFRA8,{
cutin "kafra_08",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -313,7 +313,7 @@ yuno,152,187,4 script Kafra Employee::kaf_yuno 860,{
callfunc "F_KafEnd",0,1,"in the city of Juno";
}
-yuno,327,108,4 script Kafra Employee::kaf_yuno2 860,{
+yuno,327,108,4 script Kafra Employee::kaf_yuno2 4_F_KAFRA8,{
cutin "kafra_08",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -326,7 +326,7 @@ yuno,327,108,4 script Kafra Employee::kaf_yuno2 860,{
callfunc "F_KafEnd",0,1,"in the city of Juno";
}
-yuno,277,221,4 script Kafra Employee::kaf_yuno3 861,{
+yuno,277,221,4 script Kafra Employee::kaf_yuno3 4_F_KAFRA9,{
cutin "kafra_09",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -341,7 +341,7 @@ yuno,277,221,4 script Kafra Employee::kaf_yuno3 861,{
// Alberta
//============================================================
-alberta,28,229,0 script Kafra Employee::kaf_alberta 116,{
+alberta,28,229,0 script Kafra Employee::kaf_alberta 4_F_KAFRA2,{
cutin "kafra_02",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -355,7 +355,7 @@ alberta,28,229,0 script Kafra Employee::kaf_alberta 116,{
callfunc "F_KafEnd",0,1,"in the city of Alberta";
}
-alberta,113,60,6 script Kafra Employee::kaf_alberta2 112,{
+alberta,113,60,6 script Kafra Employee::kaf_alberta2 4_F_KAFRA6,{
cutin "kafra_06",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -372,7 +372,7 @@ alberta,113,60,6 script Kafra Employee::kaf_alberta2 112,{
// Comodo
//============================================================
-comodo,195,150,4 script Kafra Employee::kaf_comodo 721,{
+comodo,195,150,4 script Kafra Employee::kaf_comodo 4_F_KAFRA7,{
cutin "kafra_07",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -386,7 +386,7 @@ comodo,195,150,4 script Kafra Employee::kaf_comodo 721,{
callfunc "F_KafEnd",0,1,"in the town of Comodo";
}
-cmd_fild07,136,134,4 script Kafra Employee::kaf_cmd_fild07 721,{
+cmd_fild07,136,134,4 script Kafra Employee::kaf_cmd_fild07 4_F_KAFRA7,{
cutin "kafra_07",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -421,7 +421,7 @@ cmd_fild07,136,134,4 script Kafra Employee::kaf_cmd_fild07 721,{
// Moscovia
//============================================================
-moscovia,223,191,3 script Kafra Employee::kaf_mosk 114,{
+moscovia,223,191,3 script Kafra Employee::kaf_mosk 4_F_KAFRA4,{
cutin "kafra_04",2;
callfunc "F_Kafra",0,3,0,80,700;
savepoint "moscovia",221,194;;
@@ -430,7 +430,7 @@ moscovia,223,191,3 script Kafra Employee::kaf_mosk 114,{
// Amatsu
//============================================================
-amatsu,102,149,4 script Kafra Employee::kaf_amatsu 116,{
+amatsu,102,149,4 script Kafra Employee::kaf_amatsu 4_F_KAFRA2,{
cutin "kafra_02",2;
mes "[Kafra Employee]";
mes "Welcome to the";
@@ -445,7 +445,7 @@ amatsu,102,149,4 script Kafra Employee::kaf_amatsu 116,{
// Ayothaya
//============================================================
-ayothaya,212,169,5 script Kafra Employee::kaf_ayothaya 116,{
+ayothaya,212,169,5 script Kafra Employee::kaf_ayothaya 4_F_KAFRA2,{
cutin "kafra_02",2;
mes "[Kafra Employee]";
mes "Welcome to the";
@@ -460,7 +460,7 @@ ayothaya,212,169,5 script Kafra Employee::kaf_ayothaya 116,{
// Einbech
//============================================================
-einbech,181,132,5 script Kafra Employee#ein3::kaf_einbech 860,{
+einbech,181,132,5 script Kafra Employee#ein3::kaf_einbech 4_F_KAFRA8,{
cutin "kafra_08",2;
mes "[Kafra Employee]";
mes "Welcome~!";
@@ -474,7 +474,7 @@ einbech,181,132,5 script Kafra Employee#ein3::kaf_einbech 860,{
// Einbroch
//============================================================
-einbroch,242,205,5 script Kafra Employee#ein2::kaf_einbroch 860,{
+einbroch,242,205,5 script Kafra Employee#ein2::kaf_einbroch 4_F_KAFRA8,{
cutin "kafra_08",2;
mes "[Kafra Employee]";
mes "Welcome to the";
@@ -487,7 +487,7 @@ einbroch,242,205,5 script Kafra Employee#ein2::kaf_einbroch 860,{
callfunc "F_KafEnd",0,1,"in the city of Einbroch";
}
-einbroch,59,203,6 script Kafra Employee#ein1::kaf_einbroch2 861,{
+einbroch,59,203,6 script Kafra Employee#ein1::kaf_einbroch2 4_F_KAFRA9,{
cutin "kafra_09",2;
mes "[Kafra Employee]";
mes "Welcome to the";
@@ -502,7 +502,7 @@ einbroch,59,203,6 script Kafra Employee#ein1::kaf_einbroch2 861,{
// Gonryun
//============================================================
-gonryun,159,122,4 script Kafra Employee::kaf_gonryun 116,{
+gonryun,159,122,4 script Kafra Employee::kaf_gonryun 4_F_KAFRA2,{
cutin "kafra_02",2;
mes "[Kafra Employee]";
mes "Welcome to the";
@@ -517,7 +517,7 @@ gonryun,159,122,4 script Kafra Employee::kaf_gonryun 116,{
// Lighthalzen
//============================================================
-lighthalzen,164,100,4 script Kafra Employee::kaf_lighthalzen 860,{
+lighthalzen,164,100,4 script Kafra Employee::kaf_lighthalzen 4_F_KAFRA8,{
cutin "kafra_08",2;
mes "[Kafra Employee]";
mes "Welcome to the";
@@ -530,7 +530,7 @@ lighthalzen,164,100,4 script Kafra Employee::kaf_lighthalzen 860,{
callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
}
-lighthalzen,191,320,4 script Kafra Employee::kaf_lighthalzen2 861,{
+lighthalzen,191,320,4 script Kafra Employee::kaf_lighthalzen2 4_F_KAFRA9,{
cutin "kafra_09",2;
mes "[Kafra Employee]";
mes "Welcome~!";
@@ -542,7 +542,7 @@ lighthalzen,191,320,4 script Kafra Employee::kaf_lighthalzen2 861,{
callfunc "F_KafEnd",0,1,"in the city of Lighthalzen";
}
-lhz_in02,237,284,4 script Kafra Employee::kaf_lhz_in02 861,{
+lhz_in02,237,284,4 script Kafra Employee::kaf_lhz_in02 4_F_KAFRA9,{
cutin "kafra_09",2;
mes "[Kafra Employee]";
mes "Welcome~!";
@@ -556,7 +556,7 @@ lhz_in02,237,284,4 script Kafra Employee::kaf_lhz_in02 861,{
// Louyang
//============================================================
-louyang,210,104,5 script Kafra Employee::kaf_louyang 117,{
+louyang,210,104,5 script Kafra Employee::kaf_louyang 4_F_KAFRA1,{
cutin "kafra_01",2;
mes "[Kafra Employee]";
mes "Welcome to the";
@@ -571,7 +571,7 @@ louyang,210,104,5 script Kafra Employee::kaf_louyang 117,{
// Umbala
//============================================================
-umbala,87,160,4 script Kafra Employee::kaf_umbala 721,{
+umbala,87,160,4 script Kafra Employee::kaf_umbala 4_F_KAFRA7,{
cutin "kafra_07",2;
callfunc "F_KafSet";
mes "[Kafra Employee]";
@@ -587,7 +587,7 @@ umbala,87,160,4 script Kafra Employee::kaf_umbala 721,{
// Niflheim
//============================================================
-niflheim,202,180,3 script Kafra Employee::kaf_niflheim 791,{
+niflheim,202,180,3 script Kafra Employee::kaf_niflheim 4_F_NFDEADKAFRA,{
callfunc "F_Kafra",1,2,1,150,0;
savepoint "niflheim",192,182;
callfunc "F_KafEnd",1,1,"in the city of Niflheim";
@@ -596,7 +596,7 @@ niflheim,202,180,3 script Kafra Employee::kaf_niflheim 791,{
// Dungeons and Fields
//============================================================
// - Byalan Island
-izlu2dun,106,58,8 script Kafra Employee::kaf_izlu2dun 115,{
+izlu2dun,106,58,8 script Kafra Employee::kaf_izlu2dun 4_F_KAFRA3,{
cutin "kafra_03",2;
if (!checkre(0) && BaseJob == Job_Novice && job_merchant_q2 > 0) {
// Merchant Job Change Quest
@@ -615,7 +615,7 @@ izlu2dun,106,58,8 script Kafra Employee::kaf_izlu2dun 115,{
}
// - Culvert Sewers
-prt_fild05,290,224,3 script Kafra Employee::prt_fild05 114,{
+prt_fild05,290,224,3 script Kafra Employee::prt_fild05 4_F_KAFRA4,{
cutin "kafra_04",2;
mes "[Kafra Employee]";
mes "Welcome!";
@@ -630,7 +630,7 @@ prt_fild05,290,224,3 script Kafra Employee::prt_fild05 114,{
}
// - Coal Mine (Dead Pitt)
-mjolnir_02,83,362,4 script Kafra Employee::kaf_mjolnir_02 116,{
+mjolnir_02,83,362,4 script Kafra Employee::kaf_mjolnir_02 4_F_KAFRA2,{
cutin "kafra_02",2;
mes "[Kafra Employee]";
mes "Welcome to the";
@@ -644,7 +644,7 @@ mjolnir_02,83,362,4 script Kafra Employee::kaf_mjolnir_02 116,{
}
// - Morroc Ruins
-moc_ruins,59,157,5 script Kafra Employee::moc_ruins 114,{
+moc_ruins,59,157,5 script Kafra Employee::moc_ruins 4_F_KAFRA4,{
cutin "kafra_04",2;
mes "[Kafra Employee]";
mes "Welcome!";
@@ -659,7 +659,7 @@ moc_ruins,59,157,5 script Kafra Employee::moc_ruins 114,{
}
// - Orc Dungeon
-gef_fild10,73,340,5 script Kafra Employee::kaf_gef_fild10 116,{
+gef_fild10,73,340,5 script Kafra Employee::kaf_gef_fild10 4_F_KAFRA2,{
cutin "kafra_02",2;
mes "[Kafra Employee]";
mes "Welcome to the";
@@ -673,7 +673,7 @@ gef_fild10,73,340,5 script Kafra Employee::kaf_gef_fild10 116,{
}
// - Treasure Island
-alb2trea,59,69,5 script Kafra Employee::kaf_alb2trea 117,{
+alb2trea,59,69,5 script Kafra Employee::kaf_alb2trea 4_F_KAFRA1,{
cutin "kafra_01",2;
mes "[Kafra Employee]";
mes "Welcome to the";
diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt
index 0ab0e29e8..57528e2b4 100644
--- a/npc/merchants/advanced_refiner.txt
+++ b/npc/merchants/advanced_refiner.txt
@@ -25,7 +25,7 @@
//= 1.5 Some official script updates. [Euphy]
//============================================================
-payon,157,146,6 script Suhnbi#cash 85,{
+payon,157,146,6 script Suhnbi#cash 4_M_03,{
disable_items;
mes "[Suhnbi]";
mes "I am the Armsmith";
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index e3da99291..af0cbc7d9 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -18,7 +18,7 @@
//= 1.8 Moved Craft Book Merchant to Renewal path. [Euphy]
//============================================================
-alde_alche,24,188,3 script Guild Dealer 740,{
+alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
mes "- Currently you are carrying -";
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index 5cb63a57b..6501a7c6c 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -16,7 +16,7 @@
//= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy]
//============================================================
-alberta,118,157,3 script Magazine Dealer Kenny::mdk 83,{
+alberta,118,157,3 script Magazine Dealer Kenny::mdk 4_M_01,{
if (BaseJob == Job_Gunslinger) {
mes "[Kenny]";
mes "Welcome to my Magazine Shop.";
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 7a13a5fc5..382916b10 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -17,7 +17,7 @@
//= 1.6 Moved Izlude duplicate to pre-re/re paths. [Euphy]
//============================================================
-alberta,118,160,3 script Bullet Dealer Tony#alb::bdt 86,{
+alberta,118,160,3 script Bullet Dealer Tony#alb::bdt 4_M_04,{
if (BaseJob == Job_Gunslinger) {
mes "[Tony]";
mes "I'm Tony, the Bullet Dealer.";
diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt
index 02ce3c826..f77a45197 100644
--- a/npc/merchants/buying_shops.txt
+++ b/npc/merchants/buying_shops.txt
@@ -14,7 +14,7 @@
// Black Marketeer (Buy Licenses - Non-Merchant Classes)
//============================================================
-que_job01,68,84,1 script Black Marketeer#Buying 881,{
+que_job01,68,84,1 script Black Marketeer#Buying 4_M_SITDOWN,{
if (getskilllv("ALL_BUYING_STORE") == 1) {
mes "[Mr. Jass]";
mes "Hey, you already made a contract with Hugh.";
@@ -92,7 +92,7 @@ que_job01,68,84,1 script Black Marketeer#Buying 881,{
// Purchasing Team (Learn Skill - Merchant Classes)
//============================================================
-alberta_in,58,52,4 script Purchasing Team#Buying 59,{
+alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{
mes "[Mr. Hugh]";
if (BaseClass == Job_Merchant && getskilllv("MC_VENDING") >= 1) {
if (getskilllv("ALL_BUYING_STORE") == 1) {
diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt
index 65c181f60..db0b91a66 100644
--- a/npc/merchants/cash_hair.txt
+++ b/npc/merchants/cash_hair.txt
@@ -10,7 +10,7 @@
//= 1.0 First Version. [Kisuka]
//============================================================
-itemmall,19,74,5 script Stylist#cash 91,{
+itemmall,19,74,5 script Stylist#cash 4_F_02,{
mes "[Stylist]";
mes "Hey, I'm Kaniki.";
mes "I'm here to start a new";
diff --git a/npc/merchants/cash_trader.txt b/npc/merchants/cash_trader.txt
index 479ccd7cf..28db3e69a 100644
--- a/npc/merchants/cash_trader.txt
+++ b/npc/merchants/cash_trader.txt
@@ -22,4 +22,4 @@
// Blessing and Increase Agility Scroll boxes, Dungeon
// Teleport Scroll Box, Stat Food boxes, and Gym Passes.
-payon,171,142,4 cashshop Kafra Shop Employee 116,12900:1000,12901:200,12902:1000,12909:100,12910:100,12911:1500,12922:150,7619:100,7620:100,12916:150,12917:150,12915:100,12918:100,12913:125,12914:125,13553:50,12903:100,12904:100,12905:100,12906:100,12907:100,12908:100,7776:50
+payon,171,142,4 cashshop Kafra Shop Employee 4_F_KAFRA2,12900:1000,12901:200,12902:1000,12909:100,12910:100,12911:1500,12922:150,7619:100,7620:100,12916:150,12917:150,12915:100,12918:100,12913:125,12914:125,13553:50,12903:100,12904:100,12905:100,12906:100,12907:100,12908:100,7776:50
diff --git a/npc/merchants/cashheadgear_dye.txt b/npc/merchants/cashheadgear_dye.txt
index c2c91c1a6..f2d739aba 100644
--- a/npc/merchants/cashheadgear_dye.txt
+++ b/npc/merchants/cashheadgear_dye.txt
@@ -12,7 +12,7 @@
//= 1.0 First / Optimized Version
//============================================================
-prt_in,253,168,4 script Alora 862,{
+prt_in,253,168,4 script Alora 4_F_LGTGIRL,{
// Mysterious Dyestuff
set .@dyeID, 6220;
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index 1395538ae..39a12cbc1 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -19,7 +19,7 @@
//= 2.5 Optimized. [Euphy]
//============================================================
-prt_in,284,168,2 script Dyer Ginedin Rephere 55,{
+prt_in,284,168,2 script Dyer Ginedin Rephere 1_M_JOBTESTER,{
function Dyes;
set .@EnableDyes,1; // Disable (set to 0) if palettes cause errors [see note v2.4]
diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt
index 1aa28e519..024cdf33e 100644
--- a/npc/merchants/coin_exchange.txt
+++ b/npc/merchants/coin_exchange.txt
@@ -83,5 +83,5 @@
close;
}
}
-man_in01,286,16,1 duplicate(merchant_13_2) Merchant of Manuk 454
-spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 439 \ No newline at end of file
+man_in01,286,16,1 duplicate(merchant_13_2) Merchant of Manuk 4_MAN_PIOM
+spl_in01,110,326,5 duplicate(merchant_13_2) Merchant of Splendide 4_F_FAIRYKID4 \ No newline at end of file
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index 336c0798f..f25954cb3 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -17,7 +17,7 @@
//= 1.4 Added a checkweight. [L0ne_W0lf]
//============================================================
-morocc_in,146,99,3 script Java Dullihan 58,{
+morocc_in,146,99,3 script Java Dullihan 1_M_MERCHANT,{
if ((MaxWeight-Weight) < 200 || checkweight(1201,1) == 0) {
mes "- Wait a moment! -";
mes "- Currently you're carrying -";
diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt
index dde742514..518f782a9 100644
--- a/npc/merchants/elemental_trader.txt
+++ b/npc/merchants/elemental_trader.txt
@@ -12,7 +12,7 @@
//= 1.1 Optimized. [Euphy]
//============================================================
-ama_in02,61,27,7 script Alchemist#ama 749,{
+ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{
mes "[Laspuchin Gregory]";
mes "KeekeekeeKeheheh.";
mes "This is amazing!";
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index 0375aa15d..a236722fe 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -15,7 +15,7 @@
//= 1.3a Added 'disable_items' command. [Euphy]
//============================================================
-prontera,165,60,2 script Apprentice Craftsman 73,{
+prontera,165,60,2 script Apprentice Craftsman 1_F_MERCHANT_01,{
disable_items;
mes "[Apprentice Craftsman]";
if (Zeny >= 400000) {
diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt
index 40c86a5ff..1d8837f28 100644
--- a/npc/merchants/gemstone.txt
+++ b/npc/merchants/gemstone.txt
@@ -17,7 +17,7 @@
//= 1.3 Fixed checks. [Euphy]
//============================================================
-payon,173,238,5 script Jade#pay 754,{
+payon,173,238,5 script Jade#pay 4_M_SAGE_A,{
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index 8b09afa6c..fc1113603 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -15,7 +15,7 @@
//= 1.5 Added Lighthalzen Hair Dying NPC. [L0ne_W0lf]
//============================================================
-prt_in,243,168,4 script Jovovich 91,{
+prt_in,243,168,4 script Jovovich 4_F_02,{
mes "[Hairdresser Jovovich]";
mes "Welcome~!";
mes "How may I help you?";
@@ -154,7 +154,7 @@ S_NoDye:
}
// Lighthalzen
-lhz_in02,100,134,3 script Hair Dyer#lich 850,{
+lhz_in02,100,134,3 script Hair Dyer#lich 4_F_EINWOMAN,{
mes "[Rossa]";
if (Sex == 1) {
mes "Welcome, come in~";
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 040802811..47f273930 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -15,7 +15,7 @@
// Hair Dresser Veronica
// ============================================================
-alberta_in,55,142,7 script Hair Dresser 91,{
+alberta_in,55,142,7 script Hair Dresser 4_F_02,{
mes "[Veronica]";
mes "Welcome to Veronica's hair salon.";
mes "How can I help you?";
@@ -522,7 +522,7 @@ L_cutin:
// Roving Hair Dresser
// ============================================================
-alberta,33,141,7 script Roving Hair Dresser 87,{
+alberta,33,141,7 script Roving Hair Dresser 4_M_BARBER,{
mes "[Rui Vishop]";
mes "That Veronica...";
mes "Hah! Best hair dresser my ass.";
@@ -683,7 +683,7 @@ alberta,33,141,7 script Roving Hair Dresser 87,{
// Lighthalzen
-lhz_in02,100,143,3 script Hair Dresser#li 122,{
+lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{
mes "[Prince Shammi]";
mes "Welcome to Prince Shammi's";
mes "Beauty Shop, the place to go";
@@ -1096,7 +1096,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{
}
}
-lhz_in02,91,155,5 script Assistant Beautician#li 862,{
+lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{
mes "[Assistant Beautician]";
mes "Wah?! Sweet Jiminy,";
mes "you freaked me out!";
diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt
index 5371a86a8..84e3adf32 100644
--- a/npc/merchants/hd_refine.txt
+++ b/npc/merchants/hd_refine.txt
@@ -145,17 +145,17 @@
mes "I am sure a person like you would never blame me for a decrease in refine level by 1. Hmm.";
close;
}
-prt_in,59,54,3 duplicate(MightyHammer) Mighty Hammer#prt 826
-morocc_in,65,30,3 duplicate(MightyHammer) Mighty Hammer#morocc 826
-payon,148,176,3 duplicate(MightyHammer) Mighty Hammer#pay 826
-alberta_in,16,56,3 duplicate(MightyHammer) Mighty Hammer#alb 826
-yuno_in01,171,18,3 duplicate(MightyHammer) Mighty Hammer#yuno 826
-ein_in01,22,82,3 duplicate(MightyHammer) Mighty Hammer#ein 826
-lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
+prt_in,59,54,3 duplicate(MightyHammer) Mighty Hammer#prt 4_M_DWARF
+morocc_in,65,30,3 duplicate(MightyHammer) Mighty Hammer#morocc 4_M_DWARF
+payon,148,176,3 duplicate(MightyHammer) Mighty Hammer#pay 4_M_DWARF
+alberta_in,16,56,3 duplicate(MightyHammer) Mighty Hammer#alb 4_M_DWARF
+yuno_in01,171,18,3 duplicate(MightyHammer) Mighty Hammer#yuno 4_M_DWARF
+ein_in01,22,82,3 duplicate(MightyHammer) Mighty Hammer#ein 4_M_DWARF
+lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF
// iRO NPC locations:
-// moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 826
-// payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 826
+// moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 4_M_DWARF
+// payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 4_M_DWARF
// Basta (+10 and up)
//============================================================
@@ -307,10 +307,10 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
mes "I'll do better next time! Don't worry!";
close;
}
-prt_in,57,54,3 duplicate(Basta) Basta#prt 826
-morocc_in,68,30,3 duplicate(Basta) Basta#morocc 826
-payon,148,174,3 duplicate(Basta) Basta#payon 826
-alberta_in,18,56,3 duplicate(Basta) Basta#alberta 826
-yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 826
-ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 826
-lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 826
+prt_in,57,54,3 duplicate(Basta) Basta#prt 4_M_DWARF
+morocc_in,68,30,3 duplicate(Basta) Basta#morocc 4_M_DWARF
+payon,148,174,3 duplicate(Basta) Basta#payon 4_M_DWARF
+alberta_in,18,56,3 duplicate(Basta) Basta#alberta 4_M_DWARF
+yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 4_M_DWARF
+ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 4_M_DWARF
+lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 4_M_DWARF
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index f126b723e..29d49c948 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -75,10 +75,10 @@
}
// Alberta
-alberta,120,45,2 duplicate(IceCreamer) Ice Cream Maker#1 85
+alberta,120,45,2 duplicate(IceCreamer) Ice Cream Maker#1 4_M_03
// Morroc Field
-moc_fild16,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 85
+moc_fild16,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 4_M_03
// Morroc
-//morocc,160,144,4 duplicate(IceCreamer) Ice Cream Maker#3 85
+//morocc,160,144,4 duplicate(IceCreamer) Ice Cream Maker#3 4_M_03
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 3c5c1874b..0c23555d2 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -48,34 +48,34 @@
//========================Prontera ===================================
// West Side Inn -------------------
-prt_in,244,135,2 script Inn Employee#Sammy 53,{
+prt_in,244,135,2 script Inn Employee#Sammy 1_M_INNKEEPER,{
callfunc "F_InnMaid","[Employee Sammy]","Nenkaras","prt_in",238,130;
warp "prt_in",247,104; end;
}
// East Side Inn ------------------
-prt_in,61,141,2 script Inn Employee#Ahlma 53,{
+prt_in,61,141,2 script Inn Employee#Ahlma 1_M_INNKEEPER,{
callfunc "F_InnMaid","[Employee Ahlma]","Nenkaras","prt_in",64,136;
warp "prt_in",60,166; end;
}
//========================Alberta ====================================
-alberta_in,32,142,3 script Inn Employee#Jennie 53,{
+alberta_in,32,142,3 script Inn Employee#Jennie 1_M_INNKEEPER,{
callfunc "F_InnMaid","[Employee Jennie]","'Fisherman Inn'!","alberta_in",26,142;
warp "alberta_in",18,188; end;
}
//======================Geffen ======================================
-geffen_in,70,64,5 script Inn Employee#Cena 53,{
+geffen_in,70,64,5 script Inn Employee#Cena 1_M_INNKEEPER,{
callfunc "F_InnMaid","[Employee Cena]","'Ifrit,' the only Inn in the city of Geffen.","geffen_in",70,59;
warp "geffen_in",31,31; end;
}
//=======================Payon ======================================
-payon_in01,132,62,5 script Inn Employee#Ahee 53,{
+payon_in01,132,62,5 script Inn Employee#Ahee 1_M_INNKEEPER,{
callfunc "F_InnMaid","[Employee Ahee]","Payon Inn","payon_in01",136,61;
warp "payon_in01",132,11; end;
@@ -84,13 +84,13 @@ payon_in01,132,62,5 script Inn Employee#Ahee 53,{
//========================Morocc ====================================
// North East --------------------------
/*
-morocc_in,147,141,3 script Inn Employee#Hasna 53,{
+morocc_in,147,141,3 script Inn Employee#Hasna 1_M_INNKEEPER,{
callfunc "F_InnMaid","[Employee Hasna]","Morroc Inn","morocc_in",142,140;
warp "morocc_in",173,135; end;
}
// South --------------------------------
-morocc_in,80,100,5 script Inn Employee#Manar 53,{
+morocc_in,80,100,5 script Inn Employee#Manar 1_M_INNKEEPER,{
callfunc "F_InnMaid","[Employee Manar]","Morroc Inn","morocc_in",78,95;
warp "morocc_in",79,123; end;
@@ -98,21 +98,21 @@ morocc_in,80,100,5 script Inn Employee#Manar 53,{
*/
//======================Aldebaran ===================================
-aldeba_in,92,58,5 script Inn Maid#Rilim 53,{
+aldeba_in,92,58,5 script Inn Maid#Rilim 1_M_INNKEEPER,{
callfunc "F_InnMaid","[Rilim]","Al De Baran Inn","aldeba_in",92,50;
warp "aldeba_in",92,112; end;
}
//========================Rachel ====================================
-ra_in01,376,69,4 script Inn Keeper#Annie 931,{
+ra_in01,376,69,4 script Inn Keeper#Annie 4_M_RACHMAN1,{
callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58;
warp "ra_in01",384,128; end;
}
//======================Lighthalzen =================================
-lhz_in02,230,284,4 script Hotel Employee#01 86,{
+lhz_in02,230,284,4 script Hotel Employee#01 4_M_04,{
mes "[Hotel Employee]";
mes "Welcome to";
mes "the Royal Dragon,";
@@ -157,14 +157,14 @@ lhz_in02,230,284,4 script Hotel Employee#01 86,{
}
//========================Hugel ====================================
-hu_in01,246,107,3 script Inn Maid#Receptionist 53,{
+hu_in01,246,107,3 script Inn Maid#Receptionist 1_M_INNKEEPER,{
callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95;
warp "hu_in01",267,5; end;
}
//========================Veins ====================================
-ve_in,157,219,5 script Inn Master#Receptionist 709,{
+ve_in,157,219,5 script Inn Master#Receptionist 4_M_SEAMAN,{
mes "[Inn Master]";
mes "Good day~";
mes "Welcome to the";
diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index 690353040..b2c624bb0 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -16,7 +16,7 @@
//= 1.3a Kagerou/Oboro support (BaseJob -> BaseClass) [Euphy]
//============================================================
-que_ng,72,29,3 script Kunai Merchant Kashin 83,{
+que_ng,72,29,3 script Kunai Merchant Kashin 4_M_01,{
if(BaseClass == Job_Ninja) {
mes "[Kashin]";
mes "I am Kashin, distributor";
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index 1d65418a0..23d144231 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -17,7 +17,7 @@
//= 1.5 Fixed missed variable. (bugreport:1523) [L0ne_W0lf]
//============================================================
-prontera,73,140,0 script Milk Vendor 86,{
+prontera,73,140,0 script Milk Vendor 4_M_04,{
if (checkweight(1201,1) == 0) {
mes "^3355FFJust a minute!";
mes "I can't offer any of my";
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index d7f519d1f..5474190e6 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -15,7 +15,7 @@
//= 1.4 Added checkweight, and input min/max values. [L0ne_W0lf]
//============================================================
-prontera,123,102,5 script Merchant#pron 85,{
+prontera,123,102,5 script Merchant#pron 4_M_03,{
if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
mes "[Merchant]";
mes "Haha!";
@@ -71,7 +71,7 @@ prontera,123,102,5 script Merchant#pron 85,{
}
}
-morocc,180,259,3 script Merchant#morroc 85,{
+morocc,180,259,3 script Merchant#morroc 4_M_03,{
if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
mes "[Merchant]";
mes "Haha!";
@@ -128,7 +128,7 @@ morocc,180,259,3 script Merchant#morroc 85,{
}
}
-payon,200,134,5 script Merchant#pay 85,{
+payon,200,134,5 script Merchant#pay 4_M_03,{
if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
mes "[Merchant]";
mes "Haha!";
@@ -182,7 +182,7 @@ payon,200,134,5 script Merchant#pay 85,{
}
}
-aldebaran,152,63,5 script Merchant#alde 85,{
+aldebaran,152,63,5 script Merchant#alde 4_M_03,{
if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
mes "[Merchant]";
mes "Haha!";
@@ -239,7 +239,7 @@ aldebaran,152,63,5 script Merchant#alde 85,{
}
}
-geffen,173,88,5 script Merchant#geff 85,{
+geffen,173,88,5 script Merchant#geff 4_M_03,{
if (MaxWeight - Weight < 6301 || checkweight(1201,1) == 0) {
mes "[Merchant]";
mes "Haha!";
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index c62e36479..5384125e1 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -22,7 +22,7 @@
//= 1.4 Updated to match AEGIS script. [Kisuka]
//============================================================
-alberta_in,16,28,4 script Pharmacist 61,{
+alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{
if (checkweight(1201,1) == 0) {
mes "- Wait a moment! -";
mes "- Currently you're carrying -";
diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt
index 53ae6d114..6b544c920 100644
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -22,7 +22,7 @@
//= Removed "Holy Arrows" from the list.
//============================================================
-payon_in01,5,134,5 script Inventor Jaax 89,{
+payon_in01,5,134,5 script Inventor Jaax 4_M_ORIENT02,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
mes "[Inventor Jaax]";
mes "Hey, you're carrying";
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 3efbe592a..d65fd5c2e 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -63,7 +63,7 @@
// Christopher: Geffen Blacksmith
//============================================================
-geffen_in,110,172,0 script Christopher#1 63,{
+geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{
mes "[Christopher Guillenrow]";
mes "Welcome to Christopher's Workshop. Ye can get all yer stuff for forging here. What business";
mes "brings ye to me?";
@@ -329,7 +329,7 @@ geffen_in,110,172,0 script Christopher#1 63,{
// Paul Spanner: Einbroch Blacksmith Supplier
//============================================================
-ein_in01,38,29,0 script Paul Spanner 63,{
+ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -565,31 +565,31 @@ ein_in01,38,29,0 script Paul Spanner 63,{
// Weapon/Armor Refiners
//============================================================
-prt_in,63,60,0 script Hollgrehenn 85,{
+prt_in,63,60,0 script Hollgrehenn 4_M_03,{
callfunc "refinemain","Hollgrehenn",0;
end;
}
-morocc_in,73,38,6 script Aragham 99,{
+morocc_in,73,38,6 script Aragham 4W_M_03,{
callfunc "refinemain","Aragham",0;
end;
}
-payon,144,173,5 script Antonio 88,{
+payon,144,173,5 script Antonio 4_M_ORIENT01,{
callfunc "refinemain","Antonio",0;
end;
}
-alberta_in,28,58,0 script Fredrik 85,{
+alberta_in,28,58,0 script Fredrik 4_M_03,{
callfunc "refinemain","Fredrik",0;
end;
}
-yuno_in01,171,21,4 script Lambert 88,{
+yuno_in01,171,21,4 script Lambert 4_M_ORIENT01,{
callfunc "refinemain","Lambert",0;
end;
}
-ein_in01,24,87,5 script Manthasman 826,{
+ein_in01,24,87,5 script Manthasman 4_M_DWARF,{
callfunc "refinemain","Manthasman Pruhag",0;
end;
}
-lhz_in02,282,20,7 script Fulerr 869,{
+lhz_in02,282,20,7 script Fulerr 4_M_LGTMAN,{
callfunc "refinemain","Fulerr",0;
end;
}
@@ -897,31 +897,31 @@ function script refinemain {
// Material Salesmen
//============================================================
-prt_in,56,68,5 script Vurewell 86,{
+prt_in,56,68,5 script Vurewell 4_M_04,{
callfunc "phramain","Vurewell";
end;
}
-payon,145,178,3 script Begnahd 88,{
+payon,145,178,3 script Begnahd 4_M_ORIENT01,{
callfunc "phramain","Begnahd";
end;
}
-morocc_in,63,32,6 script Sade 99,{
+morocc_in,63,32,6 script Sade 4W_M_03,{
callfunc "phramain","Sade";
end;
}
-alberta_in,13,71,3 script Kahlamanlith 86,{
+alberta_in,13,71,3 script Kahlamanlith 4_M_04,{
callfunc "phramain","Kahlamanlith";
end;
}
-yuno_in01,171,27,4 script Dilemma 88,{
+yuno_in01,171,27,4 script Dilemma 4_M_ORIENT01,{
callfunc "phramain","Dilemma";
end;
}
-ein_in01,15,87,3 script Tirehaus 86,{
+ein_in01,15,87,3 script Tirehaus 4_M_04,{
callfunc "phramain","Tirehaus";
end;
}
-lhz_in02,278,24,3 script Krugg 86,{
+lhz_in02,278,24,3 script Krugg 4_M_04,{
callfunc "phramain","Krugg";
end;
}
@@ -1010,31 +1010,31 @@ function script phramain {
// Ori/Elu Refiners
//============================================================
-prt_in,63,69,3 script Dietrich 84,{
+prt_in,63,69,3 script Dietrich 4_M_02,{
callfunc "orimain","Dietrich";
end;
}
-payon,137,178,5 script Hakhim 88,{
+payon,137,178,5 script Hakhim 4_M_ORIENT01,{
callfunc "orimain","Hakhim";
end;
}
-morocc_in,72,32,6 script Abdula 99,{
+morocc_in,72,32,6 script Abdula 4W_M_03,{
callfunc "orimain","Abdula";
end;
}
-alberta_in,21,63,5 script Xenophon 84,{
+alberta_in,21,63,5 script Xenophon 4_M_02,{
callfunc "orimain","Xenophon Zolotas";
end;
}
-yuno_in01,164,27,4 script Delight 88,{
+yuno_in01,164,27,4 script Delight 4_M_ORIENT01,{
callfunc "orimain","Delight";
end;
}
-ein_in01,18,82,6 script Matestein 84,{
+ein_in01,18,82,6 script Matestein 4_M_02,{
callfunc "orimain","Matestein";
end;
}
-lhz_in02,281,24,5 script Fruel 84,{
+lhz_in02,281,24,5 script Fruel 4_M_02,{
callfunc "orimain","Fruel";
end;
}
@@ -1110,72 +1110,72 @@ function script orimain {
// Equipment Repairmen
//============================================================
-alberta_in,31,65,4 script Repairman#alb 86,{
+alberta_in,31,65,4 script Repairman#alb 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
-moc_ruins,107,94,4 script Repairman#moc 99,{
+moc_ruins,107,94,4 script Repairman#moc 4W_M_03,{
callfunc "repairmain","Repairman";
end;
}
-payon,143,165,4 script Repairman#pay 88,{
+payon,143,165,4 script Repairman#pay 4_M_ORIENT01,{
callfunc "repairmain","Repairman";
end;
}
-prt_in,63,54,2 script Repairman#prt 86,{
+prt_in,63,54,2 script Repairman#prt 4_M_04,{
callfunc "repairmain","Grendal";
end;
}
-yuno_in01,175,28,3 script Repairman#juno 86,{
+yuno_in01,175,28,3 script Repairman#juno 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
-geffen_in,34,166,3 script Repairman#gef 99,{
+geffen_in,34,166,3 script Repairman#gef 4W_M_03,{
callfunc "repairmain","Repairman";
end;
}
-aldeba_in,38,60,3 script Repairman#alde 86,{
+aldeba_in,38,60,3 script Repairman#alde 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
-lhz_in02,284,14,3 script Repairman#lhz 86,{
+lhz_in02,284,14,3 script Repairman#lhz 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
-prt_gld,139,117,4 script Repairman#prt_gld 86,{
+prt_gld,139,117,4 script Repairman#prt_gld 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
-gef_fild13,263,117,4 script Repairman#gef_fild 86,{
+gef_fild13,263,117,4 script Repairman#gef_fild 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
-pay_gld,295,183,4 script Repairman#pay_gld 86,{
+pay_gld,295,183,4 script Repairman#pay_gld 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
-alde_gld,220,152,4 script Repairman#alde_gld 86,{
+alde_gld,220,152,4 script Repairman#alde_gld 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
-aru_gld,189,336,4 script Repairman#aru_gld 86,{
+aru_gld,189,336,4 script Repairman#aru_gld 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
-sch_gld,340,80,7 script Repairman#sch_gld 86,{
+sch_gld,340,80,7 script Repairman#sch_gld 4_M_04,{
callfunc "repairmain","Repairman";
end;
}
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index ee9f70952..dc4d67235 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -25,7 +25,7 @@
//============================================================
// PecoPeco Breeder (for Knights)-------------------------------------------
-prontera,55,350,5 script Peco Peco Breeder#knt 105,{
+prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{
if(Upper==0) set .@price,2500; //Normal Peco - default price
if(Upper==1) set .@price,2500; //Armored Peco
if(Upper==2) set .@price,2500; //Baby Peco
@@ -88,7 +88,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 105,{
}
// Grand PecoPeco Breeder (for Crusaders)-------------------------------------------
-prontera,232,318,3 script Peco Peco Breeder#cru 105,{
+prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{
if(Upper==0) set .@price,3500; //Normal Peco - default price
if(Upper==1) set .@price,3500; //Armored Peco
if(Upper==2) set .@price,3500; //Baby Peco
@@ -150,7 +150,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 105,{
}
// Falcon Master--------------------------------------------------------------
-hu_in01,381,304,5 script Falcon Breeder#hnt 105,{
+hu_in01,381,304,5 script Falcon Breeder#hnt 8W_SOLDIER,{
if(Upper==0) set .@price,2500; //Normal Falcon - default price
if(Upper==1) set .@price,2500; //Scarf Falcon
if(Upper==2) set .@price,2500; //Baby Falcon
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 2e339a59a..b20874ffb 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -41,286 +41,286 @@
//=======================================================
// Alberta
//=======================================================
-alb2trea,87,65,5 shop Tool Dealer#alb 83,1750:-1,1751:-1,1752:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1
-alberta_in,165,96,0 shop Item Collector#alb 74,911:-1,528:-1
-alberta_in,182,97,0 shop Tool Dealer#alb2 73,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2243:-1
-alberta_in,180,15,0 shop Armor Dealer#alb 101,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2203:-1,2201:-1,2205:-1,2226:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1
-alberta_in,188,21,0 shop Weapon Dealer#alb 49,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1
-alberta_in,175,97,4 shop Weapon Dealer#alb2 82,1146:-1,1245:-1
-alberta_in,176,81,3 shop Trading Merchant#alb 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
+alb2trea,87,65,5 shop Tool Dealer#alb 4_M_01,1750:-1,1751:-1,1752:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1
+alberta_in,165,96,0 shop Item Collector#alb 1_F_MERCHANT_02,911:-1,528:-1
+alberta_in,182,97,0 shop Tool Dealer#alb2 1_F_MERCHANT_01,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2243:-1
+alberta_in,180,15,0 shop Armor Dealer#alb 4W_F_01,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2203:-1,2201:-1,2205:-1,2226:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1
+alberta_in,188,21,0 shop Weapon Dealer#alb 1_M_03,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1
+alberta_in,175,97,4 shop Weapon Dealer#alb2 4_KID01,1146:-1,1245:-1
+alberta_in,176,81,3 shop Trading Merchant#alb 4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
//=======================================================
// Al De Baran
//=======================================================
-aldeba_in,20,60,0 shop Armor Dealer#alde 101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1,2628:-1,2627:-1
-aldeba_in,28,54,0 shop Weapon Dealer#alde 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1
-aldeba_in,22,47,4 shop Weapon Dealer#alde2 713,1146:-1,1245:-1
-aldeba_in,94,56,5 shop Tool Dealer#alde 83,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1
-alde_alche,38,184,3 shop Material Seller#alche 755,7143:-1,7141:-1,7140:-1,6248:-1,6250:-1,6251:-1,6255:-1,6261:-1,6262:-1,6297:-1
+aldeba_in,20,60,0 shop Armor Dealer#alde 4W_F_01,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1,2628:-1,2627:-1
+aldeba_in,28,54,0 shop Weapon Dealer#alde 1_M_03,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1
+aldeba_in,22,47,4 shop Weapon Dealer#alde2 4_M_06,1146:-1,1245:-1
+aldeba_in,94,56,5 shop Tool Dealer#alde 4_M_01,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1
+alde_alche,38,184,3 shop Material Seller#alche 4_M_SAGE_C,7143:-1,7141:-1,7140:-1,6248:-1,6250:-1,6251:-1,6255:-1,6261:-1,6262:-1,6297:-1
//=======================================================
// Amatsu
//=======================================================
-ama_in01,89,28,5 shop Armor Dealer#ama 757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
-ama_in01,102,28,3 shop Weapon Dealer#ama 766,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-ama_in01,24,30,5 shop Tool Dealer#ama 763,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+ama_in01,89,28,5 shop Armor Dealer#ama 4_F_JPN2,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+ama_in01,102,28,3 shop Weapon Dealer#ama 4_M_JPNOJI,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+ama_in01,24,30,5 shop Tool Dealer#ama 4_M_JPN,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
// Ninja Shops
-que_ng,72,31,2 shop Boonji#nin 83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1
-que_ng,73,26,5 shop Boonray#nin 83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1
+que_ng,72,31,2 shop Boonji#nin 4_M_01,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1
+que_ng,73,26,5 shop Boonray#nin 4_M_01,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1
//=======================================================
// Ayothaya
//=======================================================
-ayo_in01,18,182,1 shop Tool Dealer#ayo 840,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-ayo_in01,90,192,3 shop Weapon Dealer#ayo 843,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-ayo_in01,90,160,1 shop Armor Dealer#ayo 842,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+ayo_in01,18,182,1 shop Tool Dealer#ayo 4_F_THAISHAMAN,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+ayo_in01,90,192,3 shop Weapon Dealer#ayo 4_M_THAIONGBAK,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+ayo_in01,90,160,1 shop Armor Dealer#ayo 4_M_THAIOLD,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
//=======================================================
// Brasilis
//=======================================================
-brasilis,252,257,3 shop Tool Dealer#bra 478,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
-brasilis,244,243,3 shop Weapon Dealer#bra 477,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
-brasilis,201,309,3 shop Pet Groomer#bra 476,537:-1,643:-1
-brasilis,221,128,3 shop Fruit Gardener#bra 477,11515:-1,513:-1,11516:-1
+brasilis,252,257,3 shop Tool Dealer#bra 4_F_BRZ_WOMAN,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
+brasilis,244,243,3 shop Weapon Dealer#bra 4_M_BRZ_MAN2,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
+brasilis,201,309,3 shop Pet Groomer#bra 4_M_BRZ_MAN1,537:-1,643:-1
+brasilis,221,128,3 shop Fruit Gardener#bra 4_M_BRZ_MAN2,11515:-1,513:-1,11516:-1
//=======================================================
// Comodo
//=======================================================
-cmd_in01,117,165,4 shop Armor Dealer#cmd 101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1
-cmd_in01,128,165,2 shop Weapon Dealer#cmd 49,1901:-1,1903:-1,1905:-1,1909:-1,1911:-1,1907:-1,1950:-1,1952:-1,1954:-1,1958:-1,1960:-1,1956:-1
-cmd_in01,79,182,5 shop Tool Dealer#cmd 83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,657:-1,601:-1,602:-1,611:-1,1065:-1
-comodo,296,125,4 shop Souvenir Vendor#cmd 101,965:-1,964:-1
-cmd_fild07,257,126,5 shop Tool Dealer#cmd2 83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1
-cmd_fild07,250,98,2 shop Weapon Dealer#cmd2 49,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
-cmd_fild07,277,85,4 shop Armor Dealer#cmd2 101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1
+cmd_in01,117,165,4 shop Armor Dealer#cmd 4W_F_01,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1
+cmd_in01,128,165,2 shop Weapon Dealer#cmd 1_M_03,1901:-1,1903:-1,1905:-1,1909:-1,1911:-1,1907:-1,1950:-1,1952:-1,1954:-1,1958:-1,1960:-1,1956:-1
+cmd_in01,79,182,5 shop Tool Dealer#cmd 4_M_01,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,657:-1,601:-1,602:-1,611:-1,1065:-1
+comodo,296,125,4 shop Souvenir Vendor#cmd 4W_F_01,965:-1,964:-1
+cmd_fild07,257,126,5 shop Tool Dealer#cmd2 4_M_01,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1
+cmd_fild07,250,98,2 shop Weapon Dealer#cmd2 1_M_03,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
+cmd_fild07,277,85,4 shop Armor Dealer#cmd2 4W_F_01,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1
//=======================================================
// Einbroch
//=======================================================
-ein_in01,106,27,4 shop One Hand Weapon Dealer 850,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1119:-1,1122:-1,1123:-1,1126:-1,1129:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1301:-1,1401:-1,1404:-1,1407:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1516:-1,1519:-1,1522:-1,1801:-1,1803:-1,1805:-1,1807:-1,1809:-1,1811:-1
-ein_in01,109,27,4 shop Two Hand Weapon Dealer 850,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1351:-1,1354:-1,1357:-1,1360:-1,1410:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1250:-1,1252:-1,1254:-1
-ein_in01,119,26,4 shop Weapon Dealer#ein 855,1247:-1,1248:-1,1249:-1,13000:-1
-ein_in01,189,15,1 shop Tool Dealer#ein 850,1750:-1,1752:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-einbroch,138,66,4 shop Flu Mask Dealer#ein 850,5114:-1,2218:-1
-einbroch,82,199,4 shop Paddler#ein 855,512:-1,645:-1,1750:-1,501:-1
+ein_in01,106,27,4 shop One Hand Weapon Dealer 4_F_EINWOMAN,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1119:-1,1122:-1,1123:-1,1126:-1,1129:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1301:-1,1401:-1,1404:-1,1407:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1516:-1,1519:-1,1522:-1,1801:-1,1803:-1,1805:-1,1807:-1,1809:-1,1811:-1
+ein_in01,109,27,4 shop Two Hand Weapon Dealer 4_F_EINWOMAN,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1351:-1,1354:-1,1357:-1,1360:-1,1410:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1250:-1,1252:-1,1254:-1
+ein_in01,119,26,4 shop Weapon Dealer#ein 4_M_EINMAN,1247:-1,1248:-1,1249:-1,13000:-1
+ein_in01,189,15,1 shop Tool Dealer#ein 4_F_EINWOMAN,1750:-1,1752:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+einbroch,138,66,4 shop Flu Mask Dealer#ein 4_F_EINWOMAN,5114:-1,2218:-1
+einbroch,82,199,4 shop Paddler#ein 4_M_EINMAN,512:-1,645:-1,1750:-1,501:-1
//Official Gunslingers shops.
-que_ng,179,91,3 shop Chivas Lugal 900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
-que_ng,180,79,3 shop Johnny Waiker 900,13200:-1,13201:-1,13202:-1
+que_ng,179,91,3 shop Chivas Lugal 4_M_HUMERCHANT,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
+que_ng,180,79,3 shop Johnny Waiker 4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1
//=======================================================
// Geffen
//=======================================================
-geffen_in,26,178,4 shop Armor Dealer#gef 66,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1
-geffen_in,30,178,4 shop Weapon Dealer#gef2 47,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1
-geffen_in,22,171,7 shop Weapon Dealer#gef 84,1146:-1,1245:-1
-geffen_in,74,144,0 shop Trader#gef 66,911:-1,910:-1,912:-1
-geffen_in,77,167,0 shop Tool Dealer#gef 68,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2241:-1
-geffen_in,77,173,0 shop Magical Item Seller#gef 64,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
-geffen_in,171,123,4 shop Tool Dealer#gef2 64,1092:-1,1093:-1
-geffen,193,152,4 shop Pet Groomer#gef 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+geffen_in,26,178,4 shop Armor Dealer#gef 1_F_01,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1
+geffen_in,30,178,4 shop Weapon Dealer#gef2 1_M_01,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1
+geffen_in,22,171,7 shop Weapon Dealer#gef 4_M_02,1146:-1,1245:-1
+geffen_in,74,144,0 shop Trader#gef 1_F_01,911:-1,910:-1,912:-1
+geffen_in,77,167,0 shop Tool Dealer#gef 1_F_03,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,2241:-1
+geffen_in,77,173,0 shop Magical Item Seller#gef 1_M_WIZARD,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
+geffen_in,171,123,4 shop Tool Dealer#gef2 1_M_WIZARD,1092:-1,1093:-1
+geffen,193,152,4 shop Pet Groomer#gef 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
//=======================================================
// Gonryun
//=======================================================
-gonryun,147,84,5 shop Tool Dealer#gon 777,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-gonryun,174,101,3 shop Weapon Dealer#gon 774,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-gonryun,173,84,3 shop Armor Dealer#gon 770,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+gonryun,147,84,5 shop Tool Dealer#gon 4_M_TWOLDMAN,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+gonryun,174,101,3 shop Weapon Dealer#gon 4_M_TWBOY,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+gonryun,173,84,3 shop Armor Dealer#gon 4_F_TWGIRL,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
//=======================================================
// Hugel
//=======================================================
-hugel,105,169,5 shop Vendor from Milk Ranch#h 90,519:-1
-hugel,77,167,3 shop Vegetable Gardener#hu 892,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1
-hu_in01,241,368,2 shop Tool Dealer#hu 53,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-hu_in01,252,368,3 shop Tool Dealer#hu2 90,717:-1,2201:-1,910:-1,528:-1
-hu_in01,100,390,3 shop Bow Dealer#hu 86,1701:-1,1707:-1,1718:-1,1714:-1
-hu_in01,94,390,3 shop Weapon Dealer#hu 898,1116:-1,1154:-1,1354:-1,1201:-1
-hu_in01,94,313,3 shop Armor Dealer#hu 86,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1,2401:-1,2501:-1,2307:-1,2105:-1
+hugel,105,169,5 shop Vendor from Milk Ranch#h 4_F_01,519:-1
+hugel,77,167,3 shop Vegetable Gardener#hu 4_F_HUGRANMA,522:-1,512:-1,513:-1,515:-1,516:-1,535:-1
+hu_in01,241,368,2 shop Tool Dealer#hu 1_M_INNKEEPER,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+hu_in01,252,368,3 shop Tool Dealer#hu2 4_F_01,717:-1,2201:-1,910:-1,528:-1
+hu_in01,100,390,3 shop Bow Dealer#hu 4_M_04,1701:-1,1707:-1,1718:-1,1714:-1
+hu_in01,94,390,3 shop Weapon Dealer#hu 4_M_HUMAN_01,1116:-1,1154:-1,1354:-1,1201:-1
+hu_in01,94,313,3 shop Armor Dealer#hu 4_M_04,2224:-1,2232:-1,2226:-1,2101:-1,2103:-1,2401:-1,2501:-1,2307:-1,2105:-1
//=======================================================
// Izlude
//=======================================================
-izlude_in,60,127,4 shop Weapon Dealer#iz 72,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1
-izlude_in,70,127,4 shop Armor Dealer#iz 62,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1
+izlude_in,60,127,4 shop Weapon Dealer#iz 1_F_MARIA,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1101:-1,1104:-1,1107:-1,1116:-1,1151:-1,1154:-1,1157:-1,1160:-1,1301:-1
+izlude_in,70,127,4 shop Armor Dealer#iz 1_M_SIZ,2103:-1,2105:-1,2403:-1,2405:-1,2503:-1,2505:-1,2226:-1,2228:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2628:-1
//=======================================================
// Jawaii
//=======================================================
-jawaii,186,174,3 shop Ice Cream Guy#ja 85,536:-1,536:-1,536:-1,536:-1,536:-1,536:-1,536:-1
+jawaii,186,174,3 shop Ice Cream Guy#ja 4_M_03,536:-1,536:-1,536:-1,536:-1,536:-1,536:-1,536:-1
//=======================================================
// Juno
//=======================================================
-yuno,218,97,5 shop Tool Dealer#yuno 84,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1
-yuno,226,107,5 shop Tool Dealer#yuno1 83,911:-1,910:-1,912:-1
-yuno,197,114,4 shop Pet Groomer#yuno 124,537:-1,643:-1,10013:-1,10014:-1,6115:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1
-yuno,205,103,4 shop Mr. King's Shop#yuno 125,2340:-1,2341:-1,2411:-1,2222:-1,2230:-1,1721:-1
-yuno,163,187,5 shop Magical Item Seller#yuno 90,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
-yuno_in01,25,34,5 shop Tool Dealer#yuno2 83,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1
-yuno_in01,103,35,2 shop Weapon Dealer#yuno 49,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1
-yuno_in01,112,26,4 shop Armor Dealer#yuno 101,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1
-yuno_in03,176,22,3 shop Scroll Merchant#yuno03 89,7433:-1 //Temp shop in Yuno that sells Blank Scrolls
+yuno,218,97,5 shop Tool Dealer#yuno 4_M_02,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1
+yuno,226,107,5 shop Tool Dealer#yuno1 4_M_01,911:-1,910:-1,912:-1
+yuno,197,114,4 shop Pet Groomer#yuno 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,6115:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1
+yuno,205,103,4 shop Mr. King's Shop#yuno 4_M_TELEPORTER,2340:-1,2341:-1,2411:-1,2222:-1,2230:-1,1721:-1
+yuno,163,187,5 shop Magical Item Seller#yuno 4_F_01,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
+yuno_in01,25,34,5 shop Tool Dealer#yuno2 4_M_01,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1
+yuno_in01,103,35,2 shop Weapon Dealer#yuno 1_M_03,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1
+yuno_in01,112,26,4 shop Armor Dealer#yuno 4W_F_01,2628:-1,2101:-1,2107:-1,2401:-1,2501:-1,2230:-1,2301:-1,2303:-1,2305:-1,2321:-1,2332:-1
+yuno_in03,176,22,3 shop Scroll Merchant#yuno03 4_M_ORIENT02,7433:-1 //Temp shop in Yuno that sells Blank Scrolls
//=======================================================
// Lighthalzen
//=======================================================
-lighthalzen,69,75,5 shop Fruit Gardener#lhz 102,512:-1,513:-1
-lighthalzen,112,44,0 shop Flower Girl#lhz 90,712:-1,744:-1,748:-1
-lighthalzen,124,129,0 shop Vegetable Gardener#lhz 91,515:-1,516:-1,535:-1
-lighthalzen,220,122,3 shop Vendor from Milk Ranch#l 90,519:-1
-lighthalzen,222,191,4 shop Pet Groomer#lhz 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-lhz_in02,286,95,4 shop Beginner's Merchant#lhz 62,5112:-1,2416:-1,2113:-1,2512:-1
-lhz_in02,271,99,5 shop Armor Dealer#lhz 851,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
-lhz_in02,276,99,4 shop Weapon Dealer#lhz 851,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
-lhz_in02,273,35,4 shop Wand Dealer#lhz 854,1601:-1,1604:-1,1607:-1,1617:-1,1619:-1
-lhz_in02,105,21,3 shop Jeweler#lhz 91,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1
-lhz_in02,17,220,5 shop Vegetable Gardener#lhz2 91,515:-1,516:-1,535:-1
-lhz_in02,21,220,5 shop Fruit Gardener#lhz2 102,512:-1,513:-1
-lhz_in02,32,219,5 shop Butcher#lhz 54,517:-1
-lhz_in02,38,145,5 shop Gift Merchant#lhz 91,734:-1,735:-1,736:-1,737:-1,746:-1
-lhz_in02,47,148,3 shop Wedding Shop Dealer#lhz 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1
-lhz_in02,31,145,4 shop Tool Dealer#lhz 90,611:-1,503:-1,504:-1,506:-1,657:-1,656:-1,601:-1,602:-1,1065:-1,610:-1,1770:-1
-lhz_in02,85,216,5 shop Doll Supplier#lhz 862,740:-1,741:-1,742:-1
-lhz_in02,87,208,3 shop Toy Supplier#lhz 715,2243:-1,2212:-1,2242:-1,2241:-1
-lhz_in03,239,106,5 shop Tool Dealer#lhz2 850,501:-1,502:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,611:-1
-lhz_in03,258,101,3 shop Arrow Merchant#lhz 855,1750:-1,1770:-1,1752:-1,1751:-1
-lhz_in03,249,24,4 shop Merchant#lhz 855,911:-1,910:-1,912:-1,528:-1
+lighthalzen,69,75,5 shop Fruit Gardener#lhz 8_F,512:-1,513:-1
+lighthalzen,112,44,0 shop Flower Girl#lhz 4_F_01,712:-1,744:-1,748:-1
+lighthalzen,124,129,0 shop Vegetable Gardener#lhz 4_F_02,515:-1,516:-1,535:-1
+lighthalzen,220,122,3 shop Vendor from Milk Ranch#l 4_F_01,519:-1
+lighthalzen,222,191,4 shop Pet Groomer#lhz 4_M_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+lhz_in02,286,95,4 shop Beginner's Merchant#lhz 1_M_SIZ,5112:-1,2416:-1,2113:-1,2512:-1
+lhz_in02,271,99,5 shop Armor Dealer#lhz 4_M_REPAIR,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
+lhz_in02,276,99,4 shop Weapon Dealer#lhz 4_M_REPAIR,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
+lhz_in02,273,35,4 shop Wand Dealer#lhz 4_M_EINMAN2,1601:-1,1604:-1,1607:-1,1617:-1,1619:-1
+lhz_in02,105,21,3 shop Jeweler#lhz 4_F_02,721:-1,723:-1,726:-1,728:-1,729:-1,730:-1,2613:-1
+lhz_in02,17,220,5 shop Vegetable Gardener#lhz2 4_F_02,515:-1,516:-1,535:-1
+lhz_in02,21,220,5 shop Fruit Gardener#lhz2 8_F,512:-1,513:-1
+lhz_in02,32,219,5 shop Butcher#lhz 1_M_JOBGUIDER,517:-1
+lhz_in02,38,145,5 shop Gift Merchant#lhz 4_F_02,734:-1,735:-1,736:-1,737:-1,746:-1
+lhz_in02,47,148,3 shop Wedding Shop Dealer#lhz 1_F_LIBRARYGIRL,744:-1,745:-1,2338:-1,2206:-1,7170:-1
+lhz_in02,31,145,4 shop Tool Dealer#lhz 4_F_01,611:-1,503:-1,504:-1,506:-1,657:-1,656:-1,601:-1,602:-1,1065:-1,610:-1,1770:-1
+lhz_in02,85,216,5 shop Doll Supplier#lhz 4_F_LGTGIRL,740:-1,741:-1,742:-1
+lhz_in02,87,208,3 shop Toy Supplier#lhz 4_M_PIERROT,2243:-1,2212:-1,2242:-1,2241:-1
+lhz_in03,239,106,5 shop Tool Dealer#lhz2 4_F_EINWOMAN,501:-1,502:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,611:-1
+lhz_in03,258,101,3 shop Arrow Merchant#lhz 4_M_EINMAN,1750:-1,1770:-1,1752:-1,1751:-1
+lhz_in03,249,24,4 shop Merchant#lhz 4_M_EINMAN,911:-1,910:-1,912:-1,528:-1
//=======================================================
// Louyang
//=======================================================
-lou_in02,121,182,5 shop Armor Dealer#lou 818,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
-lou_in02,130,182,5 shop Weapon Dealer#lou 822,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-lou_in02,239,176,5 shop Tool Dealer#lou 818,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+lou_in02,121,182,5 shop Armor Dealer#lou 4_F_CHNWOMAN,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+lou_in02,130,182,5 shop Weapon Dealer#lou 4_M_CHNMAN,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+lou_in02,239,176,5 shop Tool Dealer#lou 4_F_CHNWOMAN,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
//=======================================================
// Lutie
//=======================================================
-xmas_in,40,38,5 shop Tool Dealer#xmas 83,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1
-xmas_in,168,104,4 shop Armor Dealer#xmas 101,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1
-xmas_in,169,34,2 shop Gift Seller#xmas 702,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1
-xmas_in,174,98,2 shop Weapon Dealer#xmas 49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1
+xmas_in,40,38,5 shop Tool Dealer#xmas 4_M_01,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,610:-1
+xmas_in,168,104,4 shop Armor Dealer#xmas 4W_F_01,2228:-1,2103:-1,2105:-1,2307:-1,2309:-1,2312:-1,2314:-1,2316:-1,2505:-1,2405:-1
+xmas_in,169,34,2 shop Gift Seller#xmas 4_F_GON,2612:-1,744:-1,748:-1,736:-1,746:-1,740:-1,2613:-1
+xmas_in,174,98,2 shop Weapon Dealer#xmas 1_M_03,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1
//=======================================================
// Morroc - Post Ep. 12.1
//=======================================================
-in_moc_16,22,20,7 shop Sepulchral Merchant#moc 880,1771:-1
-moc_ruins,91,128,4 shop Tool Dealer#moc1 93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-moc_ruins,114,63,6 shop Tool Dealer#moc2 99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2242:-1
-moc_ruins,93,53,2 shop Item Collector#moc1 85,911:-1,528:-1,919:-1,925:-1
-moc_ruins,81,113,0 shop Item Collector#moc2 85,911:-1,528:-1,919:-1,925:-1
-moc_ruins,110,105,2 shop Jeweler#moc1 102,721:-1,723:-1,726:-1,728:-1,729:-1
-moc_ruins,52,85,6 shop Jeweler#moc2 99,730:-1,2613:-1
-moc_ruins,113,126,4 shop Trader#moc1 99,747:-1
-moc_ruins,131,138,0 shop Trader#moc2 93,748:-1
-moc_ruins,71,139,5 shop Trader#moc3 93,2612:-1
-moc_ruins,125,135,6 shop Trader#moc4 89,2609:-1,1516:-1,1522:-1
-moc_ruins,87,109,0 shop Butcher#moc 58,517:-1
-moc_ruins,90,149,6 shop Trader#moc5 99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1
-moc_ruins,118,170,4 shop Pet Groomer#moc 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-morocc_in,141,67,0 shop Weapon Dealer#moc1 58,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1250:-1,1252:-1,1254:-1
-morocc_in,141,60,0 shop Armor Dealer#moc 58,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2218:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2335:-1,2628:-1
-morocc_in,132,57,0 shop Weapon Dealer#moc2 99,1146:-1,1245:-1
+in_moc_16,22,20,7 shop Sepulchral Merchant#moc 4_M_MASKMAN,1771:-1
+moc_ruins,91,128,4 shop Tool Dealer#moc1 4_F_04,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+moc_ruins,114,63,6 shop Tool Dealer#moc2 4W_M_03,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2242:-1
+moc_ruins,93,53,2 shop Item Collector#moc1 4_M_03,911:-1,528:-1,919:-1,925:-1
+moc_ruins,81,113,0 shop Item Collector#moc2 4_M_03,911:-1,528:-1,919:-1,925:-1
+moc_ruins,110,105,2 shop Jeweler#moc1 8_F,721:-1,723:-1,726:-1,728:-1,729:-1
+moc_ruins,52,85,6 shop Jeweler#moc2 4W_M_03,730:-1,2613:-1
+moc_ruins,113,126,4 shop Trader#moc1 4W_M_03,747:-1
+moc_ruins,131,138,0 shop Trader#moc2 4_F_04,748:-1
+moc_ruins,71,139,5 shop Trader#moc3 4_F_04,2612:-1
+moc_ruins,125,135,6 shop Trader#moc4 4_M_ORIENT02,2609:-1,1516:-1,1522:-1
+moc_ruins,87,109,0 shop Butcher#moc 1_M_MERCHANT,517:-1
+moc_ruins,90,149,6 shop Trader#moc5 4W_M_03,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1
+moc_ruins,118,170,4 shop Pet Groomer#moc 4_M_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+morocc_in,141,67,0 shop Weapon Dealer#moc1 1_M_MERCHANT,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1250:-1,1252:-1,1254:-1
+morocc_in,141,60,0 shop Armor Dealer#moc 1_M_MERCHANT,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2218:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2335:-1,2628:-1
+morocc_in,132,57,0 shop Weapon Dealer#moc2 4W_M_03,1146:-1,1245:-1
//=======================================================
// Moscovia
//=======================================================
-mosk_in,21,254,5 shop Tool Dealer#mosk 968,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-mosk_in,31,180,3 shop Weapon Dealer#mosk 968,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-mosk_in,79,178,1 shop Armor Dealer#mosk 961,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
-moscovia,152,71,4 shop Fruit Gardener#mosk 968,512:-1,513:-1,515:-1,516:-1
-moscovia,199,110,3 shop Vendor from Milk Ranch#m 959,519:-1
+mosk_in,21,254,5 shop Tool Dealer#mosk 4_M_RUSMAN2,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+mosk_in,31,180,3 shop Weapon Dealer#mosk 4_M_RUSMAN2,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+mosk_in,79,178,1 shop Armor Dealer#mosk 4_F_RUSWOMAN3,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+moscovia,152,71,4 shop Fruit Gardener#mosk 4_M_RUSMAN2,512:-1,513:-1,515:-1,516:-1
+moscovia,199,110,3 shop Vendor from Milk Ranch#m 4_F_RUSWOMAN1,519:-1
//=======================================================
// Niflheim
//=======================================================
-nif_in,37,93,1 shop Axe Dealer#nif 801,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1
-nif_in,37,84,1 shop Armor Dealer#nif 801,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1
-nif_in,145,23,1 shop Tool Dealer#nif 801,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1
+nif_in,37,93,1 shop Axe Dealer#nif 4_NFCOFFIN,1301:-1,1351:-1,1354:-1,1357:-1,1360:-1
+nif_in,37,84,1 shop Armor Dealer#nif 4_NFCOFFIN,2501:-1,2501:-1,2503:-1,2503:-1,2505:-1,2505:-1
+nif_in,145,23,1 shop Tool Dealer#nif 4_NFCOFFIN,535:-1,1062:-1,902:-1,7106:-1,537:-1,7154:-1,1052:-1,934:-1
//=======================================================
// Payon
//=======================================================
-payon_in01,15,119,0 shop Weapon Dealer#pay 77,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1704:-1,1707:-1,1710:-1,1713:-1,1714:-1,1718:-1
-payon_in01,5,129,7 shop Weapon Dealer#pay2 703,1146:-1,1245:-1
-payon_in01,7,119,2 shop Armor Dealer#pay 76,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2208:-1,2211:-1,2212:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2330:-1,2628:-1
-payon_in01,5,49,7 shop Tool Dealer#pay 88,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-payon_in02,87,34,0 shop Tool Dealer#pay2 75,1750:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-payon,159,96,4 shop Tool Dealer#pay3 88,1750:-1,501:-1,645:-1,601:-1,602:-1
-payon,177,131,4 shop Pet Groomer#pay 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1
+payon_in01,15,119,0 shop Weapon Dealer#pay 1_F_ORIENT_03,1750:-1,1751:-1,1101:-1,1104:-1,1107:-1,1201:-1,1204:-1,1207:-1,1601:-1,1701:-1,1704:-1,1707:-1,1710:-1,1713:-1,1714:-1,1718:-1
+payon_in01,5,129,7 shop Weapon Dealer#pay2 4_F_KID2,1146:-1,1245:-1
+payon_in01,7,119,2 shop Armor Dealer#pay 1_F_ORIENT_02,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2505:-1,2208:-1,2211:-1,2212:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2330:-1,2628:-1
+payon_in01,5,49,7 shop Tool Dealer#pay 4_M_ORIENT01,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+payon_in02,87,34,0 shop Tool Dealer#pay2 1_F_ORIENT_01,1750:-1,1751:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+payon,159,96,4 shop Tool Dealer#pay3 4_M_ORIENT01,1750:-1,501:-1,645:-1,601:-1,602:-1
+payon,177,131,4 shop Pet Groomer#pay 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1
//=======================================================
// Prontera
//=======================================================
-prontera,73,134,0 shop Vendor from Milk Ranch#p 90,519:-1
-prontera,104,49,0 shop Fruit Gardener#prt 102,512:-1,513:-1
-prontera,64,125,0 shop Butcher#prt 87,517:-1,528:-1
-prontera,58,182,0 shop Flower Girl#prt 96,712:-1,744:-1
-prontera,113,42,0 shop Flower Lady#prt 90,712:-1,744:-1
-prontera,105,87,0 shop Gift Merchant#prt 91,734:-1,735:-1,736:-1,737:-1,746:-1
-prontera,218,211,4 shop Pet Groomer#prt 125,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1
-prontera,248,153,0 shop Doll Supplier#prt 85,740:-1,741:-1,742:-1
-prontera,48,58,0 shop Vegetable Gardener#prt 91,515:-1,516:-1,535:-1
-prt_church,108,124,4 shop Nun#prt 79,2608:-1,2216:-1,5092:-1,2323:-1,2325:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1
-prt_fild05,290,221,2 shop Tool Dealer#prt 83,1750:-1,611:-1,501:-1,502:-1,506:-1,645:-1,601:-1,602:-1
-prt_in,211,169,0 shop Wedding Shop Dealer#prt 71,744:-1,745:-1,2338:-1,2206:-1,7170:-1
-prt_in,126,76,0 shop Tool Dealer#prt1 53,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
-prt_in,172,130,0 shop Weapon Dealer#prt 54,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1129:-1,1116:-1,1301:-1
-prt_in,172,132,0 shop Armor Dealer#prt 48,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2220:-1,2226:-1,2301:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1,2627:-1
-prt_in,171,140,0 shop Weapon Dealer#prt2 47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
-prt_in,165,140,4 shop Weapon Dealer#prt3 66,1146:-1,1245:-1
-prt_monk,135,263,5 shop Weapon Dealer#prt4 726,1801:-1,1803:-1,1805:-1
+prontera,73,134,0 shop Vendor from Milk Ranch#p 4_F_01,519:-1
+prontera,104,49,0 shop Fruit Gardener#prt 8_F,512:-1,513:-1
+prontera,64,125,0 shop Butcher#prt 4_M_BARBER,517:-1,528:-1
+prontera,58,182,0 shop Flower Girl#prt 4W_KID,712:-1,744:-1
+prontera,113,42,0 shop Flower Lady#prt 4_F_01,712:-1,744:-1
+prontera,105,87,0 shop Gift Merchant#prt 4_F_02,734:-1,735:-1,736:-1,737:-1,746:-1
+prontera,218,211,4 shop Pet Groomer#prt 4_M_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6114:-1,6113:-1,6110:-1,6115:-1,6100:-1,6098:-1,6112:-1,6104:-1,6108:-1,6111:-1,6095:-1,6099:-1,6096:-1,6097:-1,6094:-1
+prontera,248,153,0 shop Doll Supplier#prt 4_M_03,740:-1,741:-1,742:-1
+prontera,48,58,0 shop Vegetable Gardener#prt 4_F_02,515:-1,516:-1,535:-1
+prt_church,108,124,4 shop Nun#prt 1_F_PRIEST,2608:-1,2216:-1,5092:-1,2323:-1,2325:-1,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1
+prt_fild05,290,221,2 shop Tool Dealer#prt 4_M_01,1750:-1,611:-1,501:-1,502:-1,506:-1,645:-1,601:-1,602:-1
+prt_in,211,169,0 shop Wedding Shop Dealer#prt 1_F_LIBRARYGIRL,744:-1,745:-1,2338:-1,2206:-1,7170:-1
+prt_in,126,76,0 shop Tool Dealer#prt1 1_M_INNKEEPER,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
+prt_in,172,130,0 shop Weapon Dealer#prt 1_M_JOBGUIDER,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1129:-1,1116:-1,1301:-1
+prt_in,172,132,0 shop Armor Dealer#prt 1_M_02,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2220:-1,2226:-1,2301:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1,2628:-1,2627:-1
+prt_in,171,140,0 shop Weapon Dealer#prt2 1_M_01,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
+prt_in,165,140,4 shop Weapon Dealer#prt3 1_F_01,1146:-1,1245:-1
+prt_monk,135,263,5 shop Weapon Dealer#prt4 4_F_JOB_BLACKSMITH,1801:-1,1803:-1,1805:-1
//=======================================================
// Rachel
//=======================================================
-ra_in01,175,364,3 shop Armor Dealer#ra 919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
-ra_in01,257,269,3 shop Tool Dealer#ra 919,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
-ra_in01,176,389,3 shop Weapon Dealer#ra 931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1601:-1,1604:-1,1607:-1
-ra_in01,254,300,3 shop Fruit Gardener#ra 931,512:-1,513:-1
-rachel,65,80,1 shop Vegetable Gardener#ra 919,515:-1,535:-1,516:-1
+ra_in01,175,364,3 shop Armor Dealer#ra 4_F_SHABBY,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
+ra_in01,257,269,3 shop Tool Dealer#ra 4_F_SHABBY,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
+ra_in01,176,389,3 shop Weapon Dealer#ra 4_M_RACHMAN1,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1,1601:-1,1604:-1,1607:-1
+ra_in01,254,300,3 shop Fruit Gardener#ra 4_M_RACHMAN1,512:-1,513:-1
+rachel,65,80,1 shop Vegetable Gardener#ra 4_F_SHABBY,515:-1,535:-1,516:-1
//=======================================================
// Turtle Island
//=======================================================
-tur_dun01,158,54,6 shop Tool Dealer#tu 99,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,645:-1,656:-1,2242:-1
+tur_dun01,158,54,6 shop Tool Dealer#tu 4W_M_03,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,601:-1,602:-1,645:-1,656:-1,2242:-1
//=======================================================
// Umbala
//=======================================================
-um_in,104,124,3 shop Tool Dealer#um 788,512:-1,515:-1,535:-1,516:-1,513:-1,517:-1,528:-1,537:-1,601:-1,602:-1,645:-1,656:-1,610:-1
-um_in,160,125,3 shop Weapon Dealer#um 789,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,1807:-1,1811:-1,1809:-1
+um_in,104,124,3 shop Tool Dealer#um 4_M_UMOLDMAN,512:-1,515:-1,535:-1,516:-1,513:-1,517:-1,528:-1,537:-1,601:-1,602:-1,645:-1,656:-1,610:-1
+um_in,160,125,3 shop Weapon Dealer#um 4_M_UMSOLDIER,1501:-1,1504:-1,1507:-1,1510:-1,1513:-1,1519:-1,1807:-1,1811:-1,1809:-1
//=======================================================
// Veins
//=======================================================
-ve_in,386,245,3 shop Weapon Dealer#ve 931,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1
-ve_in,336,243,3 shop Weapon Dealer#ve2 931,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
-ve_in,374,230,3 shop Armor Dealer#ve 919,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
-ve_in,243,303,5 shop Tool Dealer#ve 943,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
-ve_in,253,304,5 shop Fruit Gardener#ve 941,512:-1,513:-1
-ve_in,252,313,0 shop Magical Item Seller#ve 942,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
+ve_in,386,245,3 shop Weapon Dealer#ve 4_M_RACHMAN1,1201:-1,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1
+ve_in,336,243,3 shop Weapon Dealer#ve2 4_M_RACHMAN1,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
+ve_in,374,230,3 shop Armor Dealer#ve 4_F_SHABBY,2101:-1,2103:-1,2403:-1,2405:-1,2503:-1,2321:-1,2314:-1,2309:-1,2335:-1,2628:-1
+ve_in,243,303,5 shop Tool Dealer#ve 4_M_DESERT,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
+ve_in,253,304,5 shop Fruit Gardener#ve 4_F_DST_CHILD,512:-1,513:-1
+ve_in,252,313,0 shop Magical Item Seller#ve 4_F_DST_GRAND,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
//=======================================================
// Cooking Addition
//=======================================================
-prontera,156,212,1 shop Chef Assistant#prt 700,7454:-1,7456:-1,7482:-1,580:-1
-payon,206,119,5 shop Chef Assistant#pay 89,7455:-1
-moc_ruins,115,123,5 shop Chef Assistant#moc 86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1
-geffen,196,111,3 shop Chef Assistant#gef 85,7482:-1
-alberta,167,135,5 shop Chef Assistant#alb 712,579:-1
-aldebaran,165,107,2 shop Chef Assistant#alde 97,7456:-1,7452:-1,580:-1
-comodo,225,164,3 shop Chef Assistant#cmd 83,7455:-1,7453:-1,7454:-1,579:-1
-umbala,102,154,3 shop Chef Assistant#um 83,7456:-1,577:-1
-yuno,130,173,3 shop Chef Assistant#yuno 83,7457:-1,7482:-1
-einbroch,224,207,5 shop Chef Assistant#ein 83,7457:-1
-lighthalzen,126,126,3 shop Chef Assistant#lhz 83,7456:-1,7452:-1
-amatsu,206,150,3 shop Chef Assistant#ama 83,7453:-1,579:-1
-louyang,256,123,5 shop Chef Assistant#lou 820,7454:-1,577:-1
-gonryun,147,101,5 shop Chef Assistant#gon 83,7452:-1,580:-1
-ayothaya,203,178,3 shop Chef Assistant#ayo 83,7455:-1,577:-1
-xmas,152,137,5 shop Chef Assistant#xmas 83,7457:-1,577:-1
-niflheim,209,180,5 shop Chef Assistant#nif 83,581:-1
+prontera,156,212,1 shop Chef Assistant#prt 8_F_GIRL,7454:-1,7456:-1,7482:-1,580:-1
+payon,206,119,5 shop Chef Assistant#pay 4_M_ORIENT02,7455:-1
+moc_ruins,115,123,5 shop Chef Assistant#moc 4_M_04,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1
+geffen,196,111,3 shop Chef Assistant#gef 4_M_03,7482:-1
+alberta,167,135,5 shop Chef Assistant#alb 4_M_05,579:-1
+aldebaran,165,107,2 shop Chef Assistant#alde 4W_M_01,7456:-1,7452:-1,580:-1
+comodo,225,164,3 shop Chef Assistant#cmd 4_M_01,7455:-1,7453:-1,7454:-1,579:-1
+umbala,102,154,3 shop Chef Assistant#um 4_M_01,7456:-1,577:-1
+yuno,130,173,3 shop Chef Assistant#yuno 4_M_01,7457:-1,7482:-1
+einbroch,224,207,5 shop Chef Assistant#ein 4_M_01,7457:-1
+lighthalzen,126,126,3 shop Chef Assistant#lhz 4_M_01,7456:-1,7452:-1
+amatsu,206,150,3 shop Chef Assistant#ama 4_M_01,7453:-1,579:-1
+louyang,256,123,5 shop Chef Assistant#lou 4_M_CHNCOOK,7454:-1,577:-1
+gonryun,147,101,5 shop Chef Assistant#gon 4_M_01,7452:-1,580:-1
+ayothaya,203,178,3 shop Chef Assistant#ayo 4_M_01,7455:-1,577:-1
+xmas,152,137,5 shop Chef Assistant#xmas 4_M_01,7457:-1,577:-1
+niflheim,209,180,5 shop Chef Assistant#nif 4_M_01,581:-1
//===== Additional Comments(old): =================================
//= swapped shop titles in GONRYUN, thanks to Kashy
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 546c7c17b..9d90e31aa 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -334,10 +334,10 @@ function script Func_Socket {
}
}
-payon,140,151,5 duplicate(SocketEnchant) Seiyablem#pay 84
-lhz_in02,281,35,5 duplicate(SocketEnchant) Seiyablem#lhz 84
-prt_in,33,70,5 duplicate(SocketEnchant) Seiyablem#prt 84
-morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 84
+payon,140,151,5 duplicate(SocketEnchant) Seiyablem#pay 4_M_02
+lhz_in02,281,35,5 duplicate(SocketEnchant) Seiyablem#lhz 4_M_02
+prt_in,33,70,5 duplicate(SocketEnchant) Seiyablem#prt 4_M_02
+morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 4_M_02
- script Young Man#dummy::SocketMan -1,{
mes "[Young Man]";
@@ -356,7 +356,7 @@ morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 84
close;
}
-prt_in,31,57,1 duplicate(SocketMan) Young Man#prt 97
-payon,143,143,7 duplicate(SocketMan) Young Man#pay 97
-morocc,60,42,3 duplicate(SocketMan) Young Man#moc 97
-lhz_in02,269,33,5 duplicate(SocketMan) Young Man#lhz 97
+prt_in,31,57,1 duplicate(SocketMan) Young Man#prt 4W_M_01
+payon,143,143,7 duplicate(SocketMan) Young Man#pay 4W_M_01
+morocc,60,42,3 duplicate(SocketMan) Young Man#moc 4W_M_01
+lhz_in02,269,33,5 duplicate(SocketMan) Young Man#lhz 4W_M_01
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index 3ee1b036b..3e7c64808 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -377,10 +377,10 @@
}
}
-payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 86
-lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 86
-prt_in,22,60,6 duplicate(SocketEnchant2) Leablem#prt 86
-moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 86
+payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 4_M_04
+lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 4_M_04
+prt_in,22,60,6 duplicate(SocketEnchant2) Leablem#prt 4_M_04
+moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 4_M_04
function script Func_Socket2 {
diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt
index c985cc4a3..6fb0b41f7 100644
--- a/npc/merchants/wander_pet_food.txt
+++ b/npc/merchants/wander_pet_food.txt
@@ -12,7 +12,7 @@
//= 1.0 First version
//============================================================
-prontera,218,218,3 script Pet Enthusiast 96,{
+prontera,218,218,3 script Pet Enthusiast 4W_KID,{
mes "[Pet Enthusiast Jenny]";
mes "Oh, Hi there!";
mes "Are you a lover of animals like I am?";
@@ -67,7 +67,7 @@ prontera,218,218,3 script Pet Enthusiast 96,{
}
}
-prontera,220,218,3 script Berry Toe 955,{
+prontera,220,218,3 script Berry Toe 4_DONKEY,{
specialeffect EF_CHANGEDARK;
end;
}
diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt
index baaad35e7..2b6e102cb 100644
--- a/npc/other/acolyte_warp.txt
+++ b/npc/other/acolyte_warp.txt
@@ -12,7 +12,7 @@
//= Unsure if this is on kRO, so disabled for now.
//============================================================
-prontera,98,121,4 script Acolyte#Prtclear 90,{
+prontera,98,121,4 script Acolyte#Prtclear 4_F_01,{
mes "[Keiki]";
mes "Hello there, adventurer.";
mes "I've been studying magic from all over Rune-Midgard to upgrade what I believe to be one of the greatest skills available to the acolyte class.";
@@ -77,7 +77,7 @@ prontera,98,121,4 script Acolyte#Prtclear 90,{
}
}
-yuno,142,184,6 script Acolyte#Junoclear 90,{
+yuno,142,184,6 script Acolyte#Junoclear 4_F_01,{
mes "[Isalei]";
mes "Hello, adventurer.";
mes "My companion Keiki and I have discovered a way to increase our warp portal abilities.";
diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index 315d61165..725e8c58f 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -15,7 +15,7 @@
//= 1.5 Added GM management function. [Euphy]
//============================================================
-arena_room,114,102,0 script onlyaco#arena 45,1,1,{
+arena_room,114,102,0 script onlyaco#arena WARPNPC,1,1,{
OnTouch:
if (BaseClass == Job_Acolyte) {
warp "arena_room",135,129;
@@ -27,7 +27,7 @@ OnTouch:
}
}
-arena_room,136,138,3 script Acolyte Waiting Room 124,{
+arena_room,136,138,3 script Acolyte Waiting Room 4_F_TELEPORTER,{
end;
OnInit:
@@ -1024,7 +1024,7 @@ OnMyMobDead:
end;
}
-force_5-1,62,26,0 script force_08_01#aco 45,1,1,{
+force_5-1,62,26,0 script force_08_01#aco WARPNPC,1,1,{
OnTouch:
warp "force_5-1",40,26;
if (BaseJob == Job_Acolyte) {
@@ -1036,7 +1036,7 @@ OnTouch:
end;
}
-force_5-1,99,124,0 script force_exit#aco 45,1,1,{
+force_5-1,99,124,0 script force_exit#aco WARPNPC,1,1,{
OnTouch:
donpcevent "Trocco#aco1::OnTimerOff";
donpcevent "#arn_timer_aco::OnEnable";
@@ -1044,7 +1044,7 @@ OnTouch:
end;
}
-prt_are_in,181,83,3 script Staff#aco-1 67,{
+prt_are_in,181,83,3 script Staff#aco-1 1_F_02,{
mes "[Staff]";
mes "Nice work!";
mes "You might have failed";
@@ -1075,7 +1075,7 @@ prt_are_in,181,83,3 script Staff#aco-1 67,{
end;
}
-prt_are_in,25,31,3 script Staff#aco-2 67,{
+prt_are_in,25,31,3 script Staff#aco-2 1_F_02,{
set .@start_timeaco, $@arn_1;
set .@hour_startaco, .@start_timeaco / 10000;
set .@min_startaco, ((.@start_timeaco % 10000) / 100);
@@ -1552,7 +1552,7 @@ OnEnable:
end;
}
-arena_room,94,82,7 script Arena Record Staff#aco 79,{
+arena_room,94,82,7 script Arena Record Staff#aco 1_F_PRIEST,{
mes "[Mathea]";
mes "Hello, I'm in charge of";
mes "the Acolyte Class Records";
@@ -1648,7 +1648,7 @@ OnLineRec_pri90:
end;
}
-arena_room,140,136,3 script Guide Alias 729,{
+arena_room,140,136,3 script Guide Alias 4_F_NOVICE,{
mes "[Alias]";
mes "Hello there, I'm here";
mes "to inform you about";
@@ -1708,7 +1708,7 @@ arena_room,140,136,3 script Guide Alias 729,{
close;
}
-arena_room,195,5,3 script log-on-aco#arena 802,{
+arena_room,195,5,3 script log-on-aco#arena 4_NFWISP,{
set .@i, callfunc("F_GM_NPC",1357,0);
if (.@i == -1) {
mes "^3355FFIncorrect Password.^000000";
@@ -1752,7 +1752,7 @@ arena_room,195,5,3 script log-on-aco#arena 802,{
}
}
-arena_room,195,10,3 script acolink#arena 802,{
+arena_room,195,10,3 script acolink#arena 4_NFWISP,{
set .@i, callfunc("F_GM_NPC",1357,0);
if (.@i == -1) {
mes "Command has";
diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index f45ca16ee..e1e98d3b2 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -13,7 +13,7 @@
//= 1.3 Script updates. [Euphy]
//============================================================
-arena_room,64,138,5 script Lv50 Waiting Room 124,{
+arena_room,64,138,5 script Lv50 Waiting Room 4_F_TELEPORTER,{
end;
OnInit:
@@ -32,7 +32,7 @@ OnStart:
end;
}
-force_1-1,99,20,4 script Heel and Toe#arena 124,{
+force_1-1,99,20,4 script Heel and Toe#arena 4_F_TELEPORTER,{
end;
OnStart:
@@ -289,21 +289,21 @@ OnReset_All:
end;
}
-force_1-1,62,26,1 script force_08_01#50 45,1,1,{
+force_1-1,62,26,1 script force_08_01#50 WARPNPC,1,1,{
OnTouch:
donpcevent "Heel and Toe#arena::On01_Start";
warp "force_1-1",40,26;
end;
}
-force_1-1,25,44,1 script force_01_02#50 45,1,1,{
+force_1-1,25,44,1 script force_01_02#50 WARPNPC,1,1,{
OnTouch:
donpcevent "Heel and Toe#arena::On02_Start";
warp "force_1-1",25,69;
end;
}
-force_1-1,25,134,1 script force_02_03#50 45,1,1,{
+force_1-1,25,134,1 script force_02_03#50 WARPNPC,1,1,{
OnTouch:
donpcevent "arena#50::OnReset_02";
donpcevent "Heel and Toe#arena::On03_Start";
@@ -311,35 +311,35 @@ OnTouch:
end;
}
-force_1-1,44,174,1 script force_03_04#50 45,1,1,{
+force_1-1,44,174,1 script force_03_04#50 WARPNPC,1,1,{
OnTouch:
donpcevent "Heel and Toe#arena::On04_Start";
warp "force_1-1",69,174;
end;
}
-force_1-1,134,174,1 script force_04_05#50 45,1,1,{
+force_1-1,134,174,1 script force_04_05#50 WARPNPC,1,1,{
OnTouch:
donpcevent "Heel and Toe#arena::On05_Start";
warp "force_1-1",159,174;
end;
}
-force_1-1,174,155,1 script force_05_06#50 45,1,1,{
+force_1-1,174,155,1 script force_05_06#50 WARPNPC,1,1,{
OnTouch:
donpcevent "Heel and Toe#arena::On06_Start";
warp "force_1-1",174,130;
end;
}
-force_1-1,174,65,1 script force_06_07#50 45,1,1,{
+force_1-1,174,65,1 script force_06_07#50 WARPNPC,1,1,{
OnTouch:
donpcevent "Heel and Toe#arena::On07_Start";
warp "force_1-1",174,40;
end;
}
-force_1-1,155,26,1 script force_07_08#50 45,1,1,{
+force_1-1,155,26,1 script force_07_08#50 WARPNPC,1,1,{
OnTouch:
donpcevent "Heel and Toe#arena::On08_Start";
warp "force_1-1",132,26;
@@ -347,14 +347,14 @@ OnTouch:
end;
}
-force_1-1,99,54,1 script force_08_09#50 45,1,1,{
+force_1-1,99,54,1 script force_08_09#50 WARPNPC,1,1,{
OnTouch:
donpcevent "Heel and Toe#arena::On09_Start";
warp "force_1-1",99,82;
end;
}
-force_1-1,99,124,1 script force_exit#50 45,1,1,{
+force_1-1,99,124,1 script force_exit#50 WARPNPC,1,1,{
OnTouch:
donpcevent "Heel and Toe#arena::OnTimerOff";
donpcevent "#arn_timer_50::OnEnable";
@@ -780,7 +780,7 @@ OnMyMobDead:
end;
}
-prt_are_in,129,188,3 script Staff#50-1 67,{
+prt_are_in,129,188,3 script Staff#50-1 1_F_02,{
mes "[Staff]";
mes "You did a good job.";
mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -801,7 +801,7 @@ prt_are_in,129,188,3 script Staff#50-1 67,{
end;
}
-prt_are_in,25,188,3 script Staff#50-2 67,{
+prt_are_in,25,188,3 script Staff#50-2 1_F_02,{
if($arena_min50end < $arena_min50st) {
if($arena_sec50end < $arena_sec50st) {
set @record_min50,60 - $arena_min50st + $arena_min50end -1;
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index e100b76f6..8ccd45cf0 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -14,7 +14,7 @@
//= 1.4 Script updates. [Euphy]
//============================================================
-arena_room,38,88,5 script Lv60 Waiting Room 124,{
+arena_room,38,88,5 script Lv60 Waiting Room 4_F_TELEPORTER,{
end;
OnInit:
@@ -33,7 +33,7 @@ OnStart:
end;
}
-force_2-1,99,20,4 script Minilover#arena 124,{
+force_2-1,99,20,4 script Minilover#arena 4_F_TELEPORTER,{
end;
OnStart:
@@ -299,21 +299,21 @@ OnReset_All:
end;
}
-force_2-1,62,26,1 script force_08_01#60 45,1,1,{
+force_2-1,62,26,1 script force_08_01#60 WARPNPC,1,1,{
OnTouch:
donpcevent "Minilover#arena::On01_Start";
warp "force_2-1",40,26;
end;
}
-force_2-1,25,44,1 script force_01_02#60 45,1,1,{
+force_2-1,25,44,1 script force_01_02#60 WARPNPC,1,1,{
OnTouch:
donpcevent "Minilover#arena::On02_Start";
warp "force_2-1",25,69;
end;
}
-force_2-1,25,134,1 script force_02_03#60 45,1,1,{
+force_2-1,25,134,1 script force_02_03#60 WARPNPC,1,1,{
OnTouch:
donpcevent "arena#60::OnReset_02";
donpcevent "Minilover#arena::On03_Start";
@@ -321,35 +321,35 @@ OnTouch:
end;
}
-force_2-1,44,174,1 script force_03_04#60 45,1,1,{
+force_2-1,44,174,1 script force_03_04#60 WARPNPC,1,1,{
OnTouch:
donpcevent "Minilover#arena::On04_Start";
warp "force_2-1",69,174;
end;
}
-force_2-1,134,174,1 script force_04_05#60 45,1,1,{
+force_2-1,134,174,1 script force_04_05#60 WARPNPC,1,1,{
OnTouch:
donpcevent "Minilover#arena::On05_Start";
warp "force_2-1",159,174;
end;
}
-force_2-1,174,155,1 script force_05_06#60 45,1,1,{
+force_2-1,174,155,1 script force_05_06#60 WARPNPC,1,1,{
OnTouch:
donpcevent "Minilover#arena::On06_Start";
warp "force_2-1",174,130;
end;
}
-force_2-1,174,65,1 script force_06_07#60 45,1,1,{
+force_2-1,174,65,1 script force_06_07#60 WARPNPC,1,1,{
OnTouch:
donpcevent "Minilover#arena::On07_Start";
warp "force_2-1",174,40;
end;
}
-force_2-1,155,26,1 script force_07_08#60 45,1,1,{
+force_2-1,155,26,1 script force_07_08#60 WARPNPC,1,1,{
OnTouch:
donpcevent "Minilover#arena::On08_Start";
warp "force_2-1",132,26;
@@ -357,14 +357,14 @@ OnTouch:
end;
}
-force_2-1,99,54,1 script force_08_09#60 45,1,1,{
+force_2-1,99,54,1 script force_08_09#60 WARPNPC,1,1,{
OnTouch:
donpcevent "Minilover#arena::On09_Start";
warp "force_2-1",99,82;
end;
}
-force_2-1,99,124,1 script force_exit#60 45,1,1,{
+force_2-1,99,124,1 script force_exit#60 WARPNPC,1,1,{
OnTouch:
donpcevent "Minilover#arena::OnTimerOff";
donpcevent "#arn_timer_60::OnEnable";
@@ -790,7 +790,7 @@ OnMyMobDead:
end;
}
-prt_are_in,129,135,3 script Staff#60-1 67,{
+prt_are_in,129,135,3 script Staff#60-1 1_F_02,{
mes "[Staff]";
mes "You did a good job.";
mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -811,7 +811,7 @@ prt_are_in,129,135,3 script Staff#60-1 67,{
end;
}
-prt_are_in,25,135,3 script Staff#60-2 67,{
+prt_are_in,25,135,3 script Staff#60-2 1_F_02,{
if($arena_min60end < $arena_min60st) {
if($arena_sec60end < $arena_sec60st) {
set @record_min60,60 - $arena_min60st + $arena_min60end -1;
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index cef72fc62..e50113e74 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -13,7 +13,7 @@
//= 1.3 Script updates. [Euphy]
//============================================================
-arena_room,52,42,7 script Lv70 Waiting Room 124,{
+arena_room,52,42,7 script Lv70 Waiting Room 4_F_TELEPORTER,{
end;
OnInit:
@@ -32,7 +32,7 @@ OnStart:
end;
}
-force_3-1,99,20,4 script Cadillac#arena 124,{
+force_3-1,99,20,4 script Cadillac#arena 4_F_TELEPORTER,{
end;
OnStart:
@@ -307,56 +307,56 @@ OnReset_All:
end;
}
-force_3-1,62,26,1 script force_08_01#70 45,1,1,{
+force_3-1,62,26,1 script force_08_01#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On01_Start";
warp "force_3-1",40,26;
end;
}
-force_3-1,25,44,1 script force_01_02#70 45,1,1,{
+force_3-1,25,44,1 script force_01_02#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On02_Start";
warp "force_3-1",25,69;
end;
}
-force_3-1,25,134,1 script force_02_03#70 45,1,1,{
+force_3-1,25,134,1 script force_02_03#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On03_Start";
warp "force_3-1",25,159;
end;
}
-force_3-1,44,174,1 script force_03_04#70 45,1,1,{
+force_3-1,44,174,1 script force_03_04#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On04_Start";
warp "force_3-1",69,174;
end;
}
-force_3-1,134,174,1 script force_04_05#70 45,1,1,{
+force_3-1,134,174,1 script force_04_05#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On05_Start";
warp "force_3-1",159,174;
end;
}
-force_3-1,174,155,1 script force_05_06#70 45,1,1,{
+force_3-1,174,155,1 script force_05_06#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On06_Start";
warp "force_3-1",174,130;
end;
}
-force_3-1,174,65,1 script force_06_07#70 45,1,1,{
+force_3-1,174,65,1 script force_06_07#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On07_Start";
warp "force_3-1",174,40;
end;
}
-force_3-1,155,26,1 script force_07_08#70 45,1,1,{
+force_3-1,155,26,1 script force_07_08#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On08_Start";
warp "force_3-1",132,26;
@@ -364,14 +364,14 @@ OnTouch:
end;
}
-force_3-1,99,54,1 script force_08_09#70 45,1,1,{
+force_3-1,99,54,1 script force_08_09#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::On09_Start";
warp "force_3-1",99,82;
end;
}
-force_3-1,99,124,1 script force_exit#70 45,1,1,{
+force_3-1,99,124,1 script force_exit#70 WARPNPC,1,1,{
OnTouch:
donpcevent "Cadillac#arena::OnTimerOff";
donpcevent "#arn_timer_70::OnEnable";
@@ -755,7 +755,7 @@ OnMyMobDead:
end;
}
-prt_are_in,129,83,3 script Staff#70-1 67,{
+prt_are_in,129,83,3 script Staff#70-1 1_F_02,{
mes "[Staff]";
mes "You did a good job.";
mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -776,7 +776,7 @@ prt_are_in,129,83,3 script Staff#70-1 67,{
end;
}
-prt_are_in,25,84,3 script Staff#70-2 67,{
+prt_are_in,25,84,3 script Staff#70-2 1_F_02,{
if($arena_min70end < $arena_min70st) {
if($arena_sec70end < $arena_sec70st) {
set @record_min70,60 - $arena_min70st + $arena_min70end -1;
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 2ad4c254d..773175a11 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -13,7 +13,7 @@
//= 1.3 Script updates, and removed a level restriction. [Euphy]
//============================================================
-arena_room,147,42,1 script Lv80 Waiting Room 124,{
+arena_room,147,42,1 script Lv80 Waiting Room 4_F_TELEPORTER,{
end;
OnInit:
@@ -32,7 +32,7 @@ OnStart:
end;
}
-force_4-1,99,20,4 script Octus#arena 124,{
+force_4-1,99,20,4 script Octus#arena 4_F_TELEPORTER,{
end;
OnStart:
@@ -310,28 +310,28 @@ OnReset_All:
end;
}
-force_4-1,62,26,1 script force_08_01#80 45,1,1,{
+force_4-1,62,26,1 script force_08_01#80 WARPNPC,1,1,{
OnTouch:
donpcevent "Octus#arena::On01_Start";
warp "force_4-1",40,26;
end;
}
-force_4-1,25,44,1 script force_01_02#80 45,1,1,{
+force_4-1,25,44,1 script force_01_02#80 WARPNPC,1,1,{
OnTouch:
donpcevent "Octus#arena::On02_Start";
warp "force_4-1",25,69;
end;
}
-force_4-1,25,134,1 script force_02_03#80 45,1,1,{
+force_4-1,25,134,1 script force_02_03#80 WARPNPC,1,1,{
OnTouch:
donpcevent "Octus#arena::On03_Start";
warp "force_4-1",25,159;
end;
}
-force_4-1,44,174,1 script force_03_04#80 45,1,1,{
+force_4-1,44,174,1 script force_03_04#80 WARPNPC,1,1,{
OnTouch:
donpcevent "Octus#arena::On04_Start";
warp "force_4-1",69,174;
@@ -339,28 +339,28 @@ OnTouch:
}
-force_4-1,134,174,1 script force_04_05#80 45,1,1,{
+force_4-1,134,174,1 script force_04_05#80 WARPNPC,1,1,{
OnTouch:
donpcevent "Octus#arena::On05_Start";
warp "force_4-1",159,174;
end;
}
-force_4-1,174,155,1 script force_05_06#80 45,1,1,{
+force_4-1,174,155,1 script force_05_06#80 WARPNPC,1,1,{
OnTouch:
donpcevent "Octus#arena::On06_Start";
warp "force_4-1",174,130;
end;
}
-force_4-1,174,65,1 script force_06_07#80 45,1,1,{
+force_4-1,174,65,1 script force_06_07#80 WARPNPC,1,1,{
OnTouch:
donpcevent "Octus#arena::On07_Start";
warp "force_4-1",174,40;
end;
}
-force_4-1,155,26,1 script force_07_08#80 45,1,1,{
+force_4-1,155,26,1 script force_07_08#80 WARPNPC,1,1,{
OnTouch:
donpcevent "Octus#arena::On08_Start";
warp "force_4-1",132,26;
@@ -368,14 +368,14 @@ OnTouch:
end;
}
-force_4-1,99,54,1 script force_08_09#80 45,1,1,{
+force_4-1,99,54,1 script force_08_09#80 WARPNPC,1,1,{
OnTouch:
donpcevent "Octus#arena::On09_Start";
warp "force_4-1",99,82;
end;
}
-force_4-1,99,124,1 script force_exit#80 45,1,1,{
+force_4-1,99,124,1 script force_exit#80 WARPNPC,1,1,{
OnTouch:
donpcevent "Octus#arena::OnTimerOff";
donpcevent "#arn_timer_80::OnEnable";
@@ -736,7 +736,7 @@ OnMyMobDead:
end;
}
-prt_are_in,181,188,3 script Staff#80-1 67,{
+prt_are_in,181,188,3 script Staff#80-1 1_F_02,{
mes "[Staff]";
mes "You did a good job.";
mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -757,7 +757,7 @@ prt_are_in,181,188,3 script Staff#80-1 67,{
end;
}
-prt_are_in,77,187,3 script Staff#80-2 67,{
+prt_are_in,77,187,3 script Staff#80-2 1_F_02,{
if($arena_min80end < $arena_min80st) {
if($arena_sec80end < $arena_sec80st) {
set @record_min80,60 - $arena_min80st + $arena_min80end -1;
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index 77ba829eb..2be12b02e 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -16,7 +16,7 @@
//= 1.5 Script updates, and removed a level restriction. [Euphy]
//============================================================
-arena_room,162,88,3 script Ponox 124,{
+arena_room,162,88,3 script Ponox 4_F_TELEPORTER,{
end;
OnInit:
@@ -144,7 +144,7 @@ OnTouch:
end;
}
-force_1-2,99,31,4 script Slipslowrun#party 124,{
+force_1-2,99,31,4 script Slipslowrun#party 4_F_TELEPORTER,{
OnStart:
initnpctimer;
set $arena_minptst,gettime(2);
@@ -410,7 +410,7 @@ OnReset:
end;
}
-force_1-2,95,187,0 script force_09_exit 45,1,1,{
+force_1-2,95,187,0 script force_09_exit WARPNPC,1,1,{
OnTouch:
set $arena_minptend,gettime(2);
set $arena_secptend,gettime(1);
@@ -949,7 +949,7 @@ OnMyMobDead:
end;
}
-prt_are_in,181,135,3 script Staff#party-1 67,{
+prt_are_in,181,135,3 script Staff#party-1 1_F_02,{
mes "[Staff]";
mes "You did a good job.";
mes "Even if you have failed to clear a time attack battle, I will reward you with a small amount of arena points.";
@@ -970,7 +970,7 @@ prt_are_in,181,135,3 script Staff#party-1 67,{
end;
}
-prt_are_in,77,135,3 script Staff#party-2 67,{
+prt_are_in,77,135,3 script Staff#party-2 1_F_02,{
if($arena_minptend < $arena_minptst) {
if($arena_secptend < $arena_secptst) {
set @record_minpt,60 - $arena_minptst + $arena_minptend -1;
diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt
index dc4911c68..3b49596c0 100644
--- a/npc/other/arena/arena_point.txt
+++ b/npc/other/arena/arena_point.txt
@@ -11,7 +11,7 @@
//= 1.0 First version. [L0ne_W0lf]
//============================================================
-prt_are_in,103,11,3 script Arena Point Manager 732,{
+prt_are_in,103,11,3 script Arena Point Manager 4_M_JOB_HUNTER,{
mes "[Arena Point Manager]";
mes "I hope you're having a good";
mes "time in the Arena. If you've";
diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index 2e067cd28..b459724c2 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -15,7 +15,7 @@
//= 1.4 Added GM management function. [Euphy]
//============================================================
-arena_room,94,93,5 script Vendigos 97,{
+arena_room,94,93,5 script Vendigos 4W_M_01,{
mes "[Vendigos]";
mes "Welcome to the world of Arena, the battle against a time limit.";
mes "My name is Vendigos, I am here to help you.";
@@ -101,7 +101,7 @@ OnLineRec_pt:
// end;
}
-arena_room,105,82,5 script Arena Record Staff 57,{
+arena_room,105,82,5 script Arena Record Staff 1_M_LIBRARYMASTER,{
mes "[Owen Kheuv]";
mes "Hello, my name is Own Kheuv";
mes "in charge of every arena stage record of players.";
@@ -134,7 +134,7 @@ arena_room,105,82,5 script Arena Record Staff 57,{
}
}
-arena_room,68,135,3 script Helper Pat 726,{
+arena_room,68,135,3 script Helper Pat 4_F_JOB_BLACKSMITH,{
mes "[Pat]";
mes "Welcome, welcome.";
mes "I am a helper of the Lv 50 arena stage.";
@@ -173,7 +173,7 @@ arena_room,68,135,3 script Helper Pat 726,{
close;
}
-arena_room,41,93,5 script Helper Ben 750,{
+arena_room,41,93,5 script Helper Ben 4_M_ALCHE_C,{
mes "[Ben]";
mes "Welcome, welcome.";
mes "I am a helper of the Lv 60 arena stage.";
@@ -212,7 +212,7 @@ arena_room,41,93,5 script Helper Ben 750,{
close;
}
-arena_room,53,49,5 script Helper Vicious 730,{
+arena_room,53,49,5 script Helper Vicious 4_M_JOB_ASSASSIN,{
mes "[Vicious]";
mes "Hey there.";
mes "My name is Vicious, I am a helper of Lv 70 arena stage.";
@@ -252,7 +252,7 @@ arena_room,53,49,5 script Helper Vicious 730,{
close;
}
-arena_room,147,49,3 script Helper Epin 727,{
+arena_room,147,49,3 script Helper Epin 4_F_JOB_HUNTER,{
mes "[Epin]";
mes "Good day,";
mes "I am a helper of Lv 80 arena stage and my name is Epin.";
@@ -296,7 +296,7 @@ arena_room,147,49,3 script Helper Epin 727,{
close;
}
-arena_room,158,93,5 script Helper Lunic 828,{
+arena_room,158,93,5 script Helper Lunic 4_M_ROGUE,{
mes "[Lunic]";
mes "Welcome to party arena stage.";
mes "I hope you will listen carefully to my introduction";
@@ -365,7 +365,7 @@ arena_room,158,93,5 script Helper Lunic 828,{
close;
}
-arena_room,158,82,1 script Helper Lonik 828,{
+arena_room,158,82,1 script Helper Lonik 4_M_ROGUE,{
emotion e_no1,0;
mes "[Lonik]";
mes "Tah dah! Here I am!";
@@ -391,7 +391,7 @@ arena_room,158,82,1 script Helper Lonik 828,{
close;
}
-sec_in02,72,180,3 script Arena Manager#arena 802,{
+sec_in02,72,180,3 script Arena Manager#arena 4_NFWISP,{
set .@i, callfunc("F_GM_NPC",1357,0);
if (.@i == -1) {
mes "[Arena Manager]";
@@ -513,7 +513,7 @@ sec_in02,72,180,3 script Arena Manager#arena 802,{
}
}
-sec_in02,79,171,3 script Reward Manager#arena 802,{
+sec_in02,79,171,3 script Reward Manager#arena 4_NFWISP,{
set .@i, callfunc("F_GM_NPC",1357,0);
if (.@i == -1) {
mes "[Reward Manager]";
@@ -546,7 +546,7 @@ sec_in02,79,171,3 script Reward Manager#arena 802,{
}
}
-arena_room,105,93,5 script Teleporter#arena 55,{
+arena_room,105,93,5 script Teleporter#arena 1_M_JOBTESTER,{
mes "[Teleporter]";
mes "I can move you to the reward arena!";
mes "Would you like to go there?";
@@ -565,7 +565,7 @@ arena_room,105,93,5 script Teleporter#arena 55,{
}
}
-prt_are_in,98,14,3 script Givu#arena 728,{
+prt_are_in,98,14,3 script Givu#arena 4_F_JOB_KNIGHT,{
if (checkweight(526,5) == 0) {
mes "- Wait a moment! -";
mes "- Currently you're carrying -";
@@ -755,10 +755,10 @@ OnKis:
emotion e_kis,0;
end;
}
-prt_are_in,1,1,5 duplicate(#arena_1039) #arena_6969 714
-prt_are_in,94,26,5 duplicate(#arena_1039) #arena_ss_2 714
-prt_are_in,100,28,3 duplicate(#arena_1039) #arena_ss_3 714
-prt_are_in,102,26,3 duplicate(#arena_1039) #arena_ss_4 714
+prt_are_in,1,1,5 duplicate(#arena_1039) #arena_6969 4_F_06
+prt_are_in,94,26,5 duplicate(#arena_1039) #arena_ss_2 4_F_06
+prt_are_in,100,28,3 duplicate(#arena_1039) #arena_ss_3 4_F_06
+prt_are_in,102,26,3 duplicate(#arena_1039) #arena_ss_4 4_F_06
prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1272 1272
prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1046 1046
prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1115 1115
@@ -766,7 +766,7 @@ prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1389 1389
prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1492 1492
prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1251 1251
prt_are_in,1,1,5 duplicate(#arena_1039) #arena_1159 1159
-prt_are_in,1,1,5 duplicate(#arena_1039) #arena_7777 811
+prt_are_in,1,1,5 duplicate(#arena_1039) #arena_7777 4_F_VALKYRIE
- script npctime#arena -1,{
OnStop:
@@ -946,7 +946,7 @@ OnTimer62000:
end;
}
-sec_in02,72,171,3 script Picture Manager#arena 802,{
+sec_in02,72,171,3 script Picture Manager#arena 4_NFWISP,{
set .@i, callfunc("F_GM_NPC",1357,0);
if (.@i == -1) {
mes "[Picture Manager]";
@@ -974,7 +974,7 @@ sec_in02,72,171,3 script Picture Manager#arena 802,{
}
}
-sec_in02,76,176,5 script Live Broadcast#arena 802,{
+sec_in02,76,176,5 script Live Broadcast#arena 4_NFWISP,{
callfunc "F_GM_NPC";
mes "[Live Broadcast]";
mes "Currently there are "+getmapusers("force_1-1")+" people in Lv 50s map.";
diff --git a/npc/other/auction.txt b/npc/other/auction.txt
index e26ae6496..fc9342635 100644
--- a/npc/other/auction.txt
+++ b/npc/other/auction.txt
@@ -16,19 +16,19 @@
// Auction House warpers
//============================================================
-moc_ruins,78,173,6 script Auction Hall Guide#moc 98,{
+moc_ruins,78,173,6 script Auction Hall Guide#moc 4W_M_02,{
callfunc "F_AuctionWarper",1;
}
-prontera,218,120,4 script Auction Hall Guide#prt 117,{
+prontera,218,120,4 script Auction Hall Guide#prt 4_F_KAFRA1,{
callfunc "F_AuctionWarper",2;
}
-yuno,129,116,0 script Auction Hall Guide#yuno 90,{
+yuno,129,116,0 script Auction Hall Guide#yuno 4_F_01,{
callfunc "F_AuctionWarper",3;
}
-lighthalzen,205,169,6 script Auction Hall Guide#lhz 833,{
+lighthalzen,205,169,6 script Auction Hall Guide#lhz 4_M_ZONDAOYAJI,{
callfunc "F_AuctionWarper",4;
}
@@ -77,10 +77,10 @@ function script F_AuctionWarper {
close;
}
-moc_ruins,76,176,6 duplicate(AuctionSign) Information Post#moc 837
-prontera,216,120,4 duplicate(AuctionSign) Information Post#prt 837
-yuno,131,116,0 duplicate(AuctionSign) Information Post#yuno 837
-lighthalzen,207,169,6 duplicate(AuctionSign) Information Post#lhz 837
+moc_ruins,76,176,6 duplicate(AuctionSign) Information Post#moc 2_BULLETIN_BOARD
+prontera,216,120,4 duplicate(AuctionSign) Information Post#prt 2_BULLETIN_BOARD
+yuno,131,116,0 duplicate(AuctionSign) Information Post#yuno 2_BULLETIN_BOARD
+lighthalzen,207,169,6 duplicate(AuctionSign) Information Post#lhz 2_BULLETIN_BOARD
// Warps
//============================================================
@@ -114,17 +114,17 @@ auction_02,43,17,0 warp auction_enterance_lhz 1,1,lighthalzen,209,169
close;
}
-auction_01,182,68,6 duplicate(AuctionBroker) Auction Broker#moc1 98
-auction_01,182,75,0 duplicate(AuctionBroker) Auction Broker#moc2 99
-auction_01,177,75,2 duplicate(AuctionBroker) Auction Broker#moc3 98
-auction_01,177,68,4 duplicate(AuctionBroker) Auction Broker#moc4 99
-auction_01,21,74,4 duplicate(AuctionBroker) Auction Broker#prt1 117
-auction_01,27,78,4 duplicate(AuctionBroker) Auction Broker#prt2 116
-auction_01,16,78,4 duplicate(AuctionBroker) Auction Broker#prt3 115
-auction_02,158,47,6 duplicate(AuctionBroker) Auction Broker#yuno1 90
-auction_02,145,47,2 duplicate(AuctionBroker) Auction Broker#yuno2 90
-auction_02,151,54,0 duplicate(AuctionBroker) Auction Broker#yuno3 90
-auction_02,152,41,4 duplicate(AuctionBroker) Auction Broker#yuno4 90
-auction_02,57,46,2 duplicate(AuctionBroker) Auction Broker#lhz1 874
-auction_02,31,46,6 duplicate(AuctionBroker) Auction Broker#lhz2 874
-auction_02,43,65,4 duplicate(AuctionBroker) Auction Broker#lhz3 833
+auction_01,182,68,6 duplicate(AuctionBroker) Auction Broker#moc1 4W_M_02
+auction_01,182,75,0 duplicate(AuctionBroker) Auction Broker#moc2 4W_M_03
+auction_01,177,75,2 duplicate(AuctionBroker) Auction Broker#moc3 4W_M_02
+auction_01,177,68,4 duplicate(AuctionBroker) Auction Broker#moc4 4W_M_03
+auction_01,21,74,4 duplicate(AuctionBroker) Auction Broker#prt1 4_F_KAFRA1
+auction_01,27,78,4 duplicate(AuctionBroker) Auction Broker#prt2 4_F_KAFRA2
+auction_01,16,78,4 duplicate(AuctionBroker) Auction Broker#prt3 4_F_KAFRA3
+auction_02,158,47,6 duplicate(AuctionBroker) Auction Broker#yuno1 4_F_01
+auction_02,145,47,2 duplicate(AuctionBroker) Auction Broker#yuno2 4_F_01
+auction_02,151,54,0 duplicate(AuctionBroker) Auction Broker#yuno3 4_F_01
+auction_02,152,41,4 duplicate(AuctionBroker) Auction Broker#yuno4 4_F_01
+auction_02,57,46,2 duplicate(AuctionBroker) Auction Broker#lhz1 4_M_ZONDAMAN
+auction_02,31,46,6 duplicate(AuctionBroker) Auction Broker#lhz2 4_M_ZONDAMAN
+auction_02,43,65,4 duplicate(AuctionBroker) Auction Broker#lhz3 4_M_ZONDAOYAJI
diff --git a/npc/other/books.txt b/npc/other/books.txt
index aa32a6520..2b6df3654 100644
--- a/npc/other/books.txt
+++ b/npc/other/books.txt
@@ -12,7 +12,7 @@
//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
-prt_in,168,56,4 script Monster Encyclopedia#prt 111,{
+prt_in,168,56,4 script Monster Encyclopedia#prt HIDDEN_NPC,{
mes "^FF0000[Monster Encyclopedia]^000000";
mes "This is a Monster Encyclopedia";
mes "containing information on Water,";
@@ -392,7 +392,7 @@ prt_in,168,56,4 script Monster Encyclopedia#prt 111,{
}
}
-prt_in,159,56,4 script Monster Encyclopedia#2pr 111,{
+prt_in,159,56,4 script Monster Encyclopedia#2pr HIDDEN_NPC,{
mes "^FF0000[Monster Encyclopedia]^000000";
mes "This is a Monster Encyclopedia";
mes "containing information on Earth,";
@@ -1239,7 +1239,7 @@ prt_in,161,50,4 script Monster Encyclopedia#3pr 111,{
}
}
-prt_in,172,96,4 script Monster Encyclopedia#4pr 111,{
+prt_in,172,96,4 script Monster Encyclopedia#4pr HIDDEN_NPC,{
mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
mes "This is an Encyclopedia describing";
mes "monsters living in Dungeons.";
@@ -1721,7 +1721,7 @@ prt_in,172,96,4 script Monster Encyclopedia#4pr 111,{
}
-prt_in,164,96,4 script Monster Encyclopedia#5pr 111,{
+prt_in,164,96,4 script Monster Encyclopedia#5pr HIDDEN_NPC,{
mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
mes "This is an Encyclopedia describing";
mes "Monsters living in Dungeons.";
@@ -2299,7 +2299,7 @@ prt_in,164,96,4 script Monster Encyclopedia#5pr 111,{
}
}
-prt_in,172,102,4 script Monster Encyclopedia#6pr 111,{
+prt_in,172,102,4 script Monster Encyclopedia#6pr HIDDEN_NPC,{
mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
mes "This is an Encyclopedia describing";
mes "Monsters living in Dungeons.";
@@ -2807,7 +2807,7 @@ prt_in,172,102,4 script Monster Encyclopedia#6pr 111,{
}
}
-prt_in,164,102,4 script Monster Encyclopedia#7pr 111,{
+prt_in,164,102,4 script Monster Encyclopedia#7pr HIDDEN_NPC,{
mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
mes "This is an Encyclopedia describing";
mes "Monsters living in Dungeons.";
@@ -3452,7 +3452,7 @@ prt_in,164,102,4 script Monster Encyclopedia#7pr 111,{
}
}
-prt_in,162,68,4 script Vending Guide#pront 111,{
+prt_in,162,68,4 script Vending Guide#pront HIDDEN_NPC,{
mes "^FF0000[Vending Guide for Dummies]^000000";
mes "So you want to open your own shop";
mes "so that you can sell items to other";
@@ -3549,7 +3549,7 @@ prt_in,162,68,4 script Vending Guide#pront 111,{
close;
}
-prt_in,168,68,4 script Blacksmith Guide#pront 111,{
+prt_in,168,68,4 script Blacksmith Guide#pront HIDDEN_NPC,{
mes "^FF0000[Blacksmith Guide for Dummies]^000000";
mes "This is a useful guide detailing";
mes "the process of Ore Refining and";
diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt
index 2004609d8..7c1d4d0e3 100644
--- a/npc/other/bulletin_boards.txt
+++ b/npc/other/bulletin_boards.txt
@@ -23,7 +23,7 @@
//= 1.9 Moved Izlude NPC to Pre-RE path. [Euphy]
//============================================================
-alberta,111,59,5 script Bulletin Board#1 837,{
+alberta,111,59,5 script Bulletin Board#1 2_BULLETIN_BOARD,{
mes "[Alberta: The Port City]";
mes "Welcome to Alberta, the Port City.";
next;
@@ -48,7 +48,7 @@ alberta,111,59,5 script Bulletin Board#1 837,{
close;
}
-geffen,124,65,5 script Bulletin Board#2 837,{
+geffen,124,65,5 script Bulletin Board#2 2_BULLETIN_BOARD,{
mes "[Geffen: The City of Magic]";
mes "Welcome to Geffen, the City of Magic. Geffen is well known for its various legends related to magic.";
next;
@@ -66,7 +66,7 @@ geffen,124,65,5 script Bulletin Board#2 837,{
close;
}
-gef_fild10,69,340,5 script Bulletin Board#3 837,{
+gef_fild10,69,340,5 script Bulletin Board#3 2_BULLETIN_BOARD,{
mes "[Orc Dungeon]";
mes "^6B1312Caution!^000000";
mes "The Orc Dungeon is comprised of 2 levels. Although not very strong individually, the monsters here attack in groups. Be careful.";
@@ -82,7 +82,7 @@ gef_fild10,69,340,5 script Bulletin Board#3 837,{
close;
}
-izlu2dun,104,92,5 script Bulletin Board#4 837,{
+izlu2dun,104,92,5 script Bulletin Board#4 2_BULLETIN_BOARD,{
mes "[Byalan Island]";
mes "^6B1312Caution!^000000";
mes "The Izlude dungeon is comprised of 5 levels. The first few levels are suited for newer adventurers.";
@@ -95,7 +95,7 @@ izlu2dun,104,92,5 script Bulletin Board#4 837,{
close;
}
-payon,178,108,5 script Bulletin Board#06 837,{
+payon,178,108,5 script Bulletin Board#06 2_BULLETIN_BOARD,{
mes "[Payon: The Mountain City]";
mes "Welcome to Payon, the mountain city. Payon has recently been renovated, so we hope you enjoy the clean, nice streets and buildings.";
next;
@@ -117,7 +117,7 @@ payon,178,108,5 script Bulletin Board#06 837,{
close;
}
-pay_arche,79,31,5 script Bulletin Board#07 837,{
+pay_arche,79,31,5 script Bulletin Board#07 2_BULLETIN_BOARD,{
mes "[Archer Village]";
mes "Welcome to the Payon Archer Village where Novices can change their jobs to Archer.";
next;
@@ -129,7 +129,7 @@ pay_arche,79,31,5 script Bulletin Board#07 837,{
close;
}
-pay_arche,39,134,5 script Bulletin Board#08 837,{
+pay_arche,39,134,5 script Bulletin Board#08 2_BULLETIN_BOARD,{
mes "[Payon Cave]";
mes "^6B1312Caution!^000000";
mes "Payon Cave consists of 5 levels full of Undead and Demon monsters. Beware of swarms of Hydra in the third and fourth levels.";
@@ -139,7 +139,7 @@ pay_arche,39,134,5 script Bulletin Board#08 837,{
close;
}
-prontera,148,49,5 script Bulletin Board#09 837,{
+prontera,148,49,5 script Bulletin Board#09 2_BULLETIN_BOARD,{
mes "[Prontera: Capital of the]";
mes "[Rune-Midgards Kingdom]";
mes "Welcome to Prontera, the capital city of Rune-Midgard.";
@@ -171,7 +171,7 @@ prontera,148,49,5 script Bulletin Board#09 837,{
close;
}
-mjolnir_02,76,362,5 script Bulletin Board#10 837,{
+mjolnir_02,76,362,5 script Bulletin Board#10 2_BULLETIN_BOARD,{
mes "[Coal Mine]";
mes "^6B1312Caution!^000000";
mes "The Coal Mine consists of a total of 3 levels. This dungeon is suited to both new and experienced adventurers, depending on the dungeon level.";
@@ -181,7 +181,7 @@ mjolnir_02,76,362,5 script Bulletin Board#10 837,{
close;
}
-morocc,152,110,5 script Bulletin Board#11 837,{
+morocc,152,110,5 script Bulletin Board#11 2_BULLETIN_BOARD,{
mes "[Morroc: The Frontier Town]";
mes "Welcome to Morroc, the City of the Desert. Morroc was built on an oasis, so this town can accomodate its many visitors and travelers.";
next;
@@ -196,7 +196,7 @@ morocc,152,110,5 script Bulletin Board#11 837,{
close;
}
-comodo,210,148,5 script Bulletin Board#12 837,{
+comodo,210,148,5 script Bulletin Board#12 2_BULLETIN_BOARD,{
mes "[Comodo: The Beach City]";
mes "Welcome! This town of Comodo is";
mes "surrounded by many ancient relics";
@@ -240,7 +240,7 @@ comodo,210,148,5 script Bulletin Board#12 837,{
close;
}
-umbala,137,94,5 script Bulletin Board#13 837,{
+umbala,137,94,5 script Bulletin Board#13 2_BULLETIN_BOARD,{
mes "[Umbala: The Utan Village]";
mes "Welcome to Umbala,";
mes "the village of the Utan tribe.";
@@ -272,7 +272,7 @@ umbala,137,94,5 script Bulletin Board#13 837,{
close;
}
-gef_fild09,227,29,4 script Bulletin Board::OrcsBoard 835,{
+gef_fild09,227,29,4 script Bulletin Board::OrcsBoard 2_BOARD1,{
mes "[Orc Village]";
mes "^6B1312Caution!^000000";
mes "Beyond this point";
@@ -287,9 +287,9 @@ gef_fild09,227,29,4 script Bulletin Board::OrcsBoard 835,{
close;
}
-gef_fild13,202,31,5 duplicate(OrcsBoard) Bulletin Board#orc1 835
+gef_fild13,202,31,5 duplicate(OrcsBoard) Bulletin Board#orc1 2_BOARD1
-gef_fild13,29,206,5 script Bulletin Board::KoboldsBoard 836,{
+gef_fild13,29,206,5 script Bulletin Board::KoboldsBoard 2_BOARD2,{
mes "[Kobold Village]";
mes "^6B1312Caution!^000000";
@@ -298,9 +298,9 @@ gef_fild13,29,206,5 script Bulletin Board::KoboldsBoard 836,{
close;
}
-gef_fild08,211,24,5 duplicate(KoboldsBoard) Bulletin Board#kb1 836
+gef_fild08,211,24,5 duplicate(KoboldsBoard) Bulletin Board#kb1 2_BOARD2
-gef_fild10,109,23,5 script Bulletin Board#15 836,{
+gef_fild10,109,23,5 script Bulletin Board#15 2_BOARD2,{
mes "[Goblin Village]";
mes "^6B1312Caution!^000000";
@@ -309,7 +309,7 @@ gef_fild10,109,23,5 script Bulletin Board#15 836,{
close;
}
-prt_fild05,278,220,5 script Bulletin Board#16 837,{
+prt_fild05,278,220,5 script Bulletin Board#16 2_BULLETIN_BOARD,{
mes "[Culvert]";
mes "Culvert is comprised of a total of";
mes "4 levels, and is a good training";
@@ -332,7 +332,7 @@ prt_fild05,278,220,5 script Bulletin Board#16 837,{
close;
}
-yuno,154,112,5 script Bulletin Board#17 837,{
+yuno,154,112,5 script Bulletin Board#17 2_BULLETIN_BOARD,{
mes "[Juno: Capital of]";
mes "[The Schwarzwald Republic]";
mes "Welcome to Juno, the City of Sages.";
@@ -375,7 +375,7 @@ yuno,154,112,5 script Bulletin Board#17 837,{
close;
}
-aldebaran,145,105,5 script Bulletin Board#18 837,{
+aldebaran,145,105,5 script Bulletin Board#18 2_BULLETIN_BOARD,{
mes "[Al De Baran: The Border City]";
mes "Welcome to Al De Baran, the border";
mes "city of the Rune-Midgarts Kingdom.";
@@ -406,7 +406,7 @@ aldebaran,145,105,5 script Bulletin Board#18 837,{
close;
}
-aldebaran,136,133,5 script Bulletin Board#19 837,{
+aldebaran,136,133,5 script Bulletin Board#19 2_BULLETIN_BOARD,{
mes "[Clock Tower]";
mes "^6B1312Caution!^000000";
mes "Only well-experienced adventurers";
@@ -428,7 +428,7 @@ aldebaran,136,133,5 script Bulletin Board#19 837,{
close;
}
-moc_fild19,107,101,5 script Bulletin Board#20 837,{
+moc_fild19,107,101,5 script Bulletin Board#20 2_BULLETIN_BOARD,{
mes "[Sphinx]";
mes "^6B1312Caution!^000000";
mes "The Sphinx consists of 5 levels.";
@@ -449,7 +449,7 @@ moc_fild19,107,101,5 script Bulletin Board#20 837,{
close;
}
-gef_tower,55,142,5 script Bulletin Board#21 837,{
+gef_tower,55,142,5 script Bulletin Board#21 2_BULLETIN_BOARD,{
mes "[Geffen Dungeon]";
mes "^6B1312Caution!^000000";
mes "Geffen dungeon is consisted of 3 levels";
@@ -466,7 +466,7 @@ gef_tower,55,142,5 script Bulletin Board#21 837,{
close;
}
-xmas_fild01,75,80,5 script Bulletin Board#22 837,{
+xmas_fild01,75,80,5 script Bulletin Board#22 2_BULLETIN_BOARD,{
mes "[Winter Town, Lutie]";
mes "Welcome to Lutie, the town of snowfall.";
mes "Manufacturing toys in the toy factory is the main";
@@ -481,7 +481,7 @@ xmas_fild01,75,80,5 script Bulletin Board#22 837,{
close;
}
-xmas,147,311,5 script Bulletin Board#23 837,{
+xmas,147,311,5 script Bulletin Board#23 2_BULLETIN_BOARD,{
mes "[Toy Factory]";
mes "^6B1312Caution!^000000";
mes "Toy Factory is consisting of 2 levels.";
@@ -496,7 +496,7 @@ xmas,147,311,5 script Bulletin Board#23 837,{
close;
}
-yuno_fild03,37,143,5 script Bulletin Board#24 837,{
+yuno_fild03,37,143,5 script Bulletin Board#24 2_BULLETIN_BOARD,{
mes "[The Magma Dungeon, Nogg Road]";
mes "^6B1312Caution!^000000";
mes "Nogg Road is filled with very dangerous creatures.";
@@ -509,7 +509,7 @@ yuno_fild03,37,143,5 script Bulletin Board#24 837,{
close;
}
-niflheim,200,191,5 script Bulletin Board#25 837,{
+niflheim,200,191,5 script Bulletin Board#25 2_BULLETIN_BOARD,{
mes "[City of the Dead, Nifflheim]";
mes "Welcome to Nifflheim, the City of the Dead.";
mes "Nifflheim was known as the other world where";
@@ -534,7 +534,7 @@ niflheim,200,191,5 script Bulletin Board#25 837,{
}
/*
-moc_fild15,267,264,5 script Bulletin Board#26 837,{
+moc_fild15,267,264,5 script Bulletin Board#26 2_BULLETIN_BOARD,{
mes "[Ant Hell]";
mes "^6B1312Caution!^000000";
mes "Ant Hell is consisting of 2 levels.";
@@ -550,7 +550,7 @@ moc_fild15,267,264,5 script Bulletin Board#26 837,{
}
*/
-moc_ruins,61,164,5 script Bulletin Board#27 837,{
+moc_ruins,61,164,5 script Bulletin Board#27 2_BULLETIN_BOARD,{
mes "[Pyramids]";
mes "^6B1312Caution!^000000";
mes "Pyramids is consisting of total 7 levels as 4 levels on the earth and the rest under the ground.";
@@ -563,7 +563,7 @@ moc_ruins,61,164,5 script Bulletin Board#27 837,{
close;
}
-glast_01,369,308,5 script Bulletin Board#28 837,{
+glast_01,369,308,5 script Bulletin Board#28 2_BULLETIN_BOARD,{
mes "[Glast Heim]";
mes "Glast Heim is an enormous dungeon with countless levels.";
mes "This dungeon is definately not for new or experienced adventurers";
diff --git a/npc/other/card_trader.txt b/npc/other/card_trader.txt
index 068b0644f..40484bbdd 100644
--- a/npc/other/card_trader.txt
+++ b/npc/other/card_trader.txt
@@ -14,7 +14,7 @@
//= 1.4 Variables don't need to load OnInit. [Euphy]
//============================================================
-prontera,115,90,0 script Putty 90,{
+prontera,115,90,0 script Putty 4_F_01,{
if (!.card[1]) {
setarray .card1[0], 4001,4006,4009,4019,4075,4033,4012,4016,4026,4022,
4027,4028,4038,4025,4021,4050,4079,4081,4090,4094,
diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt
index 54991dcd8..548e1e68d 100644
--- a/npc/other/comodo_gambling.txt
+++ b/npc/other/comodo_gambling.txt
@@ -24,7 +24,7 @@
//= 1.4a Minor script updates. [Euphy]
//============================================================
-comodo,219,158,6 script Kachua 91,{
+comodo,219,158,6 script Kachua 4_F_02,{
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
@@ -392,7 +392,7 @@ comodo,219,158,6 script Kachua 91,{
end;
}
-comodo,204,148,7 script Devellin 90,{
+comodo,204,148,7 script Devellin 4_F_01,{
mes "[Devellin]";
mes "It seems some traveller showed";
@@ -406,7 +406,7 @@ comodo,204,148,7 script Devellin 90,{
close;
}
-comodo,210,154,2 script Suspicious Guy#cmd 118,{
+comodo,210,154,2 script Suspicious Guy#cmd 2_M_THIEFMASTER,{
if (BaseClass == Job_Thief){
mes "[Cain]";
@@ -489,7 +489,7 @@ comodo,210,154,2 script Suspicious Guy#cmd 118,{
}
}
-mjolnir_02,85,362,3 script Blacksmith Miner 726,{
+mjolnir_02,85,362,3 script Blacksmith Miner 4_F_JOB_BLACKSMITH,{
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt
index 571660f1b..ef10f9734 100644
--- a/npc/other/divorce.txt
+++ b/npc/other/divorce.txt
@@ -22,7 +22,7 @@
//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-nif_in,190,112,5 script Deviruchi#divorce 738,{
+nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{
mes "[Deviruchi]";
// if (wedding_sign == 0) {
// mes "Heh heh...";
diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt
index 946b40756..8b865577c 100644
--- a/npc/other/fortune.txt
+++ b/npc/other/fortune.txt
@@ -11,7 +11,7 @@
//= 1.0 First version. [L0ne_W0lf]
//============================================================
-payon_in03,117,128,5 script Fortune Teller 704,{
+payon_in03,117,128,5 script Fortune Teller 4_M_BIBI,{
mes "[Lhimetorra]";
mes "You're an adventurer of this world... " +strcharinfo(0)+ ", right? So, what can an old person like me do for you?";
next;
@@ -2731,7 +2731,7 @@ payon_in03,117,128,5 script Fortune Teller 704,{
}
}
-payon_in03,75,129,5 script Poring Fortune Teller 704,{
+payon_in03,75,129,5 script Poring Fortune Teller 4_M_BIBI,{
mes "[Chocarle]";
mes " Welcome, welcome~!! " +strcharinfo(0)+ "~!";
mes " What brings you here today!? ";
@@ -3524,7 +3524,7 @@ payon_in03,75,129,5 script Poring Fortune Teller 704,{
close;
}
-payon_in03,118,119,1 script Ascetic 101,2,2,{
+payon_in03,118,119,1 script Ascetic 4W_F_01,2,2,{
mes "[Kissy-Kissy]";
mes "NyangNyangNyang~";
mes "NyaNyangNyaNyag~";
diff --git a/npc/other/guildpvp.txt b/npc/other/guildpvp.txt
index cad076237..33ba49e47 100644
--- a/npc/other/guildpvp.txt
+++ b/npc/other/guildpvp.txt
@@ -12,7 +12,7 @@
//= 1.1 Optimized. [Euphy]
//============================================================
-pvp_y_room,77,85,4 script Guild Battle Guide 105,{
+pvp_y_room,77,85,4 script Guild Battle Guide 8W_SOLDIER,{
setarray .@map1X[1],7,9,16,8,20;
setarray .@map2X[1],91,90,83,91,79;
diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt
index d451b8e90..3f15debc1 100644
--- a/npc/other/gympass.txt
+++ b/npc/other/gympass.txt
@@ -15,7 +15,7 @@
//= 1.3 Updated script, and fixed potential errors. [L0ne_W0lf]
//============================================================
-payon,173,141,4 script Ripped Cabus#GymPass 899,{
+payon,173,141,4 script Ripped Cabus#GymPass 4_M_HUMAN_02,{
mes "[Ripped]";
mes "Hey, there. People aren't";
mes "as physically active as they";
diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index 23ef06b93..2bd8f1d55 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -20,7 +20,7 @@
//= 1.9 Some optimization/standardization. [Euphy]
//============================================================
-que_bingo,48,84,5 script Bingo Waiting Room 124,{
+que_bingo,48,84,5 script Bingo Waiting Room 4_F_TELEPORTER,{
end;
OnInit:
@@ -43,7 +43,7 @@ OnStart:
end;
}
-que_bingo,49,125,0 script plate1#bingo 139,1,1,{
+que_bingo,49,125,0 script plate1#bingo HIDDEN_WARP_NPC,1,1,{
OnInit:
disablenpc "plate1#bingo";
@@ -102,12 +102,12 @@ L_Fill:
goto L_Fill;
}
-que_bingo,53,121,0 duplicate(plate1#bingo) plate2#bingo 139,1,1
-que_bingo,51,116,0 duplicate(plate1#bingo) plate3#bingo 139,1,1
-que_bingo,46,116,0 duplicate(plate1#bingo) plate4#bingo 139,1,1
-que_bingo,45,121,0 duplicate(plate1#bingo) plate5#bingo 139,1,1
+que_bingo,53,121,0 duplicate(plate1#bingo) plate2#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(plate1#bingo) plate3#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(plate1#bingo) plate4#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(plate1#bingo) plate5#bingo HIDDEN_WARP_NPC,1,1
-que_bingo,51,51,0 script start#bingo 139,{
+que_bingo,51,51,0 script start#bingo HIDDEN_WARP_NPC,{
OnStart:
initnpctimer;
@@ -165,7 +165,7 @@ OnTimer204000:
end;
}
-que_bingo,52,52,0 script start2#bingo 139,{
+que_bingo,52,52,0 script start2#bingo HIDDEN_WARP_NPC,{
OnStop:
stopnpctimer;
@@ -499,132 +499,132 @@ OnTouch:
close;
}
-que_bingo,49,125,0 duplicate(1a#bingo) 2a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 3a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 4a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 5a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 6a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 7a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 8a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 9a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 10a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 11a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 12a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 13a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 14a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 15a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 16a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 17a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 18a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 19a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 20a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 21a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 22a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 23a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 24a#bingo 139,1,1
-que_bingo,49,125,0 duplicate(1a#bingo) 25a#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 1b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 2b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 3b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 4b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 5b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 6b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 7b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 8b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 9b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 10b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 11b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 12b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 13b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 14b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 15b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 16b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 17b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 18b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 19b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 20b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 21b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 22b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 23b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 24b#bingo 139,1,1
-que_bingo,53,121,0 duplicate(1a#bingo) 25b#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 1c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 2c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 3c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 4c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 5c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 6c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 7c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 8c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 9c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 10c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 11c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 12c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 13c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 14c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 15c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 16c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 17c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 18c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 19c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 20c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 21c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 22c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 23c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 24c#bingo 139,1,1
-que_bingo,51,116,0 duplicate(1a#bingo) 25c#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 1d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 2d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 3d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 4d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 5d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 6d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 7d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 8d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 9d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 10d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 11d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 12d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 13d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 14d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 15d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 16d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 17d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 18d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 19d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 20d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 21d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 22d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 23d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 24d#bingo 139,1,1
-que_bingo,46,116,0 duplicate(1a#bingo) 25d#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 1e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 2e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 3e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 4e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 5e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 6e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 7e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 8e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 9e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 10e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 11e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 12e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 13e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 14e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 15e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 16e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 17e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 18e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 19e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 20e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 21e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 22e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 23e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 24e#bingo 139,1,1
-que_bingo,45,121,0 duplicate(1a#bingo) 25e#bingo 139,1,1
-
-que_bingo,79,19,0 script win1a#bingo 139,4,4,{
+que_bingo,49,125,0 duplicate(1a#bingo) 2a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 3a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 4a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 5a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 6a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 7a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 8a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 9a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 10a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 11a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 12a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 13a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 14a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 15a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 16a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 17a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 18a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 19a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 20a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 21a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 22a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 23a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 24a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,49,125,0 duplicate(1a#bingo) 25a#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 1b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 2b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 3b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 4b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 5b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 6b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 7b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 8b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 9b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 10b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 11b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 12b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 13b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 14b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 15b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 16b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 17b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 18b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 19b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 20b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 21b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 22b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 23b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 24b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,53,121,0 duplicate(1a#bingo) 25b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 1c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 2c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 3c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 4c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 5c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 6c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 7c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 8c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 9c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 10c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 11c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 12c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 13c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 14c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 15c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 16c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 17c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 18c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 19c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 20c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 21c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 22c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 23c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 24c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(1a#bingo) 25c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 1d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 2d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 3d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 4d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 5d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 6d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 7d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 8d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 9d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 10d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 11d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 12d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 13d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 14d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 15d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 16d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 17d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 18d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 19d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 20d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 21d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 22d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 23d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 24d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(1a#bingo) 25d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 1e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 2e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 3e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 4e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 5e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 6e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 7e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 8e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 9e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 10e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 11e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 12e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 13e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 14e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 15e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 16e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 17e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 18e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 19e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 20e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 21e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 22e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 23e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 24e#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(1a#bingo) 25e#bingo HIDDEN_WARP_NPC,1,1
+
+que_bingo,79,19,0 script win1a#bingo HIDDEN_WARP_NPC,4,4,{
end;
OnWin:
@@ -641,7 +641,7 @@ OnTimer1000:
end;
}
-que_bingo,49,125,0 script win2a#bingo 139,1,1,{
+que_bingo,49,125,0 script win2a#bingo HIDDEN_WARP_NPC,1,1,{
end;
OnInit:
@@ -686,12 +686,12 @@ OnTimer20000:
end;
}
-que_bingo,53,121,0 duplicate(win2a#bingo) win2b#bingo 139,1,1
-que_bingo,51,116,0 duplicate(win2a#bingo) win2c#bingo 139,1,1
-que_bingo,46,116,0 duplicate(win2a#bingo) win2d#bingo 139,1,1
-que_bingo,45,121,0 duplicate(win2a#bingo) win2e#bingo 139,1,1
+que_bingo,53,121,0 duplicate(win2a#bingo) win2b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(win2a#bingo) win2c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(win2a#bingo) win2d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(win2a#bingo) win2e#bingo HIDDEN_WARP_NPC,1,1
-que_bingo,89,59,0 script end#bingo 139,4,4,{
+que_bingo,89,59,0 script end#bingo HIDDEN_WARP_NPC,4,4,{
end;
OnEnd:
@@ -718,7 +718,7 @@ OnTimer5000:
end;
}
-que_bingo,49,125,0 script end1a#bingo 139,1,1,{
+que_bingo,49,125,0 script end1a#bingo HIDDEN_WARP_NPC,1,1,{
OnInit:
disablenpc "end1a#bingo";
@@ -734,12 +734,12 @@ OnTouch:
end;
}
-que_bingo,53,121,0 duplicate(end1a#bingo) end1b#bingo 139,1,1
-que_bingo,51,116,0 duplicate(end1a#bingo) end1c#bingo 139,1,1
-que_bingo,46,116,0 duplicate(end1a#bingo) end1d#bingo 139,1,1
-que_bingo,45,121,0 duplicate(end1a#bingo) end1e#bingo 139,1,1
+que_bingo,53,121,0 duplicate(end1a#bingo) end1b#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,51,116,0 duplicate(end1a#bingo) end1c#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,46,116,0 duplicate(end1a#bingo) end1d#bingo HIDDEN_WARP_NPC,1,1
+que_bingo,45,121,0 duplicate(end1a#bingo) end1e#bingo HIDDEN_WARP_NPC,1,1
-que_bingo,50,138,1 script out3#bingo 139,5,8,{
+que_bingo,50,138,1 script out3#bingo HIDDEN_WARP_NPC,5,8,{
OnInit:
disablenpc "out3#bingo";
@@ -750,7 +750,7 @@ OnTouch:
end;
}
-que_bingo,49,136,0 script go3#bingo 45,1,1,{
+que_bingo,49,136,0 script go3#bingo WARPNPC,1,1,{
OnTouch:
switch($@hu_bingob) {
@@ -872,16 +872,16 @@ function script Func_BingoResult {
end;
}
-que_bingo,49,31,4 script Arcade Helper#1 47,{
+que_bingo,49,31,4 script Arcade Helper#1 1_M_01,{
mes "[Helper]";
mes "If you'd like to play";
mes "a game of bingo, then";
mes "please proceed this way.";
close;
}
-que_bingo,42,31,4 duplicate(Arcade Helper#1) Arcade Helper#2 66
+que_bingo,42,31,4 duplicate(Arcade Helper#1) Arcade Helper#2 1_F_01
-que_bingo,54,17,5 script Arcade Owner 712,{
+que_bingo,54,17,5 script Arcade Owner 4_M_05,{
mes "[Arcade Owner]";
mes "Welcome to the";
mes "Bingo Game Arcade.";
diff --git a/npc/other/mail.txt b/npc/other/mail.txt
index 5c3eadd3a..658337a98 100644
--- a/npc/other/mail.txt
+++ b/npc/other/mail.txt
@@ -51,87 +51,87 @@
// Prontera
//============================================================
-prontera,146,86,0 duplicate(MailBox) Mailbox#prt 888
-prontera,275,213,0 duplicate(MailBox) Mailbox#2prt 888
-prontera,34,212,0 duplicate(MailBox) Mailbox#3prt 888
+prontera,146,86,0 duplicate(MailBox) Mailbox#prt 2_POSTBOX
+prontera,275,213,0 duplicate(MailBox) Mailbox#2prt 2_POSTBOX
+prontera,34,212,0 duplicate(MailBox) Mailbox#3prt 2_POSTBOX
// Izlude
//============================================================
-izlude,136,94,0 duplicate(MailBox) Mailbox#iz 888
+izlude,136,94,0 duplicate(MailBox) Mailbox#iz 2_POSTBOX
// Morroc
//============================================================
-moc_ruins,72,166,0 duplicate(MailBox) Mailbox#1moc 888
-moc_ruins,156,52,0 duplicate(MailBox) Mailbox#2moc 888
+moc_ruins,72,166,0 duplicate(MailBox) Mailbox#1moc 2_POSTBOX
+moc_ruins,156,52,0 duplicate(MailBox) Mailbox#2moc 2_POSTBOX
// Geffen
//============================================================
-geffen,115,67,0 duplicate(MailBox) Mailbox#gef 888
-geffen,199,125,0 duplicate(MailBox) Mailbox#2gef 888
+geffen,115,67,0 duplicate(MailBox) Mailbox#gef 2_POSTBOX
+geffen,199,125,0 duplicate(MailBox) Mailbox#2gef 2_POSTBOX
// Payon
//============================================================
-payon,191,104,0 duplicate(MailBox) Mailbox#pay 888
-payon,171,226,0 duplicate(MailBox) Mailbox#2pay 888
-pay_arche,55,127,0 duplicate(MailBox) Mailbox#3pay 888
+payon,191,104,0 duplicate(MailBox) Mailbox#pay 2_POSTBOX
+payon,171,226,0 duplicate(MailBox) Mailbox#2pay 2_POSTBOX
+pay_arche,55,127,0 duplicate(MailBox) Mailbox#3pay 2_POSTBOX
// Alberta
//============================================================
-alberta,90,60,0 duplicate(MailBox) Mailbox#alb 888
-alberta,30,240,0 duplicate(MailBox) Mailbox#2alb 888
+alberta,90,60,0 duplicate(MailBox) Mailbox#alb 2_POSTBOX
+alberta,30,240,0 duplicate(MailBox) Mailbox#2alb 2_POSTBOX
// Al De Baran
//============================================================
-aldebaran,135,122,0 duplicate(MailBox) Mailbox#alde 888
+aldebaran,135,122,0 duplicate(MailBox) Mailbox#alde 2_POSTBOX
// Juno
//============================================================
-yuno,148,187,0 duplicate(MailBox) Mailbox#yuno 888
-yuno,332,108,0 duplicate(MailBox) Mailbox#2yuno 888
+yuno,148,187,0 duplicate(MailBox) Mailbox#yuno 2_POSTBOX
+yuno,332,108,0 duplicate(MailBox) Mailbox#2yuno 2_POSTBOX
// Lightalzen
//============================================================
-lighthalzen,164,85,0 duplicate(MailBox) Mailbox#lht 888
-lighthalzen,196,320,0 duplicate(MailBox) Mailbox#2lht 888
+lighthalzen,164,85,0 duplicate(MailBox) Mailbox#lht 2_POSTBOX
+lighthalzen,196,320,0 duplicate(MailBox) Mailbox#2lht 2_POSTBOX
// Einbroch and Einbech
//============================================================
-einbroch,231,215,0 duplicate(MailBox) Mailbox#ein 888
-einbroch,77,202,0 duplicate(MailBox) Mailbox#2ein 888
-einbech,182,124,0 duplicate(MailBox) Mailbox#3ein 888
+einbroch,231,215,0 duplicate(MailBox) Mailbox#ein 2_POSTBOX
+einbroch,77,202,0 duplicate(MailBox) Mailbox#2ein 2_POSTBOX
+einbech,182,124,0 duplicate(MailBox) Mailbox#3ein 2_POSTBOX
// Comodo
//============================================================
-comodo,200,150,0 duplicate(MailBox) Mailbox#cmd 888
+comodo,200,150,0 duplicate(MailBox) Mailbox#cmd 2_POSTBOX
// Umbala
//============================================================
-umbala,104,155,0 duplicate(MailBox) Mailbox#um 888
+umbala,104,155,0 duplicate(MailBox) Mailbox#um 2_POSTBOX
// Amatsu
//============================================================
-amatsu,102,146,0 duplicate(MailBox) Mailbox#ama 888
+amatsu,102,146,0 duplicate(MailBox) Mailbox#ama 2_POSTBOX
// Gonryun
//============================================================
-gonryun,152,117,0 duplicate(MailBox) Mailbox#gon 888
+gonryun,152,117,0 duplicate(MailBox) Mailbox#gon 2_POSTBOX
// Ayothaya
//============================================================
-ayothaya,205,169,0 duplicate(MailBox) Mailbox#ayo 888
+ayothaya,205,169,0 duplicate(MailBox) Mailbox#ayo 2_POSTBOX
// Louyang
//============================================================
-louyang,204,100,0 duplicate(MailBox) Mailbox#lou 888
+louyang,204,100,0 duplicate(MailBox) Mailbox#lou 2_POSTBOX
// Hugel
//============================================================
-hugel,86,168,0 duplicate(MailBox) Mailbox#hu 111
+hugel,86,168,0 duplicate(MailBox) Mailbox#hu HIDDEN_NPC
// Rachel
//============================================================
-rachel,122,146,0 duplicate(MailBox) Post Box#ra 888
+rachel,122,146,0 duplicate(MailBox) Post Box#ra 2_POSTBOX
// Veins
//============================================================
-veins,218,123,0 duplicate(MailBox) Post Box#ve 888
+veins,218,123,0 duplicate(MailBox) Post Box#ve 2_POSTBOX
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index 88dcabad7..c8ffb0a5d 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -22,7 +22,7 @@
//= 1.4 Added GM management function. [Euphy]
//============================================================
-prt_church,97,100,4 script Wedding Staff#w 71,{
+prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{
cutin "wedding_marry01",2;
if (Upper == 2) {
mes "[Marry Happy]";
@@ -444,7 +444,7 @@ L_End:
end;
}
-prt_church,97,102,0 script Single Army#Prontera 105,{
+prt_church,97,102,0 script Single Army#Prontera 8W_SOLDIER,{
mes "[Single Army]";
mes "^CC9933You have to refine";
mes "items on your own to";
@@ -461,7 +461,7 @@ OnEnable:
end;
}
-prt_church,98,102,0 script Single Army#Geffen 705,{
+prt_church,98,102,0 script Single Army#Geffen 4_M_GEF_SOLDIER,{
mes "[Single Army]";
mes "^330099It's a waste to";
mes "form parties in";
@@ -479,7 +479,7 @@ OnEnable:
end;
}
-prt_church,99,102,0 script Single Army#Morocc 707,{
+prt_church,99,102,0 script Single Army#Morocc 4_M_MOC_SOLDIER,{
mes "[Single Army]";
mes "^666666Hell, I've trained";
mes "all by myself since";
@@ -497,7 +497,7 @@ OnEnable:
end;
}
-prt_church,100,102,0 script Single Army#Payon 708,{
+prt_church,100,102,0 script Single Army#Payon 4_M_PAY_SOLDIER,{
mes "[Single Army]";
mes "^666600I CHOOSE to spend";
mes "Christmas alone...";
@@ -515,7 +515,7 @@ OnEnable:
end;
}
-prt_church,101,102,0 script Single Army#Amatsu 767,{
+prt_church,101,102,0 script Single Army#Amatsu 8_M_JPNSOLDIER,{
mes "[Single Army]";
mes "^CC9966Women may break my";
mes " spirit, but they'll never";
@@ -532,7 +532,7 @@ OnEnable:
end;
}
-prt_church,102,102,0 script Single Army#Gonryun 780,{
+prt_church,102,102,0 script Single Army#Gonryun 8_M_TWSOLDIER,{
mes "[Single Army]";
mes "^669900...We're the free! We're";
mes "the Invincible Single Army!^000000";
@@ -548,7 +548,7 @@ OnEnable:
end;
}
-prt_church,100,128,4 script Bishop#w 60,{
+prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{
cutin "wedding_bomars01",2;
if (Upper == 2) {
mes "[Vomars]";
@@ -809,7 +809,7 @@ OnTimer180000:
end;
}
-prt_church,28,178,4 script The King of Midgart 108,{
+prt_church,28,178,4 script The King of Midgart 1_M_PRON_KING,{
callfunc "F_GM_NPC";
mes "[Vomars]";
mes "Wh-who are you?";
@@ -854,7 +854,7 @@ prt_church,28,178,4 script The King of Midgart 108,{
}
}
-prt_church,20,179,4 script Divorce Staff 71,{
+prt_church,20,179,4 script Divorce Staff 1_F_LIBRARYGIRL,{
callfunc "F_GM_NPC";
mes "[Bad Ending]";
mes "Uh oh...";
@@ -901,7 +901,7 @@ prt_church,20,179,4 script Divorce Staff 71,{
}
}
-prt_church,22,179,4 script Remarry Staff 71,{
+prt_church,22,179,4 script Remarry Staff 1_F_LIBRARYGIRL,{
callfunc "F_GM_NPC";
mes "[Wedding Again]";
mes "Hmm...?";
diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt
index 418e7e8b0..ac1a532f5 100644
--- a/npc/other/mercenary_rent.txt
+++ b/npc/other/mercenary_rent.txt
@@ -206,8 +206,8 @@
close;
}
}
-prontera,41,337,5 duplicate(Mercenary Manager#main) Mercenary Manager#Spear 105
-pay_arche,99,167,4 duplicate(Mercenary Manager#main) Mercenary Manager#Bow 732
+prontera,41,337,5 duplicate(Mercenary Manager#main) Mercenary Manager#Spear 8W_SOLDIER
+pay_arche,99,167,4 duplicate(Mercenary Manager#main) Mercenary Manager#Bow 4_M_JOB_HUNTER
// Mercenary Merchant NPCs
//============================================================
@@ -284,5 +284,5 @@ pay_arche,99,167,4 duplicate(Mercenary Manager#main) Mercenary Manager#Bow 732
getitem .@item[.@m], .@input;
close;
}
-prontera,30,337,4 duplicate(MercMerchant) Mercenary Merchant#Spear 700
-pay_arche,102,167,5 duplicate(MercMerchant) Mercenary Merchant#Bow 879
+prontera,30,337,4 duplicate(MercMerchant) Mercenary Merchant#Spear 8_F_GIRL
+pay_arche,102,167,5 duplicate(MercMerchant) Mercenary Merchant#Bow 4_F_CAPEGIRL
diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt
index ff18c4e30..b50419c8c 100644
--- a/npc/other/monster_museum.txt
+++ b/npc/other/monster_museum.txt
@@ -20,7 +20,7 @@
//= 1.4a "S_BonusREward" -> "S_BonusReward" [Paradox924X]
//============================================================
-yuno_in03,32,15,3 script Museum Guide 67,{
+yuno_in03,32,15,3 script Museum Guide 1_F_02,{
mes "[Cenia]";
mes "Welcome to the Monster Museum.";
next;
@@ -63,7 +63,7 @@ yuno_in03,32,15,3 script Museum Guide 67,{
yuno_in03,36,21,3 script Deviace#yuno 1108,{
end;
}
-yuno_in03,33,21,1 script #DEVIACE 111,{
+yuno_in03,33,21,1 script #DEVIACE HIDDEN_NPC,{
mes " ";
mes "Scientific name : Deviace";
mes "Size : Medium";
@@ -89,7 +89,7 @@ yuno_in03,33,21,1 script #DEVIACE 111,{
yuno_in03,36,27,3 script Seal#yuno 1317,{
end;
}
-yuno_in03,33,27,1 script #FUR_SEAL 111,{
+yuno_in03,33,27,1 script #FUR_SEAL HIDDEN_NPC,{
mes " ";
mes "Scientific name : Seal";
mes "Size : Medium";
@@ -115,7 +115,7 @@ yuno_in03,33,27,1 script #FUR_SEAL 111,{
yuno_in03,36,33,3 script Sage Worm#yuno 1281,{
end;
}
-yuno_in03,33,33,1 script #SAGEWORM 111,{
+yuno_in03,33,33,1 script #SAGEWORM HIDDEN_NPC,{
mes " ";
mes "Scientific name : Sage Worm";
mes "Size : Small";
@@ -137,7 +137,7 @@ yuno_in03,33,33,1 script #SAGEWORM 111,{
yuno_in03,39,39,3 script Penomena#yuno 1216,{
end;
}
-yuno_in03,38,39,1 script #PENOMANA 111,{
+yuno_in03,38,39,1 script #PENOMANA HIDDEN_NPC,{
mes " ";
mes "Scientific name : Penomena";
mes "Size : Medium";
@@ -163,7 +163,7 @@ yuno_in03,38,39,1 script #PENOMANA 111,{
yuno_in03,39,44,3 script Galapago#yuno 1391,{
end;
}
-yuno_in03,37,44,3 script #GALAPAGO 111,{
+yuno_in03,37,44,3 script #GALAPAGO HIDDEN_NPC,{
mes " ";
mes "Scientific name : Galapago";
mes "Size : Small";
@@ -184,7 +184,7 @@ yuno_in03,37,44,3 script #GALAPAGO 111,{
yuno_in03,15,21,5 script Raydric#yuno 1163,{
end;
}
-yuno_in03,19,21,1 script #RAYDRIC 111,{
+yuno_in03,19,21,1 script #RAYDRIC HIDDEN_NPC,{
mes " ";
mes "Scientific name : Raydric";
mes "Size : Large";
@@ -205,7 +205,7 @@ yuno_in03,19,21,1 script #RAYDRIC 111,{
yuno_in03,15,27,5 script Chepet#yuno 1250,{
end;
}
-yuno_in03,19,27,1 script #CHEPET 111,{
+yuno_in03,19,27,1 script #CHEPET HIDDEN_NPC,{
mes " ";
mes " Scientific name : Chepet";
mes " Size : Medium";
@@ -224,7 +224,7 @@ yuno_in03,19,27,1 script #CHEPET 111,{
yuno_in03,15,33,5 script Violy#yuno 1390,{
end;
}
-yuno_in03,19,33,1 script #VIOLY 111,{
+yuno_in03,19,33,1 script #VIOLY HIDDEN_NPC,{
mes " ";
mes " Scientific name : Violy";
mes " Size : Medium";
@@ -241,7 +241,7 @@ yuno_in03,19,33,1 script #VIOLY 111,{
yuno_in03,10,39,5 script Alice#yuno 1275,{
end;
}
-yuno_in03,12,39,1 script #ALICE 111,{
+yuno_in03,12,39,1 script #ALICE HIDDEN_NPC,{
mes " ";
mes " Scientific name : Alice ";
mes " Size : Medium";
@@ -263,7 +263,7 @@ yuno_in03,12,39,1 script #ALICE 111,{
yuno_in03,10,45,5 script Assulter#yuno 1315,{
end;
}
-yuno_in03,12,45,1 script #ASSULTER 111,{
+yuno_in03,12,45,1 script #ASSULTER HIDDEN_NPC,{
mes " ";
mes " Scientific name : Assulter";
mes " Size : Medium";
@@ -298,7 +298,7 @@ yuno_in03,12,50,3 script Ant Egg#yuno 1097,{
yuno_in03,18,96,5 script Wanderer#yuno 1208,{
end;
}
-yuno_in03,20,96,1 script #WANDER_MAN 111,{
+yuno_in03,20,96,1 script #WANDER_MAN HIDDEN_NPC,{
mes " ";
mes " Scientific name : Wanderer";
mes " Size : Medium";
@@ -320,7 +320,7 @@ yuno_in03,20,96,1 script #WANDER_MAN 111,{
yuno_in03,16,100,5 script Caterpillar#yuno 1300,{
end;
}
-yuno_in03,18,100,1 script #CATERPILLAR 111,{
+yuno_in03,18,100,1 script #CATERPILLAR HIDDEN_NPC,{
mes " ";
mes " Scientific name : Caterpillar";
mes " Size : Small";
@@ -342,7 +342,7 @@ yuno_in03,18,100,1 script #CATERPILLAR 111,{
yuno_in03,16,104,5 script Male Thiefbug#yuno 1054,{
end;
}
-yuno_in03,18,104,1 script #THIEF_BUG__ 111,{
+yuno_in03,18,104,1 script #THIEF_BUG__ HIDDEN_NPC,{
mes " ";
mes " Scientific name : Thief Bug";
mes " ^FFFFFFScientific name :^000000 (Male)";
@@ -360,7 +360,7 @@ yuno_in03,18,104,1 script #THIEF_BUG__ 111,{
yuno_in03,16,108,5 script Tri Joint#yuno 1279,{
end;
}
-yuno_in03,18,108,1 script #TRI_JOINT 111,{
+yuno_in03,18,108,1 script #TRI_JOINT HIDDEN_NPC,{
mes " ";
mes " Scientific name : Tri Joint";
mes " Size : Small";
@@ -380,7 +380,7 @@ yuno_in03,18,108,1 script #TRI_JOINT 111,{
yuno_in03,16,111,5 script Arclouz#yuno 1194,{
end;
}
-yuno_in03,18,111,1 script #ARCLOUSE 111,{
+yuno_in03,18,111,1 script #ARCLOUSE HIDDEN_NPC,{
mes " ";
mes " Scientific name : Arclouz";
mes " Size : Medium";
@@ -403,7 +403,7 @@ yuno_in03,18,111,1 script #ARCLOUSE 111,{
yuno_in03,16,117,5 script Dragon Tail#yuno 1321,{
end;
}
-yuno_in03,18,116,1 script #DRAGON_TAIL 111,{
+yuno_in03,18,116,1 script #DRAGON_TAIL HIDDEN_NPC,{
mes " ";
mes " Scientific name : Dragon Tail";
mes " Size : Medium";
@@ -422,7 +422,7 @@ yuno_in03,18,116,1 script #DRAGON_TAIL 111,{
yuno_in03,46,96,3 script Owl Duke#yuno 1320,{
end;
}
-yuno_in03,44,96,1 script #OWL_DUKE 111,{
+yuno_in03,44,96,1 script #OWL_DUKE HIDDEN_NPC,{
mes " ";
mes " Scientific name : Owl Duke";
mes " Size : Large";
@@ -447,7 +447,7 @@ yuno_in03,44,96,1 script #OWL_DUKE 111,{
yuno_in03,48,100,3 script Marine Sphere#yuno 1142,{
end;
}
-yuno_in03,46,101,1 script #MARINE_SPHERE 111,{
+yuno_in03,46,101,1 script #MARINE_SPHERE HIDDEN_NPC,{
mes " ";
mes " Scientific name : Marine Sphere";
mes " Size : Small";
@@ -471,7 +471,7 @@ yuno_in03,46,101,1 script #MARINE_SPHERE 111,{
yuno_in03,48,104,3 script Mandragora#yuno 1020,{
end;
}
-yuno_in03,46,105,1 script #MANDRAGORA 111,{
+yuno_in03,46,105,1 script #MANDRAGORA HIDDEN_NPC,{
mes " ";
mes " Scientific name : Mandragora";
mes " Size : Medium";
@@ -502,7 +502,7 @@ yuno_in03,46,105,1 script #MANDRAGORA 111,{
yuno_in03,48,108,3 script Geographer#yuno 1368,{
end;
}
-yuno_in03,46,108,1 script #GEOGRAPHER 111,{
+yuno_in03,46,108,1 script #GEOGRAPHER HIDDEN_NPC,{
mes " ";
mes " Scientific name : Geographer";
mes " Size : Medium";
@@ -536,7 +536,7 @@ yuno_in03,46,108,1 script #GEOGRAPHER 111,{
yuno_in03,48,112,3 script Rafflesia#yuno 1162,{
end;
}
-yuno_in03,46,112,1 script #RAFFLESIA 111,{
+yuno_in03,46,112,1 script #RAFFLESIA HIDDEN_NPC,{
mes " ";
mes " Scientific name : Rafflesia";
mes " Size : Small";
@@ -561,7 +561,7 @@ yuno_in03,46,112,1 script #RAFFLESIA 111,{
yuno_in03,48,116,3 script Stem Worm#yuno 1215,{
end;
}
-yuno_in03,45,116,1 script #STEM_WORM 111,{
+yuno_in03,45,116,1 script #STEM_WORM HIDDEN_NPC,{
mes " ";
mes " Scientific name : Stem Worm";
mes " Size : Medium";
@@ -580,7 +580,7 @@ yuno_in03,45,116,1 script #STEM_WORM 111,{
yuno_in03,24,124,3 script Blazzer#yuno 1367,{
end;
}
-yuno_in03,24,122,1 script #BLAZZER 111,{
+yuno_in03,24,122,1 script #BLAZZER HIDDEN_NPC,{
mes " ";
mes " Scientific name : Blazzer";
mes " Size : Medium";
@@ -605,7 +605,7 @@ yuno_in03,24,122,1 script #BLAZZER 111,{
yuno_in03,28,124,5 script Ride Word#yuno 1195,{
end;
}
-yuno_in03,28,122,1 script #RIDEWORD 111,{
+yuno_in03,28,122,1 script #RIDEWORD HIDDEN_NPC,{
mes " ";
mes " Scientific name : Ride Word";
mes " Size : Small";
@@ -620,7 +620,7 @@ yuno_in03,28,122,1 script #RIDEWORD 111,{
yuno_in03,31,124,3 script Megalodon#yuno 1064,{
end;
}
-yuno_in03,31,122,1 script #MEGALODON 111,{
+yuno_in03,31,122,1 script #MEGALODON HIDDEN_NPC,{
mes " ";
mes " Scientific name : Megalodon";
mes " Size : Medium";
@@ -638,7 +638,7 @@ yuno_in03,31,122,1 script #MEGALODON 111,{
yuno_in03,35,124,3 script Sleeper#yuno 1386,{
end;
}
-yuno_in03,35,122,1 script #SLEEPER 111,{
+yuno_in03,35,122,1 script #SLEEPER HIDDEN_NPC,{
mes " ";
mes " Scientific name : Sleeper";
mes " Size : Medium";
@@ -659,7 +659,7 @@ yuno_in03,35,122,1 script #SLEEPER 111,{
yuno_in03,39,124,3 script Ancient Mummy#yuno 1297,{
end;
}
-yuno_in03,39,122,1 script #ANCIENT_MUMMY 111,{
+yuno_in03,39,122,1 script #ANCIENT_MUMMY HIDDEN_NPC,{
mes " ";
mes " Scientific name : Ancient Mummy";
mes " Size : Medium";
@@ -688,7 +688,7 @@ yuno_in03,39,122,1 script #ANCIENT_MUMMY 111,{
yuno_in03,18,122,5 script Incubus#yuno 1374,{
end;
}
-yuno_in03,19,120,1 script #INCUBUS 111,{
+yuno_in03,19,120,1 script #INCUBUS HIDDEN_NPC,{
mes " ";
mes " Scientific name : Incubus";
mes " Size : Medium";
@@ -710,7 +710,7 @@ yuno_in03,19,120,1 script #INCUBUS 111,{
yuno_in03,44,120,3 script Succubus#yuno 1370,{
end;
}
-yuno_in03,42,120,1 script #SUCCUBUS 111,{
+yuno_in03,42,120,1 script #SUCCUBUS HIDDEN_NPC,{
mes " ";
mes " Scientific name : Succubus";
mes " Size : Medium";
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index f52391d19..950656b6e 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -183,7 +183,7 @@ OnInit:
end;
}
-p_track01,73,22,1 script Ticket Helper#single 899,{
+p_track01,73,22,1 script Ticket Helper#single 4_M_HUMAN_02,{
mes "[Ticket Helper]";
mes "Welcome to the";
mes "Monster Race Arena.";
@@ -308,7 +308,7 @@ p_track01,30,32,0 duplicate(Runner#main) Runner No. 4 -1,1,0
p_track01,30,30,0 duplicate(Runner#main) Runner No. 5 -1,1,0
p_track01,30,28,0 duplicate(Runner#main) Runner No. 6 -1,1,0
-p_track01,67,45,5 script Medal Distributor#single 845,{
+p_track01,67,45,5 script Medal Distributor#single 4_F_RACING,{
if (!checkweight(908,200)) {
mes "[Medal Distributor]";
mes "I'm sorry, but I can't";
@@ -514,7 +514,7 @@ OnInit:
end;
}
-p_track01,76,36,1 script Exit Guide#single 798,{
+p_track01,76,36,1 script Exit Guide#single 4_M_NFMAN,{
mes "[Exit Guide]";
mes "If you have a winning Racing";
mes "Ticket, please make sure that";
@@ -558,7 +558,7 @@ p_track01,76,36,1 script Exit Guide#single 798,{
end;
}
-hugel,58,72,6 script Eckar Ellebird#single 798,{
+hugel,58,72,6 script Eckar Ellebird#single 4_M_NFMAN,{
mes "[Eckar Ellebird]";
mes "Welcome to the biggest";
mes "attraction in Hugel, the";
@@ -743,7 +743,7 @@ OnDisable:
end;
}
-p_track01,39,49,3 script Game Guide#single 845,{
+p_track01,39,49,3 script Game Guide#single 4_F_RACING,{
mes "[Game Guide]";
mes "Welcome to the";
mes "Monster Race Arena.";
@@ -1179,7 +1179,7 @@ OnTimer300000:
end;
}
-hugel,62,69,1 script Eckar Erenes#double 798,{
+hugel,62,69,1 script Eckar Erenes#double 4_M_NFMAN,{
mes "[Eckar Erenes]";
mes "Welcome to the";
mes "Monster Race Arena,";
@@ -1371,7 +1371,7 @@ OnDisable:
end;
}
-p_track02,73,22,1 script Ticket Helper#2 899,{
+p_track02,73,22,1 script Ticket Helper#2 4_M_HUMAN_02,{
if (!checkweight(908,200)) {
mes "[Ticket Helper]";
mes "Welcome to the";
@@ -1559,7 +1559,7 @@ OnInit:
end;
}
-p_track02,39,49,3 script Game Guide#double 845,{
+p_track02,39,49,3 script Game Guide#double 4_F_RACING,{
mes "[Game Guide]";
mes "Welcome to the";
mes "Monster Race Arena.";
@@ -1657,7 +1657,7 @@ p_track02,39,49,3 script Game Guide#double 845,{
close;
}
-p_track02,67,45,5 script Medal Distributor#medal 845,{
+p_track02,67,45,5 script Medal Distributor#medal 4_F_RACING,{
if (!checkweight(909,20)) {
mes "[Medal Distributor]";
mes "I'm sorry, but I can't";
@@ -1750,7 +1750,7 @@ OnInit:
end;
}
-p_track02,76,38,1 script Exit Guide#double 798,{
+p_track02,76,38,1 script Exit Guide#double 4_M_NFMAN,{
mes "[Exit Guide]";
mes "If you have a winning Racing";
mes "Ticket, please make sure that";
@@ -1852,12 +1852,12 @@ OnInit:
disablenpc strnpcinfo(0);
end;
}
-p_track02,30,38,0 duplicate(mob1#main) #poring1 139,0,0
-p_track02,30,36,0 duplicate(mob1#main) #lunatic1 139,0,0
-p_track02,30,34,0 duplicate(mob1#main) #savagebebe1 139,0,0
-p_track02,30,32,0 duplicate(mob1#main) #desertwolf1 139,0,0
-p_track02,30,30,0 duplicate(mob1#main) #deviruchi1 139,0,0
-p_track02,30,28,0 duplicate(mob1#main) #baphomet1 139,0,0
+p_track02,30,38,0 duplicate(mob1#main) #poring1 HIDDEN_WARP_NPC,0,0
+p_track02,30,36,0 duplicate(mob1#main) #lunatic1 HIDDEN_WARP_NPC,0,0
+p_track02,30,34,0 duplicate(mob1#main) #savagebebe1 HIDDEN_WARP_NPC,0,0
+p_track02,30,32,0 duplicate(mob1#main) #desertwolf1 HIDDEN_WARP_NPC,0,0
+p_track02,30,30,0 duplicate(mob1#main) #deviruchi1 HIDDEN_WARP_NPC,0,0
+p_track02,30,28,0 duplicate(mob1#main) #baphomet1 HIDDEN_WARP_NPC,0,0
p_track02,19,48,0 script TrapGlobal#race02 -1,{
OnEnable:
@@ -2048,7 +2048,7 @@ p_track02,47,28,0 duplicate(Tire_1) Tire#race02_6_6 -1,0,0
// NPCs for Redeeming Prize Medals (Einbroch and Hugel)
//============================================================
-ein_in01,85,208,5 script Ei'felle#repay01 854,{
+ein_in01,85,208,5 script Ei'felle#repay01 4_M_EINMAN2,{
if (!ein_medal01) {
mes "[Ei'felle]";
mes "Curses! We need to deliver";
@@ -2740,7 +2740,7 @@ S_BonusReward:
close;
}
-hugel,71,83,4 script Wayne 900,{
+hugel,71,83,4 script Wayne 4_M_HUMERCHANT,{
if (!checkweight(1201,1)) {
mes "[Wayne]";
mes "Hold on a second...";
@@ -2868,7 +2868,7 @@ hugel,71,83,4 script Wayne 900,{
// Monster Race Affiliated NPCs
//============================================================
-airplane,246,47,1 script Eocatt#decoy01 878,{
+airplane,246,47,1 script Eocatt#decoy01 4_M_OILMAN,{
mes "[Eocatt]";
mes "There's an old, humble";
mes "village on the outskirts of";
@@ -2893,7 +2893,7 @@ airplane,246,47,1 script Eocatt#decoy01 878,{
close;
}
-hugel,85,93,5 script Mudie#dummy01 866,{
+hugel,85,93,5 script Mudie#dummy01 4_M_LGTGRAND,{
mes "[Mudie]";
mes "The Monster Races";
mes "are probably the biggest";
@@ -2918,7 +2918,7 @@ hugel,85,93,5 script Mudie#dummy01 866,{
close;
}
-p_track02,32,45,5 script Eccentric Scholar#double 755,{
+p_track02,32,45,5 script Eccentric Scholar#double 4_M_SAGE_C,{
mes "[Eccentric Scholar]";
mes "Let's see now...";
mes "Monster 1's average speed";
@@ -2949,7 +2949,7 @@ p_track02,32,45,5 script Eccentric Scholar#double 755,{
close;
}
-p_track02,69,31,1 script Blacksmith Guildsman#dou 726,{
+p_track02,69,31,1 script Blacksmith Guildsman#dou 4_F_JOB_BLACKSMITH,{
if (!$@mon_time_2_2) {
mes "[Blacksmith Guildsman]";
mes "How many times must";
@@ -2979,7 +2979,7 @@ p_track02,69,31,1 script Blacksmith Guildsman#dou 726,{
close;
}
-p_track02,53,45,3 script Valiant Knight#double 733,{
+p_track02,53,45,3 script Valiant Knight#double 4_M_JOB_KNIGHT1,{
mes "[Valiant Knight]";
mes "Hey, have you been";
mes "wagering on the races?";
@@ -3003,7 +3003,7 @@ p_track02,53,45,3 script Valiant Knight#double 733,{
close;
}
-p_track01,27,47,5 script Drunkard#single 853,{
+p_track01,27,47,5 script Drunkard#single 4_M_YURI,{
mes "[Familiar Drunkard]";
mes "Grrr...! ^333333*Hiccup*^000000";
mes "I just gotta win this";
@@ -3022,7 +3022,7 @@ p_track01,27,47,5 script Drunkard#single 853,{
close;
}
-p_track01,69,31,1 script Blacksmith Guildsman#sin 107,{
+p_track01,69,31,1 script Blacksmith Guildsman#sin 1_M_PAY_ELDER,{
mes "[Blacksmith Guildsman]";
mes "How can this be so hard?";
mes "Why can't I win at least";
@@ -3047,7 +3047,7 @@ p_track01,69,31,1 script Blacksmith Guildsman#sin 107,{
close;
}
-p_track01,45,42,3 script Absent Minded Man#single 881,{
+p_track01,45,42,3 script Absent Minded Man#single 4_M_SITDOWN,{
mes "[Absent Minded Man]";
mes "Say, are you here to bet";
mes "on the monster races? I've";
@@ -3066,7 +3066,7 @@ p_track01,45,42,3 script Absent Minded Man#single 881,{
close;
}
-hugel,5,5,3 script Monster Race Manager 868,{
+hugel,5,5,3 script Monster Race Manager 4_M_LGTGUARD,{
callfunc "F_GM_NPC";
mes "[Monster Race Manager]";
mes "I can activate and";
diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt
index d4e3e7e32..a818cab85 100644
--- a/npc/other/msg_boards.txt
+++ b/npc/other/msg_boards.txt
@@ -26,7 +26,7 @@
// Prontera
//============================================================
-prontera,158,213,1 script Sign Post#Prt1 111,{
+prontera,158,213,1 script Sign Post#Prt1 HIDDEN_NPC,{
mes "^993300- The Sign Post Reads -^000000";
mes "North to Prontera Castle";
mes "North to Al De Baran";
@@ -40,7 +40,7 @@ prontera,158,213,1 script Sign Post#Prt1 111,{
close;
}
-prontera,156,197,1 script Prontera Bulletin#Prt2 111,{
+prontera,156,197,1 script Prontera Bulletin#Prt2 HIDDEN_NPC,{
mes "^993300- The Prontera Bulletin Reads -^000000";
mes "Wanted: Two Clip Accessories";
mes "Please contact...";
@@ -53,19 +53,19 @@ prontera,156,197,1 script Prontera Bulletin#Prt2 111,{
close;
}
-prontera,278,212,1 script Sign#Prt3 111,{
+prontera,278,212,1 script Sign#Prt3 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Please help keep Prontera a clean place.";
close;
}
/*
-prontera,150,326,1 script Sign#Prt4 111,{
+prontera,150,326,1 script Sign#Prt4 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Citizens of Prontera are Welcomed in the Prontera Castle.";
close;
}
*/
-prontera,31,212,1 script Billboard#Prt5 111,{
+prontera,31,212,1 script Billboard#Prt5 HIDDEN_NPC,{
mes "^993300- The Billboard Reads -^000000";
mes "~WANTED~";
mes "iROGM01";
@@ -77,13 +77,13 @@ prontera,31,212,1 script Billboard#Prt5 111,{
close;
}
-prontera,165,305,1 script Billboard#Prt6 111,{
+prontera,165,305,1 script Billboard#Prt6 HIDDEN_NPC,{
mes "^993300- The Billboard Reads -^000000";
mes "We hope you enjoy your stay in Prontera.";
close;
}
-prontera,145,304,1 script Sign#Prt7 111,{
+prontera,145,304,1 script Sign#Prt7 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Note:";
mes "I lost my cart in Mt. Mjolnir, if someone finds it please tell me, my life was in that bucket of goods!";
@@ -92,21 +92,21 @@ prontera,145,304,1 script Sign#Prt7 111,{
// Morroc
//============================================================
-morocc,144,84,1 script Sign#Moc1 111,{
+morocc,144,84,1 script Sign#Moc1 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Wanted: Body guard to protect my shop from thieves";
mes "Please contact Butcher";
close;
}
-morocc,145,83,1 script Sign#Moc2 111,{
+morocc,145,83,1 script Sign#Moc2 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Selling, well groomed Peco Peco!";
mes "This beautiful specimen has only been ridden by myself, comes with a saddle, a harness and...";
close;
}
-morocc,32,174,1 script Bulletin#Moc3 111,{
+morocc,32,174,1 script Bulletin#Moc3 HIDDEN_NPC,{
mes "^993300- The Bulletin Reads -^000000";
mes "^0099FFMorroc women up in arms!^000000";
mes "A recent study has shown that the majority of male citizens in";
@@ -124,13 +124,13 @@ morocc,32,174,1 script Bulletin#Moc3 111,{
close;
}
-morocc,168,266,1 script Sign#Moc5 111,{
+morocc,168,266,1 script Sign#Moc5 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Welcome to Morroc.";
close;
}
-morocc,168,264,1 script Billboard#Moc6 111,{
+morocc,168,264,1 script Billboard#Moc6 HIDDEN_NPC,{
mes "^993300- The Billboard Reads -^000000";
mes "^CC0033Battle Royal!^000000";
mes "Do you have what it takes to battle someone in a no holds barred, player vs. player game of death!";
@@ -138,7 +138,7 @@ morocc,168,264,1 script Billboard#Moc6 111,{
close;
}
-morocc,298,211,1 script Sign#Moc7 111,{
+morocc,298,211,1 script Sign#Moc7 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Welcome to Morroc.";
close;
@@ -146,19 +146,19 @@ morocc,298,211,1 script Sign#Moc7 111,{
// Geffen
//============================================================
-geffen,116,58,1 script Geffen Bulletin#Gef1 111,{
+geffen,116,58,1 script Geffen Bulletin#Gef1 HIDDEN_NPC,{
mes "^993300- The Geffen Bulletin Reads -^000000";
mes "Remember Wizard's...It's not how many skills you know, it's the magic that counts!";
close;
}
/*
-geffen,61,174,1 script Sign#Gef2 111,{
+geffen,61,174,1 script Sign#Gef2 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "- Seems to be written in a language unfamiliar to you -";
close;
}
*/
-geffen,113,104,1 script Billboard#Gef3 111,{
+geffen,113,104,1 script Billboard#Gef3 HIDDEN_NPC,{
mes "^993300- The Billboard Reads -^000000";
mes "Selling: Brand new Chon Chon Doll!";
mes "What a great gift to give to a loved one, contact me now!";
@@ -170,7 +170,7 @@ geffen,113,104,1 script Billboard#Gef3 111,{
close;
}
-geffen,119,190,1 script Sign Post#Gef4 111,{
+geffen,119,190,1 script Sign Post#Gef4 HIDDEN_NPC,{
mes "^993300- The Sign Post Reads -^000000";
mes "North to Geffen Fields";
mes "Northeast to Al De Baran";
@@ -184,13 +184,13 @@ geffen,119,190,1 script Sign Post#Gef4 111,{
close;
}
-geffen,168,175,1 script Sign#Gef5 111,{
+geffen,168,175,1 script Sign#Gef5 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "''Your always welcomed in Geffen''";
close;
}
-geffen,183,61,1 script Sign#Gef6 111,{
+geffen,183,61,1 script Sign#Gef6 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Welcome.";
close;
@@ -198,7 +198,7 @@ geffen,183,61,1 script Sign#Gef6 111,{
// Al De Baran
//============================================================
-aldebaran,181,172,1 script Billboard#Alde1 111,{
+aldebaran,181,172,1 script Billboard#Alde1 HIDDEN_NPC,{
mes "^993300- The Billboard Reads -^000000";
mes "In Search of:";
mes "I lost my Bongun pet, it wasn't my fault, it just ran away...";
@@ -206,13 +206,13 @@ aldebaran,181,172,1 script Billboard#Alde1 111,{
close;
}
-aldebaran,133,104,1 script Al De Baran Bulletin#Al2 111,{
+aldebaran,133,104,1 script Al De Baran Bulletin#Al2 HIDDEN_NPC,{
mes "^993300- The Al De Baran Bulletin Reads -^000000";
mes "''Enjoy your stay in Al De Baran''";
close;
}
-aldebaran,54,223,1 script Billboard#Alde3 111,{
+aldebaran,54,223,1 script Billboard#Alde3 HIDDEN_NPC,{
mes "^993300- The Billboard Reads -^000000";
mes "Help Wanted:";
mes "We are looking for young, strong and athletic people who are";
@@ -228,7 +228,7 @@ OnTouch:
close;
}
-aldebaran,217,222,1 script Sign#Alde5 111,{
+aldebaran,217,222,1 script Sign#Alde5 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "I saw Santa Claus in Lutie!";
mes "- The rest looks like scribble -";
@@ -237,19 +237,19 @@ aldebaran,217,222,1 script Sign#Alde5 111,{
// Alberta
//============================================================
-alberta,35,241,1 script Billboard#Alb1 111,{
+alberta,35,241,1 script Billboard#Alb1 HIDDEN_NPC,{
mes "^993300- The Billboard Reads -^000000";
mes "Welcome to Alberta, the Merchant's paradise.";
close;
}
-alberta,37,39,1 script Billboard#Alb2 111,{
+alberta,37,39,1 script Billboard#Alb2 HIDDEN_NPC,{
mes "^993300- The Billboard Reads -^000000";
mes "Welcome.";
close;
}
-alberta,99,151,1 script Sign#Alb3 111,{
+alberta,99,151,1 script Sign#Alb3 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Tools by the Cart full!";
mes "You need tools? We got'em!";
@@ -257,7 +257,7 @@ alberta,99,151,1 script Sign#Alb3 111,{
close;
}
-alberta,196,152,1 script Sign#Alb4 111,{
+alberta,196,152,1 script Sign#Alb4 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Docking and Shipment times very on load. For information regarding";
mes "Shipping and Receiving, please...";
@@ -265,7 +265,7 @@ alberta,196,152,1 script Sign#Alb4 111,{
close;
}
-alberta,149,54,1 script Sign#Alb5 111,{
+alberta,149,54,1 script Sign#Alb5 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Welcome.";
close;
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index d62f41654..599f31cfb 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -17,7 +17,7 @@
// Poring War Recruiter
//============================================================
-prt_fild08,159,371,3 script Poring War Recruiter#wop 909,{
+prt_fild08,159,371,3 script Poring War Recruiter#wop 4_PORING,{
mes "[Poring]";
mes "!!!!!";
mes "Whoa-! Humans, ring~!!";
@@ -67,7 +67,7 @@ prt_fild08,159,371,3 script Poring War Recruiter#wop 909,{
// Poring Vending Machine
//============================================================
-poring_w01,100,97,3 script Poring Vending Machine#w 909,{
+poring_w01,100,97,3 script Poring Vending Machine#w 4_PORING,{
if (checkweight(714,3) == 0) {
mes "- You are carrying too much items in order to use the Vending Machine. -";
close;
@@ -220,7 +220,7 @@ S_PoringVending:
// Information
//============================================================
-poring_w01,96,97,3 script Sweet Devi#wop 738,{
+poring_w01,96,97,3 script Sweet Devi#wop 4_DEVIRUCHI,{
if (MaxWeight-Weight < 2000 || checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -562,7 +562,7 @@ OnTimer58000:
end;
}
-poring_w01,103,70,0 script #wop_warp_rtry 139,13,13,{
+poring_w01,103,70,0 script #wop_warp_rtry HIDDEN_WARP_NPC,13,13,{
end;
OnInit:
@@ -618,7 +618,7 @@ OnTimer65000:
// Mr. Doppel
//============================================================
-poring_w02,26,181,3 script Mr. Doppel#wop_team_a 739,{
+poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{
if (checkweight(714,3) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -749,7 +749,7 @@ OnDisable:
end;
}
-poring_w02,170,181,3 script Mr. Doppel#wop_team_d 739,{
+poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{
if (checkweight(714,3) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -1027,7 +1027,7 @@ OnTimer703000:
end;
}
-poring_w02,51,82,0 script #wop_warp_a 139,1,1,{
+poring_w02,51,82,0 script #wop_warp_a HIDDEN_WARP_NPC,1,1,{
end;
OnInit:
@@ -1049,7 +1049,7 @@ OnTouch:
end;
}
-poring_w02,146,82,0 script #wop_warp_d 139,1,1,{
+poring_w02,146,82,0 script #wop_warp_d HIDDEN_WARP_NPC,1,1,{
end;
OnInit:
@@ -1213,7 +1213,7 @@ OnTimer120000:
// Deviruchi
//============================================================
-poring_w02,99,201,3 script Deviruchi#wop_endmaster 738,{
+poring_w02,99,201,3 script Deviruchi#wop_endmaster 4_DEVIRUCHI,{
if (MaxWeight-Weight < 2000 || checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -1448,7 +1448,7 @@ OnTimer68100:
// Gate Guardian
//============================================================
-poring_w02,99,52,0 script Angeling Guardian#wop_da 111,{
+poring_w02,99,52,0 script Angeling Guardian#wop_da HIDDEN_NPC,{
cutin "wop_emb0" + $@wop_doorcount_a,1;
if ($@wop_doorcount_a < 4) {
if (wop_team == 2) {
@@ -1505,7 +1505,7 @@ OnInit:
end;
}
-poring_w02,103,52,0 script #aroom_ingate_wop 139,1,1,{
+poring_w02,103,52,0 script #aroom_ingate_wop HIDDEN_WARP_NPC,1,1,{
end;
OnInit:
@@ -1525,7 +1525,7 @@ OnTouch:
end;
}
-poring_w02,93,51,0 script #aroom_outgate_wop 139,1,1,{
+poring_w02,93,51,0 script #aroom_outgate_wop HIDDEN_WARP_NPC,1,1,{
end;
OnInit:
@@ -1545,7 +1545,7 @@ OnTouch:
end;
}
-poring_w02,98,113,0 script Deviling Guardian#wop_dd 111,{
+poring_w02,98,113,0 script Deviling Guardian#wop_dd HIDDEN_NPC,{
cutin "wop_emb0" + $@wop_doorcount_d,1;
if ($@wop_doorcount_d < 4) {
if (wop_team == 1) {
@@ -1602,7 +1602,7 @@ OnInit:
end;
}
-poring_w02,93,113,0 script #droom_ingate_wop 139,1,1,{
+poring_w02,93,113,0 script #droom_ingate_wop HIDDEN_WARP_NPC,1,1,{
end;
OnInit:
@@ -1622,7 +1622,7 @@ OnTouch:
end;
}
-poring_w02,103,114,0 script #droom_outgate_wop 139,1,1,{
+poring_w02,103,114,0 script #droom_outgate_wop HIDDEN_WARP_NPC,1,1,{
end;
OnInit:
@@ -1664,7 +1664,7 @@ poring_w01,117,108,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd3
poring_w01,122,108,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd4 1242
poring_w01,121,105,3 duplicate(Deviling Side Marin#wpd) Deviling Side Marin#wd5 1242
-poring_w01,84,108,3 script #wop_ex_1 139,3,3,{
+poring_w01,84,108,3 script #wop_ex_1 HIDDEN_WARP_NPC,3,3,{
end;
OnTouch:
@@ -1717,7 +1717,7 @@ OnTouch:
close;
}
-poring_w01,119,107,3 script #wop_ex_2 139,3,3,{
+poring_w01,119,107,3 script #wop_ex_2 HIDDEN_WARP_NPC,3,3,{
end;
OnTouch:
diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt
index b9e40ff7e..0428eca36 100644
--- a/npc/other/powernpc.txt
+++ b/npc/other/powernpc.txt
@@ -10,7 +10,7 @@
//= 1.2 Cleaning. [Euphy]
//============================================================
-gonryun,180,118,4 script Iron man#gnp 85,{
+gonryun,180,118,4 script Iron man#gnp 4_M_03,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -110,7 +110,7 @@ L_Lifting:
return;
}
-gon_test,50,14,4 script Administrator#gnp 780,{
+gon_test,50,14,4 script Administrator#gnp 8_M_TWSOLDIER,{
mes "[Administrator]";
if (BaseJob == Job_Novice) {
mes "Children are not allowed in here.";
@@ -146,7 +146,7 @@ gon_test,50,14,4 script Administrator#gnp 780,{
end;
}
-gon_test,42,89,4 script Summoner#gnp 774,{
+gon_test,42,89,4 script Summoner#gnp 4_M_TWBOY,{
mes "[SongYeunWoo]";
if (in_battle == 3) {
mes "Please come back after registration.";
@@ -223,7 +223,7 @@ OnTimer184000:
end;
}
-gon_test,46,14,3 script Guide of field of fight 770,{
+gon_test,46,14,3 script Guide of field of fight 4_F_TWGIRL,{
mes "[SongHeeYeon]";
mes ".....";
mes "Hi, there~";
@@ -272,7 +272,7 @@ gon_test,46,14,3 script Guide of field of fight 770,{
close;
}
-gon_test,70,103,3 script ChowAnAn#gnp 773,{
+gon_test,70,103,3 script ChowAnAn#gnp 4_F_TWMIDWOMAN,{
mes "[ChowAnAn]";
mes "Want to go back?";
next;
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 2e12f379f..22e5698a6 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -164,12 +164,12 @@
}
close;
}
-morocc_in,144,138,4 duplicate(pvpe) PVP Narrator#pe1 84
-alberta_in,22,146,4 duplicate(pvpe) PVP Narrator#pe2 84
-prt_in,56,140,4 duplicate(pvpe) PVP Narrator#pe3 84
-geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe4 84
-payon_in01,142,50,4 duplicate(pvpe) PVP Narrator#pe5 84
-geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 84
+morocc_in,144,138,4 duplicate(pvpe) PVP Narrator#pe1 4_M_02
+alberta_in,22,146,4 duplicate(pvpe) PVP Narrator#pe2 4_M_02
+prt_in,56,140,4 duplicate(pvpe) PVP Narrator#pe3 4_M_02
+geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe4 4_M_02
+payon_in01,142,50,4 duplicate(pvpe) PVP Narrator#pe5 4_M_02
+geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 4_M_02
// Mode Select
//============================================================
@@ -271,11 +271,11 @@ L_Warp:
warp .@map$,51,23;
return;
}
-morocc_in,144,142,4 duplicate(gkut) Gate Keeper#gke1 83
-alberta_in,26,146,4 duplicate(gkut) Gate Keeper#gke2 83
-prt_in,52,140,4 duplicate(gkut) Gate Keeper#gke3 83
-geffen_in,63,63,4 duplicate(gkut) Gate Keeper#gke4 83
-payon_in01,140,53,4 duplicate(gkut) Gate Keeper#gke5 83
+morocc_in,144,142,4 duplicate(gkut) Gate Keeper#gke1 4_M_01
+alberta_in,26,146,4 duplicate(gkut) Gate Keeper#gke2 4_M_01
+prt_in,52,140,4 duplicate(gkut) Gate Keeper#gke3 4_M_01
+geffen_in,63,63,4 duplicate(gkut) Gate Keeper#gke4 4_M_01
+payon_in01,140,53,4 duplicate(gkut) Gate Keeper#gke5 4_M_01
// PVP Warper Function
//============================================================
@@ -318,7 +318,7 @@ function script F_PVP_FSRS {
// Event Contestant Entrance
//============================================================
-pvp_room,54,85,4 script Registration Staff#1 105,{
+pvp_room,54,85,4 script Registration Staff#1 8W_SOLDIER,{
if (countitem(7028) == 0) {
mes "[PVP Combat Square Register Staff]";
mes "Eh? How did you get in here?";
@@ -386,10 +386,10 @@ OnInit:
waitingroom "Compete Square viewer's entrance",0;
end;
}
-pvp_room,62,85,4 duplicate(PVPSpectator) Spectator's Entrance#1 105
-pvp_room,70,85,4 duplicate(PVPSpectator) Spectator's Entrance#2 105
-pvp_room,78,85,4 duplicate(PVPSpectator) Spectator's Entrance#3 105
-pvp_room,86,85,4 duplicate(PVPSpectator) Spectator's Entrance#4 105
+pvp_room,62,85,4 duplicate(PVPSpectator) Spectator's Entrance#1 8W_SOLDIER
+pvp_room,70,85,4 duplicate(PVPSpectator) Spectator's Entrance#2 8W_SOLDIER
+pvp_room,78,85,4 duplicate(PVPSpectator) Spectator's Entrance#3 8W_SOLDIER
+pvp_room,86,85,4 duplicate(PVPSpectator) Spectator's Entrance#4 8W_SOLDIER
// Spectator Warps
//============================================================
@@ -404,12 +404,12 @@ OnTouch:
warp "pvp_room",84,39;
end;
}
-pvp_2vs2,5,4,0 duplicate(PVPSpecWarp) Combat Square Staff#1 45,1,1
-pvp_2vs2,5,74,0 duplicate(PVPSpecWarp) Combat Square Staff#2 45,1,1
-pvp_2vs2,74,74,0 duplicate(PVPSpecWarp) Combat Square Staff#3 45,1,1
-pvp_2vs2,74,5,0 duplicate(PVPSpecWarp) Combat Square Staff#4 45,1,1
+pvp_2vs2,5,4,0 duplicate(PVPSpecWarp) Combat Square Staff#1 WARPNPC,1,1
+pvp_2vs2,5,74,0 duplicate(PVPSpecWarp) Combat Square Staff#2 WARPNPC,1,1
+pvp_2vs2,74,74,0 duplicate(PVPSpecWarp) Combat Square Staff#3 WARPNPC,1,1
+pvp_2vs2,74,5,0 duplicate(PVPSpecWarp) Combat Square Staff#4 WARPNPC,1,1
-pvp_2vs2,40,40,0 script Combat Square Staff#5 45,1,1,{
+pvp_2vs2,40,40,0 script Combat Square Staff#5 WARPNPC,1,1,{
mes "[Combat Square Staff]";
mes "May I help you?";
switch(select("To the side viewer seat.:Leave Combat Square.")) {
@@ -428,7 +428,7 @@ pvp_2vs2,40,40,0 script Combat Square Staff#5 45,1,1,{
// PVP Area Exit warp
//============================================================
-pvp_room,51,19,0 script out#eventpvp 45,4,2,{
+pvp_room,51,19,0 script out#eventpvp WARPNPC,4,2,{
OnTouch:
mes "[Combat Square Staff]";
mes "Did you have fun in Combat Square?";
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index fed2efd4c..b135cd093 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -59,15 +59,15 @@ OnInit:
enablewaitingroomevent strnpcinfo(0);
end;
}
-turbo_room,110,135,3 duplicate(entrance#tt_main) Expert mode - 4 person 124
-turbo_room,117,135,3 duplicate(entrance#tt_main) Expert mode - 8 person 124
-turbo_room,124,135,3 duplicate(entrance#tt_main) Expert mode - 16 person 124
-turbo_room,77,135,3 duplicate(entrance#tt_main) Normal mode - 4 person 124
-turbo_room,84,135,3 duplicate(entrance#tt_main) Normal mode - 8 person 124
-turbo_room,91,135,3 duplicate(entrance#tt_main) Normal mode - 16 person 124
-turbo_room,72,132,3 duplicate(entrance#tt_main) Solo Mode#n1 124
+turbo_room,110,135,3 duplicate(entrance#tt_main) Expert mode - 4 person 4_F_TELEPORTER
+turbo_room,117,135,3 duplicate(entrance#tt_main) Expert mode - 8 person 4_F_TELEPORTER
+turbo_room,124,135,3 duplicate(entrance#tt_main) Expert mode - 16 person 4_F_TELEPORTER
+turbo_room,77,135,3 duplicate(entrance#tt_main) Normal mode - 4 person 4_F_TELEPORTER
+turbo_room,84,135,3 duplicate(entrance#tt_main) Normal mode - 8 person 4_F_TELEPORTER
+turbo_room,91,135,3 duplicate(entrance#tt_main) Normal mode - 16 person 4_F_TELEPORTER
+turbo_room,72,132,3 duplicate(entrance#tt_main) Solo Mode#n1 4_F_TELEPORTER
-turbo_e_4,298,167,3 script Helper#tt_main 124,{
+turbo_e_4,298,167,3 script Helper#tt_main 4_F_TELEPORTER,{
mes "[Helper]";
mes "You are now in the";
mes "Waiting Room. You will";
@@ -77,13 +77,13 @@ turbo_e_4,298,167,3 script Helper#tt_main 124,{
mes "and equipment. Thank you.";
close;
}
-turbo_e_4,298,167,3 duplicate(Helper#tt_main) Helper#e4_F 124
-turbo_e_8,298,167,3 duplicate(Helper#tt_main) Helper#e8_F 124
-turbo_e_16,298,167,3 duplicate(Helper#tt_main) Helper#e16_F 124
-turbo_n_4,298,167,3 duplicate(Helper#tt_main) Helper#n4_F 124
-turbo_n_8,298,167,3 duplicate(Helper#tt_main) Helper#n8_F 124
-turbo_n_16,298,167,3 duplicate(Helper#tt_main) Helper#n16_F 124
-turbo_n_1,298,167,3 duplicate(Helper#tt_main) Helper#n1_F 124
+turbo_e_4,298,167,3 duplicate(Helper#tt_main) Helper#e4_F 4_F_TELEPORTER
+turbo_e_8,298,167,3 duplicate(Helper#tt_main) Helper#e8_F 4_F_TELEPORTER
+turbo_e_16,298,167,3 duplicate(Helper#tt_main) Helper#e16_F 4_F_TELEPORTER
+turbo_n_4,298,167,3 duplicate(Helper#tt_main) Helper#n4_F 4_F_TELEPORTER
+turbo_n_8,298,167,3 duplicate(Helper#tt_main) Helper#n8_F 4_F_TELEPORTER
+turbo_n_16,298,167,3 duplicate(Helper#tt_main) Helper#n16_F 4_F_TELEPORTER
+turbo_n_1,298,167,3 duplicate(Helper#tt_main) Helper#n1_F 4_F_TELEPORTER
turbo_e_4,298,167,0 script Point#tt_main -1,15,15,{
end;
@@ -1616,13 +1616,13 @@ OnTouch:
if (.@turbo2 < 8) warp strnpcinfo(4),279,292;
end;
}
-turbo_e_4,324,279,0 duplicate(snake01#tt_main) snake01#e4 45,1,1
-turbo_e_8,324,279,0 duplicate(snake01#tt_main) snake01#e8 45,1,1
-turbo_e_16,324,279,0 duplicate(snake01#tt_main) snake01#e16 45,1,1
-turbo_n_4,324,279,0 duplicate(snake01#tt_main) snake01#n4 45,1,1
-turbo_n_8,324,279,0 duplicate(snake01#tt_main) snake01#n8 45,1,1
-turbo_n_16,324,279,0 duplicate(snake01#tt_main) snake01#n16 45,1,1
-turbo_n_1,324,279,0 duplicate(snake01#tt_main) snake01#n1 45,1,1
+turbo_e_4,324,279,0 duplicate(snake01#tt_main) snake01#e4 WARPNPC,1,1
+turbo_e_8,324,279,0 duplicate(snake01#tt_main) snake01#e8 WARPNPC,1,1
+turbo_e_16,324,279,0 duplicate(snake01#tt_main) snake01#e16 WARPNPC,1,1
+turbo_n_4,324,279,0 duplicate(snake01#tt_main) snake01#n4 WARPNPC,1,1
+turbo_n_8,324,279,0 duplicate(snake01#tt_main) snake01#n8 WARPNPC,1,1
+turbo_n_16,324,279,0 duplicate(snake01#tt_main) snake01#n16 WARPNPC,1,1
+turbo_n_1,324,279,0 duplicate(snake01#tt_main) snake01#n1 WARPNPC,1,1
- script snake02#tt_main -1,{
OnTouch:
@@ -1633,16 +1633,16 @@ OnTouch:
if (.@turbo2 < 9) warp strnpcinfo(4),363,256;
end;
}
-turbo_e_4,332,279,0 duplicate(snake02#tt_main) snake02#e4 45,1,1
-turbo_e_8,332,279,0 duplicate(snake02#tt_main) snake02#e8 45,1,1
-turbo_e_16,332,279,0 duplicate(snake02#tt_main) snake02#e16 45,1,1
-turbo_n_4,332,279,0 duplicate(snake02#tt_main) snake02#n4 45,1,1
-turbo_n_8,332,279,0 duplicate(snake02#tt_main) snake02#n8 45,1,1
-turbo_n_16,332,279,0 duplicate(snake02#tt_main) snake02#n16 45,1,1
-turbo_n_1,332,279,0 duplicate(snake02#tt_main) snake02#n1 45,1,1
+turbo_e_4,332,279,0 duplicate(snake02#tt_main) snake02#e4 WARPNPC,1,1
+turbo_e_8,332,279,0 duplicate(snake02#tt_main) snake02#e8 WARPNPC,1,1
+turbo_e_16,332,279,0 duplicate(snake02#tt_main) snake02#e16 WARPNPC,1,1
+turbo_n_4,332,279,0 duplicate(snake02#tt_main) snake02#n4 WARPNPC,1,1
+turbo_n_8,332,279,0 duplicate(snake02#tt_main) snake02#n8 WARPNPC,1,1
+turbo_n_16,332,279,0 duplicate(snake02#tt_main) snake02#n16 WARPNPC,1,1
+turbo_n_1,332,279,0 duplicate(snake02#tt_main) snake02#n1 WARPNPC,1,1
-- script snake03#tt_main 45,1,1,{
+- script snake03#tt_main WARPNPC,1,1,{
OnTouch:
set .@turbo2,rand(1,8);
if (.@turbo2 < 3) warp strnpcinfo(4),279,292;
@@ -1651,16 +1651,16 @@ OnTouch:
if (.@turbo2 < 9) warp strnpcinfo(4),370,292;
end;
}
-turbo_e_4,324,270,0 duplicate(snake03#tt_main) snake03#e4 45,1,1
-turbo_e_8,324,270,0 duplicate(snake03#tt_main) snake03#e8 45,1,1
-turbo_e_16,324,270,0 duplicate(snake03#tt_main) snake03#e16 45,1,1
-turbo_n_4,324,270,0 duplicate(snake03#tt_main) snake03#n4 45,1,1
-turbo_n_8,324,270,0 duplicate(snake03#tt_main) snake03#n8 45,1,1
-turbo_n_16,324,270,0 duplicate(snake03#tt_main) snake03#n16 45,1,1
-turbo_n_1,324,270,0 duplicate(snake03#tt_main) snake03#n1 45,1,1
+turbo_e_4,324,270,0 duplicate(snake03#tt_main) snake03#e4 WARPNPC,1,1
+turbo_e_8,324,270,0 duplicate(snake03#tt_main) snake03#e8 WARPNPC,1,1
+turbo_e_16,324,270,0 duplicate(snake03#tt_main) snake03#e16 WARPNPC,1,1
+turbo_n_4,324,270,0 duplicate(snake03#tt_main) snake03#n4 WARPNPC,1,1
+turbo_n_8,324,270,0 duplicate(snake03#tt_main) snake03#n8 WARPNPC,1,1
+turbo_n_16,324,270,0 duplicate(snake03#tt_main) snake03#n16 WARPNPC,1,1
+turbo_n_1,324,270,0 duplicate(snake03#tt_main) snake03#n1 WARPNPC,1,1
-- script snake04#tt_main 45,1,1,{
+- script snake04#tt_main WARPNPC,1,1,{
OnTouch:
set .@turbo2,rand(1,7);
if (.@turbo2 < 3) warp strnpcinfo(4),363,256;
@@ -1669,13 +1669,13 @@ OnTouch:
if (.@turbo2 < 8) warp strnpcinfo(4),287,256;
end;
}
-turbo_e_4,332,270,0 duplicate(snake04#tt_main) snake04#e4 45,1,1
-turbo_e_8,332,270,0 duplicate(snake04#tt_main) snake04#e8 45,1,1
-turbo_e_16,332,270,0 duplicate(snake04#tt_main) snake04#e16 45,1,1
-turbo_n_4,332,270,0 duplicate(snake04#tt_main) snake04#n4 45,1,1
-turbo_n_8,332,270,0 duplicate(snake04#tt_main) snake04#n8 45,1,1
-turbo_n_16,332,270,0 duplicate(snake04#tt_main) snake04#n16 45,1,1
-turbo_n_1,332,270,0 duplicate(snake04#tt_main) snake04#n1 45,1,1
+turbo_e_4,332,270,0 duplicate(snake04#tt_main) snake04#e4 WARPNPC,1,1
+turbo_e_8,332,270,0 duplicate(snake04#tt_main) snake04#e8 WARPNPC,1,1
+turbo_e_16,332,270,0 duplicate(snake04#tt_main) snake04#e16 WARPNPC,1,1
+turbo_n_4,332,270,0 duplicate(snake04#tt_main) snake04#n4 WARPNPC,1,1
+turbo_n_8,332,270,0 duplicate(snake04#tt_main) snake04#n8 WARPNPC,1,1
+turbo_n_16,332,270,0 duplicate(snake04#tt_main) snake04#n16 WARPNPC,1,1
+turbo_n_1,332,270,0 duplicate(snake04#tt_main) snake04#n1 WARPNPC,1,1
- script SnakeHunt#tt_main -1,{
end;
@@ -1705,16 +1705,16 @@ OnEnable:
end;
}
-turbo_e_4,389,288,0 duplicate(SnakeHunt#tt_main) snake#e4 111
-turbo_e_8,389,288,0 duplicate(SnakeHunt#tt_main) snake#e8 111
-turbo_e_16,389,288,0 duplicate(SnakeHunt#tt_main) snake#e16 111
-turbo_n_4,389,288,0 duplicate(SnakeHunt#tt_main) snake#n4 111
-turbo_n_1,389,288,0 duplicate(SnakeHunt#tt_main) snake#n1 111
-turbo_e_4,90,46,0 duplicate(SnakeHunt#tt_main) hunting#e4 111
-turbo_e_8,90,46,0 duplicate(SnakeHunt#tt_main) hunting#e8 111
-turbo_e_16,90,46,0 duplicate(SnakeHunt#tt_main) hunting#e16 111
-turbo_n_4,90,46,0 duplicate(SnakeHunt#tt_main) hunting#n4 111
-turbo_n_1,90,46,0 duplicate(SnakeHunt#tt_main) hunting#n1 111
+turbo_e_4,389,288,0 duplicate(SnakeHunt#tt_main) snake#e4 HIDDEN_NPC
+turbo_e_8,389,288,0 duplicate(SnakeHunt#tt_main) snake#e8 HIDDEN_NPC
+turbo_e_16,389,288,0 duplicate(SnakeHunt#tt_main) snake#e16 HIDDEN_NPC
+turbo_n_4,389,288,0 duplicate(SnakeHunt#tt_main) snake#n4 HIDDEN_NPC
+turbo_n_1,389,288,0 duplicate(SnakeHunt#tt_main) snake#n1 HIDDEN_NPC
+turbo_e_4,90,46,0 duplicate(SnakeHunt#tt_main) hunting#e4 HIDDEN_NPC
+turbo_e_8,90,46,0 duplicate(SnakeHunt#tt_main) hunting#e8 HIDDEN_NPC
+turbo_e_16,90,46,0 duplicate(SnakeHunt#tt_main) hunting#e16 HIDDEN_NPC
+turbo_n_4,90,46,0 duplicate(SnakeHunt#tt_main) hunting#n4 HIDDEN_NPC
+turbo_n_1,90,46,0 duplicate(SnakeHunt#tt_main) hunting#n1 HIDDEN_NPC
- script cos#tt_main -1,{
OnTouch:
@@ -1756,51 +1756,51 @@ OnTouch:
}
}
}
-turbo_e_4,168,363,0 duplicate(cos#tt_main) #cos_e4_1 45,1,1
-turbo_e_4,258,364,0 duplicate(cos#tt_main) #cos_e4_2 45,1,1
-turbo_e_4,385,365,0 duplicate(cos#tt_main) #cos_e4_3 45,1,1
-turbo_e_4,250,200,0 duplicate(cos#tt_main) #cos_e4_5 45,1,1
-turbo_e_4,389,275,0 duplicate(cos#tt_main) #cos_e4_6 45,1,1
-turbo_e_4,93,19,0 duplicate(cos#tt_main) #cos_e4_7 45,1,1
-turbo_e_8,168,363,0 duplicate(cos#tt_main) #cos_e8_1 45,1,1
-turbo_e_8,258,364,0 duplicate(cos#tt_main) #cos_e8_2 45,1,1
-turbo_e_8,385,365,0 duplicate(cos#tt_main) #cos_e8_3 45,1,1
-turbo_e_8,250,200,0 duplicate(cos#tt_main) #cos_e8_5 45,1,1
-turbo_e_8,389,275,0 duplicate(cos#tt_main) #cos_e8_6 45,1,1
-turbo_e_8,93,19,0 duplicate(cos#tt_main) #cos_e8_7 45,1,1
-turbo_e_16,168,363,0 duplicate(cos#tt_main) #cos_e16_1 45,1,1
-turbo_e_16,258,364,0 duplicate(cos#tt_main) #cos_e16_2 45,1,1
-turbo_e_16,385,365,0 duplicate(cos#tt_main) #cos_e16_3 45,1,1
-turbo_e_16,250,200,0 duplicate(cos#tt_main) #cos_e16_5 45,1,1
-turbo_e_16,389,275,0 duplicate(cos#tt_main) #cos_e16_6 45,1,1
-turbo_e_16,93,19,0 duplicate(cos#tt_main) #cos_e16_7 45,1,1
-turbo_e_16,232,14,0 duplicate(cos#tt_main) #cos_e16_8 45,1,1
-turbo_n_4,168,363,0 duplicate(cos#tt_main) #cos_n4_1 45,1,1
-turbo_n_4,258,364,0 duplicate(cos#tt_main) #cos_n4_2 45,1,1
-turbo_n_4,385,365,0 duplicate(cos#tt_main) #cos_n4_3 45,1,1
-turbo_n_4,250,200,0 duplicate(cos#tt_main) #cos_n4_5 45,1,1
-turbo_n_4,389,275,0 duplicate(cos#tt_main) #cos_n4_6 45,1,1
-turbo_n_4,93,19,0 duplicate(cos#tt_main) #cos_n4_7 45,1,1
-turbo_n_8,168,363,0 duplicate(cos#tt_main) #cos_n8_1 45,1,1
-turbo_n_8,258,364,0 duplicate(cos#tt_main) #cos_n8_2 45,1,1
-turbo_n_8,385,365,0 duplicate(cos#tt_main) #cos_n8_3 45,1,1
-turbo_n_8,250,200,0 duplicate(cos#tt_main) #cos_n8_5 45,1,1
-turbo_n_8,389,275,0 duplicate(cos#tt_main) #cos_n8_6 45,1,1
-turbo_n_8,93,19,0 duplicate(cos#tt_main) #cos_n8_7 45,1,1
-turbo_n_16,168,363,0 duplicate(cos#tt_main) #cos_n16_1 45,1,1
-turbo_n_16,258,364,0 duplicate(cos#tt_main) #cos_n16_2 45,1,1
-turbo_n_16,385,365,0 duplicate(cos#tt_main) #cos_n16_3 45,1,1
-turbo_n_16,250,200,0 duplicate(cos#tt_main) #cos_n16_5 45,1,1
-turbo_n_16,389,275,0 duplicate(cos#tt_main) #cos_n16_6 45,1,1
-turbo_n_16,93,19,0 duplicate(cos#tt_main) #cos_n16_7 45,1,1
-turbo_n_16,232,14,0 duplicate(cos#tt_main) #cos_n16_8 45,1,1
-turbo_n_1,168,363,0 duplicate(cos#tt_main) #cos_n1_1 45,1,1
-turbo_n_1,258,364,0 duplicate(cos#tt_main) #cos_n1_2 45,1,1
-turbo_n_1,385,365,0 duplicate(cos#tt_main) #cos_n1_3 45,1,1
-turbo_n_1,250,200,0 duplicate(cos#tt_main) #cos_n1_5 45,1,1
-turbo_n_1,389,275,0 duplicate(cos#tt_main) #cos_n1_6 45,1,1
-turbo_n_1,93,19,0 duplicate(cos#tt_main) #cos_n1_7 45,1,1
-turbo_n_1,232,14,0 duplicate(cos#tt_main) #cos_n1_8 45,1,1
+turbo_e_4,168,363,0 duplicate(cos#tt_main) #cos_e4_1 WARPNPC,1,1
+turbo_e_4,258,364,0 duplicate(cos#tt_main) #cos_e4_2 WARPNPC,1,1
+turbo_e_4,385,365,0 duplicate(cos#tt_main) #cos_e4_3 WARPNPC,1,1
+turbo_e_4,250,200,0 duplicate(cos#tt_main) #cos_e4_5 WARPNPC,1,1
+turbo_e_4,389,275,0 duplicate(cos#tt_main) #cos_e4_6 WARPNPC,1,1
+turbo_e_4,93,19,0 duplicate(cos#tt_main) #cos_e4_7 WARPNPC,1,1
+turbo_e_8,168,363,0 duplicate(cos#tt_main) #cos_e8_1 WARPNPC,1,1
+turbo_e_8,258,364,0 duplicate(cos#tt_main) #cos_e8_2 WARPNPC,1,1
+turbo_e_8,385,365,0 duplicate(cos#tt_main) #cos_e8_3 WARPNPC,1,1
+turbo_e_8,250,200,0 duplicate(cos#tt_main) #cos_e8_5 WARPNPC,1,1
+turbo_e_8,389,275,0 duplicate(cos#tt_main) #cos_e8_6 WARPNPC,1,1
+turbo_e_8,93,19,0 duplicate(cos#tt_main) #cos_e8_7 WARPNPC,1,1
+turbo_e_16,168,363,0 duplicate(cos#tt_main) #cos_e16_1 WARPNPC,1,1
+turbo_e_16,258,364,0 duplicate(cos#tt_main) #cos_e16_2 WARPNPC,1,1
+turbo_e_16,385,365,0 duplicate(cos#tt_main) #cos_e16_3 WARPNPC,1,1
+turbo_e_16,250,200,0 duplicate(cos#tt_main) #cos_e16_5 WARPNPC,1,1
+turbo_e_16,389,275,0 duplicate(cos#tt_main) #cos_e16_6 WARPNPC,1,1
+turbo_e_16,93,19,0 duplicate(cos#tt_main) #cos_e16_7 WARPNPC,1,1
+turbo_e_16,232,14,0 duplicate(cos#tt_main) #cos_e16_8 WARPNPC,1,1
+turbo_n_4,168,363,0 duplicate(cos#tt_main) #cos_n4_1 WARPNPC,1,1
+turbo_n_4,258,364,0 duplicate(cos#tt_main) #cos_n4_2 WARPNPC,1,1
+turbo_n_4,385,365,0 duplicate(cos#tt_main) #cos_n4_3 WARPNPC,1,1
+turbo_n_4,250,200,0 duplicate(cos#tt_main) #cos_n4_5 WARPNPC,1,1
+turbo_n_4,389,275,0 duplicate(cos#tt_main) #cos_n4_6 WARPNPC,1,1
+turbo_n_4,93,19,0 duplicate(cos#tt_main) #cos_n4_7 WARPNPC,1,1
+turbo_n_8,168,363,0 duplicate(cos#tt_main) #cos_n8_1 WARPNPC,1,1
+turbo_n_8,258,364,0 duplicate(cos#tt_main) #cos_n8_2 WARPNPC,1,1
+turbo_n_8,385,365,0 duplicate(cos#tt_main) #cos_n8_3 WARPNPC,1,1
+turbo_n_8,250,200,0 duplicate(cos#tt_main) #cos_n8_5 WARPNPC,1,1
+turbo_n_8,389,275,0 duplicate(cos#tt_main) #cos_n8_6 WARPNPC,1,1
+turbo_n_8,93,19,0 duplicate(cos#tt_main) #cos_n8_7 WARPNPC,1,1
+turbo_n_16,168,363,0 duplicate(cos#tt_main) #cos_n16_1 WARPNPC,1,1
+turbo_n_16,258,364,0 duplicate(cos#tt_main) #cos_n16_2 WARPNPC,1,1
+turbo_n_16,385,365,0 duplicate(cos#tt_main) #cos_n16_3 WARPNPC,1,1
+turbo_n_16,250,200,0 duplicate(cos#tt_main) #cos_n16_5 WARPNPC,1,1
+turbo_n_16,389,275,0 duplicate(cos#tt_main) #cos_n16_6 WARPNPC,1,1
+turbo_n_16,93,19,0 duplicate(cos#tt_main) #cos_n16_7 WARPNPC,1,1
+turbo_n_16,232,14,0 duplicate(cos#tt_main) #cos_n16_8 WARPNPC,1,1
+turbo_n_1,168,363,0 duplicate(cos#tt_main) #cos_n1_1 WARPNPC,1,1
+turbo_n_1,258,364,0 duplicate(cos#tt_main) #cos_n1_2 WARPNPC,1,1
+turbo_n_1,385,365,0 duplicate(cos#tt_main) #cos_n1_3 WARPNPC,1,1
+turbo_n_1,250,200,0 duplicate(cos#tt_main) #cos_n1_5 WARPNPC,1,1
+turbo_n_1,389,275,0 duplicate(cos#tt_main) #cos_n1_6 WARPNPC,1,1
+turbo_n_1,93,19,0 duplicate(cos#tt_main) #cos_n1_7 WARPNPC,1,1
+turbo_n_1,232,14,0 duplicate(cos#tt_main) #cos_n1_8 WARPNPC,1,1
turbo_e_16,179,55,0 script TurboHint_1#tt_main -1,1,1,{
OnTouch:
@@ -1961,15 +1961,15 @@ OnInit:
enablenpc "#cos_"+.@w$+"_end";
end;
}
-turbo_e_4,371,47,0 duplicate(cos_end#tt_main) #cos_e4_end 45,1,1
-turbo_e_8,371,47,0 duplicate(cos_end#tt_main) #cos_e8_end 45,1,1
-turbo_e_16,371,47,0 duplicate(cos_end#tt_main) #cos_e16_end 45,1,1
-turbo_n_4,371,47,0 duplicate(cos_end#tt_main) #cos_n4_end 45,1,1
-turbo_n_8,371,47,0 duplicate(cos_end#tt_main) #cos_n8_end 45,1,1
-turbo_n_16,371,47,0 duplicate(cos_end#tt_main) #cos_n16_end 45,1,1
-turbo_n_1,371,47,0 duplicate(cos_end#tt_main) #cos_n1_end 45,1,1
-
-- script cos_end2#tt_main 45,1,1,{
+turbo_e_4,371,47,0 duplicate(cos_end#tt_main) #cos_e4_end WARPNPC,1,1
+turbo_e_8,371,47,0 duplicate(cos_end#tt_main) #cos_e8_end WARPNPC,1,1
+turbo_e_16,371,47,0 duplicate(cos_end#tt_main) #cos_e16_end WARPNPC,1,1
+turbo_n_4,371,47,0 duplicate(cos_end#tt_main) #cos_n4_end WARPNPC,1,1
+turbo_n_8,371,47,0 duplicate(cos_end#tt_main) #cos_n8_end WARPNPC,1,1
+turbo_n_16,371,47,0 duplicate(cos_end#tt_main) #cos_n16_end WARPNPC,1,1
+turbo_n_1,371,47,0 duplicate(cos_end#tt_main) #cos_n1_end WARPNPC,1,1
+
+- script cos_end2#tt_main WARPNPC,1,1,{
OnTouch:
set .@w$,callfunc("F_tt");
mapannounce strnpcinfo(4),strcharinfo(0) +" is second to reach the Finish Line! Congratulations!",bc_map,"0xFFFF00";
@@ -1986,10 +1986,10 @@ OnInit:
disablenpc "#cos_"+.@w$+"_end2";
end;
}
-turbo_e_8,371,51,0 duplicate(cos_end2#tt_main) #cos_e8_end2 45,1,1
-turbo_e_16,371,51,0 duplicate(cos_end2#tt_main) #cos_e16_end2 45,1,1
-turbo_n_8,371,51,0 duplicate(cos_end2#tt_main) #cos_n8_end2 45,1,1
-turbo_n_16,371,51,0 duplicate(cos_end2#tt_main) #cos_n16_end2 45,1,1
+turbo_e_8,371,51,0 duplicate(cos_end2#tt_main) #cos_e8_end2 WARPNPC,1,1
+turbo_e_16,371,51,0 duplicate(cos_end2#tt_main) #cos_e16_end2 WARPNPC,1,1
+turbo_n_8,371,51,0 duplicate(cos_end2#tt_main) #cos_n8_end2 WARPNPC,1,1
+turbo_n_16,371,51,0 duplicate(cos_end2#tt_main) #cos_n16_end2 WARPNPC,1,1
- script cos_end3#tt_main -1,{
OnTouch:
@@ -2010,10 +2010,10 @@ OnInit:
disablenpc "#cos_"+.@w$+"_end3";
end;
}
-turbo_e_8,371,43,0 duplicate(cos_end3#tt_main) #cos_e8_end3 45,1,1
-turbo_e_16,371,43,0 duplicate(cos_end3#tt_main) #cos_e16_end3 45,1,1
-turbo_n_8,371,43,0 duplicate(cos_end3#tt_main) #cos_n8_end3 45,1,1
-turbo_n_16,371,43,0 duplicate(cos_end3#tt_main) #cos_n16_end3 45,1,1
+turbo_e_8,371,43,0 duplicate(cos_end3#tt_main) #cos_e8_end3 WARPNPC,1,1
+turbo_e_16,371,43,0 duplicate(cos_end3#tt_main) #cos_e16_end3 WARPNPC,1,1
+turbo_n_8,371,43,0 duplicate(cos_end3#tt_main) #cos_n8_end3 WARPNPC,1,1
+turbo_n_16,371,43,0 duplicate(cos_end3#tt_main) #cos_n16_end3 WARPNPC,1,1
turbo_e_4,316,365,0 script DSwitch#tt_main -1,1,1,{
OnTouch:
@@ -2044,20 +2044,20 @@ OnInit:
disablenpc strnpcinfo(0);
end;
}
-turbo_e_4,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#e4 45,1,1
-turbo_e_4,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#e4 45,1,1
-turbo_e_8,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#e8 45,1,1
-turbo_e_8,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#e8 45,1,1
-turbo_e_16,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#e16 45,1,1
-turbo_e_16,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#e16 45,1,1
-turbo_n_4,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#n4 45,1,1
-turbo_n_4,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n4 45,1,1
-turbo_n_8,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#n8 45,1,1
-turbo_n_8,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n8 45,1,1
-turbo_n_16,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#n16 45,1,1
-turbo_n_16,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n16 45,1,1
-turbo_n_1,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#n1 45,1,1
-turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 45,1,1
+turbo_e_4,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#e4 WARPNPC,1,1
+turbo_e_4,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#e4 WARPNPC,1,1
+turbo_e_8,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#e8 WARPNPC,1,1
+turbo_e_8,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#e8 WARPNPC,1,1
+turbo_e_16,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#e16 WARPNPC,1,1
+turbo_e_16,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#e16 WARPNPC,1,1
+turbo_n_4,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#n4 WARPNPC,1,1
+turbo_n_4,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n4 WARPNPC,1,1
+turbo_n_8,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#n8 WARPNPC,1,1
+turbo_n_8,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n8 WARPNPC,1,1
+turbo_n_16,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#n16 WARPNPC,1,1
+turbo_n_16,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n16 WARPNPC,1,1
+turbo_n_1,11,266,0 duplicate(Flasher#tt_main) Flasher_Exit_1#n1 WARPNPC,1,1
+turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1
- script WHelper#tt_main -1,{
function RName;
@@ -2537,14 +2537,14 @@ OnInit:
disablenpc "Winner Helper#TBT_"+.@w$;
end;
}
-turbo_e_4,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_e4 47
-turbo_e_8,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_e8 47
-turbo_e_16,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_e16 47
-turbo_n_4,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_n4 47
-turbo_n_8,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_n8 47
-turbo_n_16,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_n16 47
-
-turbo_n_1,384,167,1 script Guide#TBT_n1 47,{
+turbo_e_4,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_e4 1_M_01
+turbo_e_8,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_e8 1_M_01
+turbo_e_16,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_e16 1_M_01
+turbo_n_4,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_n4 1_M_01
+turbo_n_8,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_n8 1_M_01
+turbo_n_16,384,167,1 duplicate(WHelper#tt_main) Winner Helper#TBT_n16 1_M_01
+
+turbo_n_1,384,167,1 script Guide#TBT_n1 1_M_01,{
set .@hour_start,$@start_time / 10000;
set .@min_start,(($@start_time % 10000) / 100);
set .@sec_start,$@start_time % 100;
@@ -2896,629 +2896,629 @@ OnTouch:
percentheal -2,0;
end;
}
-turbo_e_4,307,55,0 duplicate(TurboTrap#tt_main) trap_e4#F1 139,1,1
-turbo_e_4,307,51,0 duplicate(TurboTrap#tt_main) trap_e4#F2 139,1,1
-turbo_e_4,307,47,0 duplicate(TurboTrap#tt_main) trap_e4#F3 139,1,1
-turbo_e_4,307,43,0 duplicate(TurboTrap#tt_main) trap_e4#F4 139,1,1
-turbo_e_4,307,39,0 duplicate(TurboTrap#tt_main) trap_e4#F5 139,1,1
-turbo_e_4,307,39,0 duplicate(TurboTrap#tt_main) trap_e4#F96 139,1,1
-turbo_e_4,312,56,0 duplicate(TurboTrap#tt_main) trap_e4#F6 139,1,1
-turbo_e_4,312,52,0 duplicate(TurboTrap#tt_main) trap_e4#F7 139,1,1
-turbo_e_4,312,48,0 duplicate(TurboTrap#tt_main) trap_e4#F8 139,1,1
-turbo_e_4,312,44,0 duplicate(TurboTrap#tt_main) trap_e4#F9 139,1,1
-turbo_e_4,312,40,0 duplicate(TurboTrap#tt_main) trap_e4#F10 139,1,1
-turbo_e_4,312,36,0 duplicate(TurboTrap#tt_main) trap_e4#F11 139,1,1
-turbo_e_4,316,55,0 duplicate(TurboTrap#tt_main) trap_e4#F12 139,1,1
-turbo_e_4,316,51,0 duplicate(TurboTrap#tt_main) trap_e4#F13 139,1,1
-turbo_e_4,316,47,0 duplicate(TurboTrap#tt_main) trap_e4#F14 139,1,1
-turbo_e_4,316,43,0 duplicate(TurboTrap#tt_main) trap_e4#F15 139,1,1
-turbo_e_4,316,39,0 duplicate(TurboTrap#tt_main) trap_e4#F16 139,1,1
-turbo_e_4,316,36,0 duplicate(TurboTrap#tt_main) trap_e4#F17 139,1,1
-turbo_e_4,320,56,0 duplicate(TurboTrap#tt_main) trap_e4#F18 139,1,1
-turbo_e_4,320,52,0 duplicate(TurboTrap#tt_main) trap_e4#F19 139,1,1
-turbo_e_4,320,48,0 duplicate(TurboTrap#tt_main) trap_e4#F20 139,1,1
-turbo_e_4,320,44,0 duplicate(TurboTrap#tt_main) trap_e4#F21 139,1,1
-turbo_e_4,320,40,0 duplicate(TurboTrap#tt_main) trap_e4#F22 139,1,1
-turbo_e_4,320,36,0 duplicate(TurboTrap#tt_main) trap_e4#F23 139,1,1
-turbo_e_4,324,55,0 duplicate(TurboTrap#tt_main) trap_e4#F24 139,1,1
-turbo_e_4,324,51,0 duplicate(TurboTrap#tt_main) trap_e4#F25 139,1,1
-turbo_e_4,324,47,0 duplicate(TurboTrap#tt_main) trap_e4#F26 139,1,1
-turbo_e_4,324,43,0 duplicate(TurboTrap#tt_main) trap_e4#F27 139,1,1
-turbo_e_4,324,39,0 duplicate(TurboTrap#tt_main) trap_e4#F28 139,1,1
-turbo_e_4,324,36,0 duplicate(TurboTrap#tt_main) trap_e4#F29 139,1,1
-turbo_e_4,328,56,0 duplicate(TurboTrap#tt_main) trap_e4#F30 139,1,1
-turbo_e_4,328,52,0 duplicate(TurboTrap#tt_main) trap_e4#F31 139,1,1
-turbo_e_4,328,48,0 duplicate(TurboTrap#tt_main) trap_e4#F32 139,1,1
-turbo_e_4,328,44,0 duplicate(TurboTrap#tt_main) trap_e4#F33 139,1,1
-turbo_e_4,328,40,0 duplicate(TurboTrap#tt_main) trap_e4#F34 139,1,1
-turbo_e_4,328,36,0 duplicate(TurboTrap#tt_main) trap_e4#F35 139,1,1
-turbo_e_4,332,55,0 duplicate(TurboTrap#tt_main) trap_e4#F36 139,1,1
-turbo_e_4,332,51,0 duplicate(TurboTrap#tt_main) trap_e4#F37 139,1,1
-turbo_e_4,332,47,0 duplicate(TurboTrap#tt_main) trap_e4#F38 139,1,1
-turbo_e_4,332,43,0 duplicate(TurboTrap#tt_main) trap_e4#F39 139,1,1
-turbo_e_4,332,39,0 duplicate(TurboTrap#tt_main) trap_e4#F40 139,1,1
-turbo_e_4,332,36,0 duplicate(TurboTrap#tt_main) trap_e4#F41 139,1,1
-turbo_e_8,307,55,0 duplicate(TurboTrap#tt_main) trap_e8#F1 139,1,1
-turbo_e_8,307,51,0 duplicate(TurboTrap#tt_main) trap_e8#F2 139,1,1
-turbo_e_8,307,47,0 duplicate(TurboTrap#tt_main) trap_e8#F3 139,1,1
-turbo_e_8,307,43,0 duplicate(TurboTrap#tt_main) trap_e8#F4 139,1,1
-turbo_e_8,307,39,0 duplicate(TurboTrap#tt_main) trap_e8#F5 139,1,1
-turbo_e_8,307,39,0 duplicate(TurboTrap#tt_main) trap_e8#F96 139,1,1
-turbo_e_8,312,56,0 duplicate(TurboTrap#tt_main) trap_e8#F6 139,1,1
-turbo_e_8,312,52,0 duplicate(TurboTrap#tt_main) trap_e8#F7 139,1,1
-turbo_e_8,312,48,0 duplicate(TurboTrap#tt_main) trap_e8#F8 139,1,1
-turbo_e_8,312,44,0 duplicate(TurboTrap#tt_main) trap_e8#F9 139,1,1
-turbo_e_8,312,40,0 duplicate(TurboTrap#tt_main) trap_e8#F10 139,1,1
-turbo_e_8,312,36,0 duplicate(TurboTrap#tt_main) trap_e8#F11 139,1,1
-turbo_e_8,316,55,0 duplicate(TurboTrap#tt_main) trap_e8#F12 139,1,1
-turbo_e_8,316,51,0 duplicate(TurboTrap#tt_main) trap_e8#F13 139,1,1
-turbo_e_8,316,47,0 duplicate(TurboTrap#tt_main) trap_e8#F14 139,1,1
-turbo_e_8,316,43,0 duplicate(TurboTrap#tt_main) trap_e8#F15 139,1,1
-turbo_e_8,316,39,0 duplicate(TurboTrap#tt_main) trap_e8#F16 139,1,1
-turbo_e_8,316,36,0 duplicate(TurboTrap#tt_main) trap_e8#F17 139,1,1
-turbo_e_8,320,56,0 duplicate(TurboTrap#tt_main) trap_e8#F18 139,1,1
-turbo_e_8,320,52,0 duplicate(TurboTrap#tt_main) trap_e8#F19 139,1,1
-turbo_e_8,320,48,0 duplicate(TurboTrap#tt_main) trap_e8#F20 139,1,1
-turbo_e_8,320,44,0 duplicate(TurboTrap#tt_main) trap_e8#F21 139,1,1
-turbo_e_8,320,40,0 duplicate(TurboTrap#tt_main) trap_e8#F22 139,1,1
-turbo_e_8,320,36,0 duplicate(TurboTrap#tt_main) trap_e8#F23 139,1,1
-turbo_e_8,324,55,0 duplicate(TurboTrap#tt_main) trap_e8#F24 139,1,1
-turbo_e_8,324,51,0 duplicate(TurboTrap#tt_main) trap_e8#F25 139,1,1
-turbo_e_8,324,47,0 duplicate(TurboTrap#tt_main) trap_e8#F26 139,1,1
-turbo_e_8,324,43,0 duplicate(TurboTrap#tt_main) trap_e8#F27 139,1,1
-turbo_e_8,324,39,0 duplicate(TurboTrap#tt_main) trap_e8#F28 139,1,1
-turbo_e_8,324,36,0 duplicate(TurboTrap#tt_main) trap_e8#F29 139,1,1
-turbo_e_8,328,56,0 duplicate(TurboTrap#tt_main) trap_e8#F30 139,1,1
-turbo_e_8,328,52,0 duplicate(TurboTrap#tt_main) trap_e8#F31 139,1,1
-turbo_e_8,328,48,0 duplicate(TurboTrap#tt_main) trap_e8#F32 139,1,1
-turbo_e_8,328,44,0 duplicate(TurboTrap#tt_main) trap_e8#F33 139,1,1
-turbo_e_8,328,40,0 duplicate(TurboTrap#tt_main) trap_e8#F34 139,1,1
-turbo_e_8,328,36,0 duplicate(TurboTrap#tt_main) trap_e8#F35 139,1,1
-turbo_e_8,332,55,0 duplicate(TurboTrap#tt_main) trap_e8#F36 139,1,1
-turbo_e_8,332,51,0 duplicate(TurboTrap#tt_main) trap_e8#F37 139,1,1
-turbo_e_8,332,47,0 duplicate(TurboTrap#tt_main) trap_e8#F38 139,1,1
-turbo_e_8,332,43,0 duplicate(TurboTrap#tt_main) trap_e8#F39 139,1,1
-turbo_e_8,332,39,0 duplicate(TurboTrap#tt_main) trap_e8#F40 139,1,1
-turbo_e_8,332,36,0 duplicate(TurboTrap#tt_main) trap_e8#F41 139,1,1
-turbo_e_16,307,55,0 duplicate(TurboTrap#tt_main) trap_e16#F1 139,1,1
-turbo_e_16,307,51,0 duplicate(TurboTrap#tt_main) trap_e16#F2 139,1,1
-turbo_e_16,307,47,0 duplicate(TurboTrap#tt_main) trap_e16#F3 139,1,1
-turbo_e_16,307,43,0 duplicate(TurboTrap#tt_main) trap_e16#F4 139,1,1
-turbo_e_16,307,39,0 duplicate(TurboTrap#tt_main) trap_e16#F5 139,1,1
-turbo_e_16,307,39,0 duplicate(TurboTrap#tt_main) trap_e16#F96 139,1,1
-turbo_e_16,312,56,0 duplicate(TurboTrap#tt_main) trap_e16#F6 139,1,1
-turbo_e_16,312,52,0 duplicate(TurboTrap#tt_main) trap_e16#F7 139,1,1
-turbo_e_16,312,48,0 duplicate(TurboTrap#tt_main) trap_e16#F8 139,1,1
-turbo_e_16,312,44,0 duplicate(TurboTrap#tt_main) trap_e16#F9 139,1,1
-turbo_e_16,312,40,0 duplicate(TurboTrap#tt_main) trap_e16#F10 139,1,1
-turbo_e_16,312,36,0 duplicate(TurboTrap#tt_main) trap_e16#F11 139,1,1
-turbo_e_16,316,55,0 duplicate(TurboTrap#tt_main) trap_e16#F12 139,1,1
-turbo_e_16,316,51,0 duplicate(TurboTrap#tt_main) trap_e16#F13 139,1,1
-turbo_e_16,316,47,0 duplicate(TurboTrap#tt_main) trap_e16#F14 139,1,1
-turbo_e_16,316,43,0 duplicate(TurboTrap#tt_main) trap_e16#F15 139,1,1
-turbo_e_16,316,39,0 duplicate(TurboTrap#tt_main) trap_e16#F16 139,1,1
-turbo_e_16,316,36,0 duplicate(TurboTrap#tt_main) trap_e16#F17 139,1,1
-turbo_e_16,320,56,0 duplicate(TurboTrap#tt_main) trap_e16#F18 139,1,1
-turbo_e_16,320,52,0 duplicate(TurboTrap#tt_main) trap_e16#F19 139,1,1
-turbo_e_16,320,48,0 duplicate(TurboTrap#tt_main) trap_e16#F20 139,1,1
-turbo_e_16,320,44,0 duplicate(TurboTrap#tt_main) trap_e16#F21 139,1,1
-turbo_e_16,320,40,0 duplicate(TurboTrap#tt_main) trap_e16#F22 139,1,1
-turbo_e_16,320,36,0 duplicate(TurboTrap#tt_main) trap_e16#F23 139,1,1
-turbo_e_16,324,55,0 duplicate(TurboTrap#tt_main) trap_e16#F24 139,1,1
-turbo_e_16,324,51,0 duplicate(TurboTrap#tt_main) trap_e16#F25 139,1,1
-turbo_e_16,324,47,0 duplicate(TurboTrap#tt_main) trap_e16#F26 139,1,1
-turbo_e_16,324,43,0 duplicate(TurboTrap#tt_main) trap_e16#F27 139,1,1
-turbo_e_16,324,39,0 duplicate(TurboTrap#tt_main) trap_e16#F28 139,1,1
-turbo_e_16,324,36,0 duplicate(TurboTrap#tt_main) trap_e16#F29 139,1,1
-turbo_e_16,328,56,0 duplicate(TurboTrap#tt_main) trap_e16#F30 139,1,1
-turbo_e_16,328,52,0 duplicate(TurboTrap#tt_main) trap_e16#F31 139,1,1
-turbo_e_16,328,48,0 duplicate(TurboTrap#tt_main) trap_e16#F32 139,1,1
-turbo_e_16,328,44,0 duplicate(TurboTrap#tt_main) trap_e16#F33 139,1,1
-turbo_e_16,328,40,0 duplicate(TurboTrap#tt_main) trap_e16#F34 139,1,1
-turbo_e_16,328,36,0 duplicate(TurboTrap#tt_main) trap_e16#F35 139,1,1
-turbo_e_16,332,55,0 duplicate(TurboTrap#tt_main) trap_e16#F36 139,1,1
-turbo_e_16,332,51,0 duplicate(TurboTrap#tt_main) trap_e16#F37 139,1,1
-turbo_e_16,332,47,0 duplicate(TurboTrap#tt_main) trap_e16#F38 139,1,1
-turbo_e_16,332,43,0 duplicate(TurboTrap#tt_main) trap_e16#F39 139,1,1
-turbo_e_16,332,39,0 duplicate(TurboTrap#tt_main) trap_e16#F40 139,1,1
-turbo_e_16,332,36,0 duplicate(TurboTrap#tt_main) trap_e16#F41 139,1,1
-turbo_n_4,307,55,0 duplicate(TurboTrap#tt_main) trap_n4#F1 139,1,1
-turbo_n_4,307,51,0 duplicate(TurboTrap#tt_main) trap_n4#F2 139,1,1
-turbo_n_4,307,47,0 duplicate(TurboTrap#tt_main) trap_n4#F3 139,1,1
-turbo_n_4,307,43,0 duplicate(TurboTrap#tt_main) trap_n4#F4 139,1,1
-turbo_n_4,307,39,0 duplicate(TurboTrap#tt_main) trap_n4#F5 139,1,1
-turbo_n_4,307,39,0 duplicate(TurboTrap#tt_main) trap_n4#F96 139,1,1
-turbo_n_4,312,56,0 duplicate(TurboTrap#tt_main) trap_n4#F6 139,1,1
-turbo_n_4,312,52,0 duplicate(TurboTrap#tt_main) trap_n4#F7 139,1,1
-turbo_n_4,312,48,0 duplicate(TurboTrap#tt_main) trap_n4#F8 139,1,1
-turbo_n_4,312,44,0 duplicate(TurboTrap#tt_main) trap_n4#F9 139,1,1
-turbo_n_4,312,40,0 duplicate(TurboTrap#tt_main) trap_n4#F10 139,1,1
-turbo_n_4,312,36,0 duplicate(TurboTrap#tt_main) trap_n4#F11 139,1,1
-turbo_n_4,316,55,0 duplicate(TurboTrap#tt_main) trap_n4#F12 139,1,1
-turbo_n_4,316,51,0 duplicate(TurboTrap#tt_main) trap_n4#F13 139,1,1
-turbo_n_4,316,47,0 duplicate(TurboTrap#tt_main) trap_n4#F14 139,1,1
-turbo_n_4,316,43,0 duplicate(TurboTrap#tt_main) trap_n4#F15 139,1,1
-turbo_n_4,316,39,0 duplicate(TurboTrap#tt_main) trap_n4#F16 139,1,1
-turbo_n_4,316,36,0 duplicate(TurboTrap#tt_main) trap_n4#F17 139,1,1
-turbo_n_4,320,56,0 duplicate(TurboTrap#tt_main) trap_n4#F18 139,1,1
-turbo_n_4,320,52,0 duplicate(TurboTrap#tt_main) trap_n4#F19 139,1,1
-turbo_n_4,320,48,0 duplicate(TurboTrap#tt_main) trap_n4#F20 139,1,1
-turbo_n_4,320,44,0 duplicate(TurboTrap#tt_main) trap_n4#F21 139,1,1
-turbo_n_4,320,40,0 duplicate(TurboTrap#tt_main) trap_n4#F22 139,1,1
-turbo_n_4,320,36,0 duplicate(TurboTrap#tt_main) trap_n4#F23 139,1,1
-turbo_n_4,324,55,0 duplicate(TurboTrap#tt_main) trap_n4#F24 139,1,1
-turbo_n_4,324,51,0 duplicate(TurboTrap#tt_main) trap_n4#F25 139,1,1
-turbo_n_4,324,47,0 duplicate(TurboTrap#tt_main) trap_n4#F26 139,1,1
-turbo_n_4,324,43,0 duplicate(TurboTrap#tt_main) trap_n4#F27 139,1,1
-turbo_n_4,324,39,0 duplicate(TurboTrap#tt_main) trap_n4#F28 139,1,1
-turbo_n_4,324,36,0 duplicate(TurboTrap#tt_main) trap_n4#F29 139,1,1
-turbo_n_4,328,56,0 duplicate(TurboTrap#tt_main) trap_n4#F30 139,1,1
-turbo_n_4,328,52,0 duplicate(TurboTrap#tt_main) trap_n4#F31 139,1,1
-turbo_n_4,328,48,0 duplicate(TurboTrap#tt_main) trap_n4#F32 139,1,1
-turbo_n_4,328,44,0 duplicate(TurboTrap#tt_main) trap_n4#F33 139,1,1
-turbo_n_4,328,40,0 duplicate(TurboTrap#tt_main) trap_n4#F34 139,1,1
-turbo_n_4,328,36,0 duplicate(TurboTrap#tt_main) trap_n4#F35 139,1,1
-turbo_n_4,332,55,0 duplicate(TurboTrap#tt_main) trap_n4#F36 139,1,1
-turbo_n_4,332,51,0 duplicate(TurboTrap#tt_main) trap_n4#F37 139,1,1
-turbo_n_4,332,47,0 duplicate(TurboTrap#tt_main) trap_n4#F38 139,1,1
-turbo_n_4,332,43,0 duplicate(TurboTrap#tt_main) trap_n4#F39 139,1,1
-turbo_n_4,332,39,0 duplicate(TurboTrap#tt_main) trap_n4#F40 139,1,1
-turbo_n_4,332,36,0 duplicate(TurboTrap#tt_main) trap_n4#F41 139,1,1
-turbo_n_8,307,55,0 duplicate(TurboTrap#tt_main) trap_n8#F1 139,1,1
-turbo_n_8,307,51,0 duplicate(TurboTrap#tt_main) trap_n8#F2 139,1,1
-turbo_n_8,307,47,0 duplicate(TurboTrap#tt_main) trap_n8#F3 139,1,1
-turbo_n_8,307,43,0 duplicate(TurboTrap#tt_main) trap_n8#F4 139,1,1
-turbo_n_8,307,39,0 duplicate(TurboTrap#tt_main) trap_n8#F5 139,1,1
-turbo_n_8,307,39,0 duplicate(TurboTrap#tt_main) trap_n8#F96 139,1,1
-turbo_n_8,312,56,0 duplicate(TurboTrap#tt_main) trap_n8#F6 139,1,1
-turbo_n_8,312,52,0 duplicate(TurboTrap#tt_main) trap_n8#F7 139,1,1
-turbo_n_8,312,48,0 duplicate(TurboTrap#tt_main) trap_n8#F8 139,1,1
-turbo_n_8,312,44,0 duplicate(TurboTrap#tt_main) trap_n8#F9 139,1,1
-turbo_n_8,312,40,0 duplicate(TurboTrap#tt_main) trap_n8#F10 139,1,1
-turbo_n_8,312,36,0 duplicate(TurboTrap#tt_main) trap_n8#F11 139,1,1
-turbo_n_8,316,55,0 duplicate(TurboTrap#tt_main) trap_n8#F12 139,1,1
-turbo_n_8,316,51,0 duplicate(TurboTrap#tt_main) trap_n8#F13 139,1,1
-turbo_n_8,316,47,0 duplicate(TurboTrap#tt_main) trap_n8#F14 139,1,1
-turbo_n_8,316,43,0 duplicate(TurboTrap#tt_main) trap_n8#F15 139,1,1
-turbo_n_8,316,39,0 duplicate(TurboTrap#tt_main) trap_n8#F16 139,1,1
-turbo_n_8,316,36,0 duplicate(TurboTrap#tt_main) trap_n8#F17 139,1,1
-turbo_n_8,320,56,0 duplicate(TurboTrap#tt_main) trap_n8#F18 139,1,1
-turbo_n_8,320,52,0 duplicate(TurboTrap#tt_main) trap_n8#F19 139,1,1
-turbo_n_8,320,48,0 duplicate(TurboTrap#tt_main) trap_n8#F20 139,1,1
-turbo_n_8,320,44,0 duplicate(TurboTrap#tt_main) trap_n8#F21 139,1,1
-turbo_n_8,320,40,0 duplicate(TurboTrap#tt_main) trap_n8#F22 139,1,1
-turbo_n_8,320,36,0 duplicate(TurboTrap#tt_main) trap_n8#F23 139,1,1
-turbo_n_8,324,55,0 duplicate(TurboTrap#tt_main) trap_n8#F24 139,1,1
-turbo_n_8,324,51,0 duplicate(TurboTrap#tt_main) trap_n8#F25 139,1,1
-turbo_n_8,324,47,0 duplicate(TurboTrap#tt_main) trap_n8#F26 139,1,1
-turbo_n_8,324,43,0 duplicate(TurboTrap#tt_main) trap_n8#F27 139,1,1
-turbo_n_8,324,39,0 duplicate(TurboTrap#tt_main) trap_n8#F28 139,1,1
-turbo_n_8,324,36,0 duplicate(TurboTrap#tt_main) trap_n8#F29 139,1,1
-turbo_n_8,328,56,0 duplicate(TurboTrap#tt_main) trap_n8#F30 139,1,1
-turbo_n_8,328,52,0 duplicate(TurboTrap#tt_main) trap_n8#F31 139,1,1
-turbo_n_8,328,48,0 duplicate(TurboTrap#tt_main) trap_n8#F32 139,1,1
-turbo_n_8,328,44,0 duplicate(TurboTrap#tt_main) trap_n8#F33 139,1,1
-turbo_n_8,328,40,0 duplicate(TurboTrap#tt_main) trap_n8#F34 139,1,1
-turbo_n_8,328,36,0 duplicate(TurboTrap#tt_main) trap_n8#F35 139,1,1
-turbo_n_8,332,55,0 duplicate(TurboTrap#tt_main) trap_n8#F36 139,1,1
-turbo_n_8,332,51,0 duplicate(TurboTrap#tt_main) trap_n8#F37 139,1,1
-turbo_n_8,332,47,0 duplicate(TurboTrap#tt_main) trap_n8#F38 139,1,1
-turbo_n_8,332,43,0 duplicate(TurboTrap#tt_main) trap_n8#F39 139,1,1
-turbo_n_8,332,39,0 duplicate(TurboTrap#tt_main) trap_n8#F40 139,1,1
-turbo_n_8,332,36,0 duplicate(TurboTrap#tt_main) trap_n8#F41 139,1,1
-turbo_n_16,307,55,0 duplicate(TurboTrap#tt_main) trap_n16#F1 139,1,1
-turbo_n_16,307,51,0 duplicate(TurboTrap#tt_main) trap_n16#F2 139,1,1
-turbo_n_16,307,47,0 duplicate(TurboTrap#tt_main) trap_n16#F3 139,1,1
-turbo_n_16,307,43,0 duplicate(TurboTrap#tt_main) trap_n16#F4 139,1,1
-turbo_n_16,307,39,0 duplicate(TurboTrap#tt_main) trap_n16#F5 139,1,1
-turbo_n_16,307,39,0 duplicate(TurboTrap#tt_main) trap_n16#F96 139,1,1
-turbo_n_16,312,56,0 duplicate(TurboTrap#tt_main) trap_n16#F6 139,1,1
-turbo_n_16,312,52,0 duplicate(TurboTrap#tt_main) trap_n16#F7 139,1,1
-turbo_n_16,312,48,0 duplicate(TurboTrap#tt_main) trap_n16#F8 139,1,1
-turbo_n_16,312,44,0 duplicate(TurboTrap#tt_main) trap_n16#F9 139,1,1
-turbo_n_16,312,40,0 duplicate(TurboTrap#tt_main) trap_n16#F10 139,1,1
-turbo_n_16,312,36,0 duplicate(TurboTrap#tt_main) trap_n16#F11 139,1,1
-turbo_n_16,316,55,0 duplicate(TurboTrap#tt_main) trap_n16#F12 139,1,1
-turbo_n_16,316,51,0 duplicate(TurboTrap#tt_main) trap_n16#F13 139,1,1
-turbo_n_16,316,47,0 duplicate(TurboTrap#tt_main) trap_n16#F14 139,1,1
-turbo_n_16,316,43,0 duplicate(TurboTrap#tt_main) trap_n16#F15 139,1,1
-turbo_n_16,316,39,0 duplicate(TurboTrap#tt_main) trap_n16#F16 139,1,1
-turbo_n_16,316,36,0 duplicate(TurboTrap#tt_main) trap_n16#F17 139,1,1
-turbo_n_16,320,56,0 duplicate(TurboTrap#tt_main) trap_n16#F18 139,1,1
-turbo_n_16,320,52,0 duplicate(TurboTrap#tt_main) trap_n16#F19 139,1,1
-turbo_n_16,320,48,0 duplicate(TurboTrap#tt_main) trap_n16#F20 139,1,1
-turbo_n_16,320,44,0 duplicate(TurboTrap#tt_main) trap_n16#F21 139,1,1
-turbo_n_16,320,40,0 duplicate(TurboTrap#tt_main) trap_n16#F22 139,1,1
-turbo_n_16,320,36,0 duplicate(TurboTrap#tt_main) trap_n16#F23 139,1,1
-turbo_n_16,324,55,0 duplicate(TurboTrap#tt_main) trap_n16#F24 139,1,1
-turbo_n_16,324,51,0 duplicate(TurboTrap#tt_main) trap_n16#F25 139,1,1
-turbo_n_16,324,47,0 duplicate(TurboTrap#tt_main) trap_n16#F26 139,1,1
-turbo_n_16,324,43,0 duplicate(TurboTrap#tt_main) trap_n16#F27 139,1,1
-turbo_n_16,324,39,0 duplicate(TurboTrap#tt_main) trap_n16#F28 139,1,1
-turbo_n_16,324,36,0 duplicate(TurboTrap#tt_main) trap_n16#F29 139,1,1
-turbo_n_16,328,56,0 duplicate(TurboTrap#tt_main) trap_n16#F30 139,1,1
-turbo_n_16,328,52,0 duplicate(TurboTrap#tt_main) trap_n16#F31 139,1,1
-turbo_n_16,328,48,0 duplicate(TurboTrap#tt_main) trap_n16#F32 139,1,1
-turbo_n_16,328,44,0 duplicate(TurboTrap#tt_main) trap_n16#F33 139,1,1
-turbo_n_16,328,40,0 duplicate(TurboTrap#tt_main) trap_n16#F34 139,1,1
-turbo_n_16,328,36,0 duplicate(TurboTrap#tt_main) trap_n16#F35 139,1,1
-turbo_n_16,332,55,0 duplicate(TurboTrap#tt_main) trap_n16#F36 139,1,1
-turbo_n_16,332,51,0 duplicate(TurboTrap#tt_main) trap_n16#F37 139,1,1
-turbo_n_16,332,47,0 duplicate(TurboTrap#tt_main) trap_n16#F38 139,1,1
-turbo_n_16,332,43,0 duplicate(TurboTrap#tt_main) trap_n16#F39 139,1,1
-turbo_n_16,332,39,0 duplicate(TurboTrap#tt_main) trap_n16#F40 139,1,1
-turbo_n_16,332,36,0 duplicate(TurboTrap#tt_main) trap_n16#F41 139,1,1
-turbo_n_1,307,55,0 duplicate(TurboTrap#tt_main) trap_n1#F1 139,1,1
-turbo_n_1,307,51,0 duplicate(TurboTrap#tt_main) trap_n1#F2 139,1,1
-turbo_n_1,307,47,0 duplicate(TurboTrap#tt_main) trap_n1#F3 139,1,1
-turbo_n_1,307,43,0 duplicate(TurboTrap#tt_main) trap_n1#F4 139,1,1
-turbo_n_1,307,39,0 duplicate(TurboTrap#tt_main) trap_n1#F5 139,1,1
-turbo_n_1,307,39,0 duplicate(TurboTrap#tt_main) trap_n1#F96 139,1,1
-turbo_n_1,312,56,0 duplicate(TurboTrap#tt_main) trap_n1#F6 139,1,1
-turbo_n_1,312,52,0 duplicate(TurboTrap#tt_main) trap_n1#F7 139,1,1
-turbo_n_1,312,48,0 duplicate(TurboTrap#tt_main) trap_n1#F8 139,1,1
-turbo_n_1,312,44,0 duplicate(TurboTrap#tt_main) trap_n1#F9 139,1,1
-turbo_n_1,312,40,0 duplicate(TurboTrap#tt_main) trap_n1#F10 139,1,1
-turbo_n_1,312,36,0 duplicate(TurboTrap#tt_main) trap_n1#F11 139,1,1
-turbo_n_1,316,55,0 duplicate(TurboTrap#tt_main) trap_n1#F12 139,1,1
-turbo_n_1,316,51,0 duplicate(TurboTrap#tt_main) trap_n1#F13 139,1,1
-turbo_n_1,316,47,0 duplicate(TurboTrap#tt_main) trap_n1#F14 139,1,1
-turbo_n_1,316,43,0 duplicate(TurboTrap#tt_main) trap_n1#F15 139,1,1
-turbo_n_1,316,39,0 duplicate(TurboTrap#tt_main) trap_n1#F16 139,1,1
-turbo_n_1,316,36,0 duplicate(TurboTrap#tt_main) trap_n1#F17 139,1,1
-turbo_n_1,320,56,0 duplicate(TurboTrap#tt_main) trap_n1#F18 139,1,1
-turbo_n_1,320,52,0 duplicate(TurboTrap#tt_main) trap_n1#F19 139,1,1
-turbo_n_1,320,48,0 duplicate(TurboTrap#tt_main) trap_n1#F20 139,1,1
-turbo_n_1,320,44,0 duplicate(TurboTrap#tt_main) trap_n1#F21 139,1,1
-turbo_n_1,320,40,0 duplicate(TurboTrap#tt_main) trap_n1#F22 139,1,1
-turbo_n_1,320,36,0 duplicate(TurboTrap#tt_main) trap_n1#F23 139,1,1
-turbo_n_1,324,55,0 duplicate(TurboTrap#tt_main) trap_n1#F24 139,1,1
-turbo_n_1,324,51,0 duplicate(TurboTrap#tt_main) trap_n1#F25 139,1,1
-turbo_n_1,324,47,0 duplicate(TurboTrap#tt_main) trap_n1#F26 139,1,1
-turbo_n_1,324,43,0 duplicate(TurboTrap#tt_main) trap_n1#F27 139,1,1
-turbo_n_1,324,39,0 duplicate(TurboTrap#tt_main) trap_n1#F28 139,1,1
-turbo_n_1,324,36,0 duplicate(TurboTrap#tt_main) trap_n1#F29 139,1,1
-turbo_n_1,328,56,0 duplicate(TurboTrap#tt_main) trap_n1#F30 139,1,1
-turbo_n_1,328,52,0 duplicate(TurboTrap#tt_main) trap_n1#F31 139,1,1
-turbo_n_1,328,48,0 duplicate(TurboTrap#tt_main) trap_n1#F32 139,1,1
-turbo_n_1,328,44,0 duplicate(TurboTrap#tt_main) trap_n1#F33 139,1,1
-turbo_n_1,328,40,0 duplicate(TurboTrap#tt_main) trap_n1#F34 139,1,1
-turbo_n_1,328,36,0 duplicate(TurboTrap#tt_main) trap_n1#F35 139,1,1
-turbo_n_1,332,55,0 duplicate(TurboTrap#tt_main) trap_n1#F36 139,1,1
-turbo_n_1,332,51,0 duplicate(TurboTrap#tt_main) trap_n1#F37 139,1,1
-turbo_n_1,332,47,0 duplicate(TurboTrap#tt_main) trap_n1#F38 139,1,1
-turbo_n_1,332,43,0 duplicate(TurboTrap#tt_main) trap_n1#F39 139,1,1
-turbo_n_1,332,39,0 duplicate(TurboTrap#tt_main) trap_n1#F40 139,1,1
-turbo_n_1,332,36,0 duplicate(TurboTrap#tt_main) trap_n1#F41 139,1,1
-turbo_e_4,340,51,0 duplicate(TurboTrap#tt_main) trap_e4#F49 139,1,1
-turbo_e_4,340,47,0 duplicate(TurboTrap#tt_main) trap_e4#F50 139,1,1
-turbo_e_4,340,43,0 duplicate(TurboTrap#tt_main) trap_e4#F51 139,1,1
-turbo_e_4,340,39,0 duplicate(TurboTrap#tt_main) trap_e4#F52 139,1,1
-turbo_e_4,340,36,0 duplicate(TurboTrap#tt_main) trap_e4#F53 139,1,1
-turbo_e_4,344,56,0 duplicate(TurboTrap#tt_main) trap_e4#F54 139,1,1
-turbo_e_4,344,52,0 duplicate(TurboTrap#tt_main) trap_e4#F55 139,1,1
-turbo_e_4,344,48,0 duplicate(TurboTrap#tt_main) trap_e4#F56 139,1,1
-turbo_e_4,344,44,0 duplicate(TurboTrap#tt_main) trap_e4#F57 139,1,1
-turbo_e_4,344,40,0 duplicate(TurboTrap#tt_main) trap_e4#F58 139,1,1
-turbo_e_4,344,36,0 duplicate(TurboTrap#tt_main) trap_e4#F59 139,1,1
-turbo_e_4,348,55,0 duplicate(TurboTrap#tt_main) trap_e4#F60 139,1,1
-turbo_e_4,348,51,0 duplicate(TurboTrap#tt_main) trap_e4#F61 139,1,1
-turbo_e_4,348,47,0 duplicate(TurboTrap#tt_main) trap_e4#F62 139,1,1
-turbo_e_4,348,43,0 duplicate(TurboTrap#tt_main) trap_e4#F63 139,1,1
-turbo_e_4,348,39,0 duplicate(TurboTrap#tt_main) trap_e4#F64 139,1,1
-turbo_e_4,348,36,0 duplicate(TurboTrap#tt_main) trap_e4#F65 139,1,1
-turbo_e_4,352,56,0 duplicate(TurboTrap#tt_main) trap_e4#F66 139,1,1
-turbo_e_4,352,52,0 duplicate(TurboTrap#tt_main) trap_e4#F67 139,1,1
-turbo_e_4,352,48,0 duplicate(TurboTrap#tt_main) trap_e4#F68 139,1,1
-turbo_e_4,352,44,0 duplicate(TurboTrap#tt_main) trap_e4#F69 139,1,1
-turbo_e_4,352,40,0 duplicate(TurboTrap#tt_main) trap_e4#F70 139,1,1
-turbo_e_4,352,36,0 duplicate(TurboTrap#tt_main) trap_e4#F71 139,1,1
-turbo_e_4,356,55,0 duplicate(TurboTrap#tt_main) trap_e4#F72 139,1,1
-turbo_e_4,356,51,0 duplicate(TurboTrap#tt_main) trap_e4#F73 139,1,1
-turbo_e_4,356,47,0 duplicate(TurboTrap#tt_main) trap_e4#F74 139,1,1
-turbo_e_4,356,43,0 duplicate(TurboTrap#tt_main) trap_e4#F75 139,1,1
-turbo_e_4,356,39,0 duplicate(TurboTrap#tt_main) trap_e4#F76 139,1,1
-turbo_e_4,356,36,0 duplicate(TurboTrap#tt_main) trap_e4#F77 139,1,1
-turbo_e_4,360,56,0 duplicate(TurboTrap#tt_main) trap_e4#F78 139,1,1
-turbo_e_4,360,52,0 duplicate(TurboTrap#tt_main) trap_e4#F79 139,1,1
-turbo_e_4,360,48,0 duplicate(TurboTrap#tt_main) trap_e4#F80 139,1,1
-turbo_e_4,360,44,0 duplicate(TurboTrap#tt_main) trap_e4#F81 139,1,1
-turbo_e_4,360,40,0 duplicate(TurboTrap#tt_main) trap_e4#F82 139,1,1
-turbo_e_4,360,36,0 duplicate(TurboTrap#tt_main) trap_e4#F83 139,1,1
-turbo_e_4,364,55,0 duplicate(TurboTrap#tt_main) trap_e4#F84 139,1,1
-turbo_e_4,364,51,0 duplicate(TurboTrap#tt_main) trap_e4#F85 139,1,1
-turbo_e_4,364,47,0 duplicate(TurboTrap#tt_main) trap_e4#F86 139,1,1
-turbo_e_4,364,43,0 duplicate(TurboTrap#tt_main) trap_e4#F87 139,1,1
-turbo_e_4,364,39,0 duplicate(TurboTrap#tt_main) trap_e4#F88 139,1,1
-turbo_e_4,364,36,0 duplicate(TurboTrap#tt_main) trap_e4#F89 139,1,1
-turbo_e_4,368,56,0 duplicate(TurboTrap#tt_main) trap_e4#F90 139,1,1
-turbo_e_4,368,52,0 duplicate(TurboTrap#tt_main) trap_e4#F91 139,1,1
-turbo_e_4,368,48,0 duplicate(TurboTrap#tt_main) trap_e4#F92 139,1,1
-turbo_e_4,368,44,0 duplicate(TurboTrap#tt_main) trap_e4#F93 139,1,1
-turbo_e_4,368,40,0 duplicate(TurboTrap#tt_main) trap_e4#F94 139,1,1
-turbo_e_4,368,36,0 duplicate(TurboTrap#tt_main) trap_e4#F95 139,1,1
-turbo_e_8,340,51,0 duplicate(TurboTrap#tt_main) trap_e8#F49 139,1,1
-turbo_e_8,340,47,0 duplicate(TurboTrap#tt_main) trap_e8#F50 139,1,1
-turbo_e_8,340,43,0 duplicate(TurboTrap#tt_main) trap_e8#F51 139,1,1
-turbo_e_8,340,39,0 duplicate(TurboTrap#tt_main) trap_e8#F52 139,1,1
-turbo_e_8,340,36,0 duplicate(TurboTrap#tt_main) trap_e8#F53 139,1,1
-turbo_e_8,344,56,0 duplicate(TurboTrap#tt_main) trap_e8#F54 139,1,1
-turbo_e_8,344,52,0 duplicate(TurboTrap#tt_main) trap_e8#F55 139,1,1
-turbo_e_8,344,48,0 duplicate(TurboTrap#tt_main) trap_e8#F56 139,1,1
-turbo_e_8,344,44,0 duplicate(TurboTrap#tt_main) trap_e8#F57 139,1,1
-turbo_e_8,344,40,0 duplicate(TurboTrap#tt_main) trap_e8#F58 139,1,1
-turbo_e_8,344,36,0 duplicate(TurboTrap#tt_main) trap_e8#F59 139,1,1
-turbo_e_8,348,55,0 duplicate(TurboTrap#tt_main) trap_e8#F60 139,1,1
-turbo_e_8,348,51,0 duplicate(TurboTrap#tt_main) trap_e8#F61 139,1,1
-turbo_e_8,348,47,0 duplicate(TurboTrap#tt_main) trap_e8#F62 139,1,1
-turbo_e_8,348,43,0 duplicate(TurboTrap#tt_main) trap_e8#F63 139,1,1
-turbo_e_8,348,39,0 duplicate(TurboTrap#tt_main) trap_e8#F64 139,1,1
-turbo_e_8,348,36,0 duplicate(TurboTrap#tt_main) trap_e8#F65 139,1,1
-turbo_e_8,352,56,0 duplicate(TurboTrap#tt_main) trap_e8#F66 139,1,1
-turbo_e_8,352,52,0 duplicate(TurboTrap#tt_main) trap_e8#F67 139,1,1
-turbo_e_8,352,48,0 duplicate(TurboTrap#tt_main) trap_e8#F68 139,1,1
-turbo_e_8,352,44,0 duplicate(TurboTrap#tt_main) trap_e8#F69 139,1,1
-turbo_e_8,352,40,0 duplicate(TurboTrap#tt_main) trap_e8#F70 139,1,1
-turbo_e_8,352,36,0 duplicate(TurboTrap#tt_main) trap_e8#F71 139,1,1
-turbo_e_8,356,55,0 duplicate(TurboTrap#tt_main) trap_e8#F72 139,1,1
-turbo_e_8,356,51,0 duplicate(TurboTrap#tt_main) trap_e8#F73 139,1,1
-turbo_e_8,356,47,0 duplicate(TurboTrap#tt_main) trap_e8#F74 139,1,1
-turbo_e_8,356,43,0 duplicate(TurboTrap#tt_main) trap_e8#F75 139,1,1
-turbo_e_8,356,39,0 duplicate(TurboTrap#tt_main) trap_e8#F76 139,1,1
-turbo_e_8,356,36,0 duplicate(TurboTrap#tt_main) trap_e8#F77 139,1,1
-turbo_e_8,360,56,0 duplicate(TurboTrap#tt_main) trap_e8#F78 139,1,1
-turbo_e_8,360,52,0 duplicate(TurboTrap#tt_main) trap_e8#F79 139,1,1
-turbo_e_8,360,48,0 duplicate(TurboTrap#tt_main) trap_e8#F80 139,1,1
-turbo_e_8,360,44,0 duplicate(TurboTrap#tt_main) trap_e8#F81 139,1,1
-turbo_e_8,360,40,0 duplicate(TurboTrap#tt_main) trap_e8#F82 139,1,1
-turbo_e_8,360,36,0 duplicate(TurboTrap#tt_main) trap_e8#F83 139,1,1
-turbo_e_8,364,55,0 duplicate(TurboTrap#tt_main) trap_e8#F84 139,1,1
-turbo_e_8,364,51,0 duplicate(TurboTrap#tt_main) trap_e8#F85 139,1,1
-turbo_e_8,364,47,0 duplicate(TurboTrap#tt_main) trap_e8#F86 139,1,1
-turbo_e_8,364,43,0 duplicate(TurboTrap#tt_main) trap_e8#F87 139,1,1
-turbo_e_8,364,39,0 duplicate(TurboTrap#tt_main) trap_e8#F88 139,1,1
-turbo_e_8,364,36,0 duplicate(TurboTrap#tt_main) trap_e8#F89 139,1,1
-turbo_e_8,368,56,0 duplicate(TurboTrap#tt_main) trap_e8#F90 139,1,1
-turbo_e_8,368,52,0 duplicate(TurboTrap#tt_main) trap_e8#F91 139,1,1
-turbo_e_8,368,48,0 duplicate(TurboTrap#tt_main) trap_e8#F92 139,1,1
-turbo_e_8,368,44,0 duplicate(TurboTrap#tt_main) trap_e8#F93 139,1,1
-turbo_e_8,368,40,0 duplicate(TurboTrap#tt_main) trap_e8#F94 139,1,1
-turbo_e_8,368,36,0 duplicate(TurboTrap#tt_main) trap_e8#F95 139,1,1
-turbo_e_16,340,51,0 duplicate(TurboTrap#tt_main) trap_e16#F49 139,1,1
-turbo_e_16,340,47,0 duplicate(TurboTrap#tt_main) trap_e16#F50 139,1,1
-turbo_e_16,340,43,0 duplicate(TurboTrap#tt_main) trap_e16#F51 139,1,1
-turbo_e_16,340,39,0 duplicate(TurboTrap#tt_main) trap_e16#F52 139,1,1
-turbo_e_16,340,36,0 duplicate(TurboTrap#tt_main) trap_e16#F53 139,1,1
-turbo_e_16,344,56,0 duplicate(TurboTrap#tt_main) trap_e16#F54 139,1,1
-turbo_e_16,344,52,0 duplicate(TurboTrap#tt_main) trap_e16#F55 139,1,1
-turbo_e_16,344,48,0 duplicate(TurboTrap#tt_main) trap_e16#F56 139,1,1
-turbo_e_16,344,44,0 duplicate(TurboTrap#tt_main) trap_e16#F57 139,1,1
-turbo_e_16,344,40,0 duplicate(TurboTrap#tt_main) trap_e16#F58 139,1,1
-turbo_e_16,344,36,0 duplicate(TurboTrap#tt_main) trap_e16#F59 139,1,1
-turbo_e_16,348,55,0 duplicate(TurboTrap#tt_main) trap_e16#F60 139,1,1
-turbo_e_16,348,51,0 duplicate(TurboTrap#tt_main) trap_e16#F61 139,1,1
-turbo_e_16,348,47,0 duplicate(TurboTrap#tt_main) trap_e16#F62 139,1,1
-turbo_e_16,348,43,0 duplicate(TurboTrap#tt_main) trap_e16#F63 139,1,1
-turbo_e_16,348,39,0 duplicate(TurboTrap#tt_main) trap_e16#F64 139,1,1
-turbo_e_16,348,36,0 duplicate(TurboTrap#tt_main) trap_e16#F65 139,1,1
-turbo_e_16,352,56,0 duplicate(TurboTrap#tt_main) trap_e16#F66 139,1,1
-turbo_e_16,352,52,0 duplicate(TurboTrap#tt_main) trap_e16#F67 139,1,1
-turbo_e_16,352,48,0 duplicate(TurboTrap#tt_main) trap_e16#F68 139,1,1
-turbo_e_16,352,44,0 duplicate(TurboTrap#tt_main) trap_e16#F69 139,1,1
-turbo_e_16,352,40,0 duplicate(TurboTrap#tt_main) trap_e16#F70 139,1,1
-turbo_e_16,352,36,0 duplicate(TurboTrap#tt_main) trap_e16#F71 139,1,1
-turbo_e_16,356,55,0 duplicate(TurboTrap#tt_main) trap_e16#F72 139,1,1
-turbo_e_16,356,51,0 duplicate(TurboTrap#tt_main) trap_e16#F73 139,1,1
-turbo_e_16,356,47,0 duplicate(TurboTrap#tt_main) trap_e16#F74 139,1,1
-turbo_e_16,356,43,0 duplicate(TurboTrap#tt_main) trap_e16#F75 139,1,1
-turbo_e_16,356,39,0 duplicate(TurboTrap#tt_main) trap_e16#F76 139,1,1
-turbo_e_16,356,36,0 duplicate(TurboTrap#tt_main) trap_e16#F77 139,1,1
-turbo_e_16,360,56,0 duplicate(TurboTrap#tt_main) trap_e16#F78 139,1,1
-turbo_e_16,360,52,0 duplicate(TurboTrap#tt_main) trap_e16#F79 139,1,1
-turbo_e_16,360,48,0 duplicate(TurboTrap#tt_main) trap_e16#F80 139,1,1
-turbo_e_16,360,44,0 duplicate(TurboTrap#tt_main) trap_e16#F81 139,1,1
-turbo_e_16,360,40,0 duplicate(TurboTrap#tt_main) trap_e16#F82 139,1,1
-turbo_e_16,360,36,0 duplicate(TurboTrap#tt_main) trap_e16#F83 139,1,1
-turbo_e_16,364,55,0 duplicate(TurboTrap#tt_main) trap_e16#F84 139,1,1
-turbo_e_16,364,51,0 duplicate(TurboTrap#tt_main) trap_e16#F85 139,1,1
-turbo_e_16,364,47,0 duplicate(TurboTrap#tt_main) trap_e16#F86 139,1,1
-turbo_e_16,364,43,0 duplicate(TurboTrap#tt_main) trap_e16#F87 139,1,1
-turbo_e_16,364,39,0 duplicate(TurboTrap#tt_main) trap_e16#F88 139,1,1
-turbo_e_16,364,36,0 duplicate(TurboTrap#tt_main) trap_e16#F89 139,1,1
-turbo_e_16,368,56,0 duplicate(TurboTrap#tt_main) trap_e16#F90 139,1,1
-turbo_e_16,368,52,0 duplicate(TurboTrap#tt_main) trap_e16#F91 139,1,1
-turbo_e_16,368,48,0 duplicate(TurboTrap#tt_main) trap_e16#F92 139,1,1
-turbo_e_16,368,44,0 duplicate(TurboTrap#tt_main) trap_e16#F93 139,1,1
-turbo_e_16,368,40,0 duplicate(TurboTrap#tt_main) trap_e16#F94 139,1,1
-turbo_e_16,368,36,0 duplicate(TurboTrap#tt_main) trap_e16#F95 139,1,1
-turbo_n_4,340,51,0 duplicate(TurboTrap#tt_main) trap_n4#F49 139,1,1
-turbo_n_4,340,47,0 duplicate(TurboTrap#tt_main) trap_n4#F50 139,1,1
-turbo_n_4,340,43,0 duplicate(TurboTrap#tt_main) trap_n4#F51 139,1,1
-turbo_n_4,340,39,0 duplicate(TurboTrap#tt_main) trap_n4#F52 139,1,1
-turbo_n_4,340,36,0 duplicate(TurboTrap#tt_main) trap_n4#F53 139,1,1
-turbo_n_4,344,56,0 duplicate(TurboTrap#tt_main) trap_n4#F54 139,1,1
-turbo_n_4,344,52,0 duplicate(TurboTrap#tt_main) trap_n4#F55 139,1,1
-turbo_n_4,344,48,0 duplicate(TurboTrap#tt_main) trap_n4#F56 139,1,1
-turbo_n_4,344,44,0 duplicate(TurboTrap#tt_main) trap_n4#F57 139,1,1
-turbo_n_4,344,40,0 duplicate(TurboTrap#tt_main) trap_n4#F58 139,1,1
-turbo_n_4,344,36,0 duplicate(TurboTrap#tt_main) trap_n4#F59 139,1,1
-turbo_n_4,348,55,0 duplicate(TurboTrap#tt_main) trap_n4#F60 139,1,1
-turbo_n_4,348,51,0 duplicate(TurboTrap#tt_main) trap_n4#F61 139,1,1
-turbo_n_4,348,47,0 duplicate(TurboTrap#tt_main) trap_n4#F62 139,1,1
-turbo_n_4,348,43,0 duplicate(TurboTrap#tt_main) trap_n4#F63 139,1,1
-turbo_n_4,348,39,0 duplicate(TurboTrap#tt_main) trap_n4#F64 139,1,1
-turbo_n_4,348,36,0 duplicate(TurboTrap#tt_main) trap_n4#F65 139,1,1
-turbo_n_4,352,56,0 duplicate(TurboTrap#tt_main) trap_n4#F66 139,1,1
-turbo_n_4,352,52,0 duplicate(TurboTrap#tt_main) trap_n4#F67 139,1,1
-turbo_n_4,352,48,0 duplicate(TurboTrap#tt_main) trap_n4#F68 139,1,1
-turbo_n_4,352,44,0 duplicate(TurboTrap#tt_main) trap_n4#F69 139,1,1
-turbo_n_4,352,40,0 duplicate(TurboTrap#tt_main) trap_n4#F70 139,1,1
-turbo_n_4,352,36,0 duplicate(TurboTrap#tt_main) trap_n4#F71 139,1,1
-turbo_n_4,356,55,0 duplicate(TurboTrap#tt_main) trap_n4#F72 139,1,1
-turbo_n_4,356,51,0 duplicate(TurboTrap#tt_main) trap_n4#F73 139,1,1
-turbo_n_4,356,47,0 duplicate(TurboTrap#tt_main) trap_n4#F74 139,1,1
-turbo_n_4,356,43,0 duplicate(TurboTrap#tt_main) trap_n4#F75 139,1,1
-turbo_n_4,356,39,0 duplicate(TurboTrap#tt_main) trap_n4#F76 139,1,1
-turbo_n_4,356,36,0 duplicate(TurboTrap#tt_main) trap_n4#F77 139,1,1
-turbo_n_4,360,56,0 duplicate(TurboTrap#tt_main) trap_n4#F78 139,1,1
-turbo_n_4,360,52,0 duplicate(TurboTrap#tt_main) trap_n4#F79 139,1,1
-turbo_n_4,360,48,0 duplicate(TurboTrap#tt_main) trap_n4#F80 139,1,1
-turbo_n_4,360,44,0 duplicate(TurboTrap#tt_main) trap_n4#F81 139,1,1
-turbo_n_4,360,40,0 duplicate(TurboTrap#tt_main) trap_n4#F82 139,1,1
-turbo_n_4,360,36,0 duplicate(TurboTrap#tt_main) trap_n4#F83 139,1,1
-turbo_n_4,364,55,0 duplicate(TurboTrap#tt_main) trap_n4#F84 139,1,1
-turbo_n_4,364,51,0 duplicate(TurboTrap#tt_main) trap_n4#F85 139,1,1
-turbo_n_4,364,47,0 duplicate(TurboTrap#tt_main) trap_n4#F86 139,1,1
-turbo_n_4,364,43,0 duplicate(TurboTrap#tt_main) trap_n4#F87 139,1,1
-turbo_n_4,364,39,0 duplicate(TurboTrap#tt_main) trap_n4#F88 139,1,1
-turbo_n_4,364,36,0 duplicate(TurboTrap#tt_main) trap_n4#F89 139,1,1
-turbo_n_4,368,56,0 duplicate(TurboTrap#tt_main) trap_n4#F90 139,1,1
-turbo_n_4,368,52,0 duplicate(TurboTrap#tt_main) trap_n4#F91 139,1,1
-turbo_n_4,368,48,0 duplicate(TurboTrap#tt_main) trap_n4#F92 139,1,1
-turbo_n_4,368,44,0 duplicate(TurboTrap#tt_main) trap_n4#F93 139,1,1
-turbo_n_4,368,40,0 duplicate(TurboTrap#tt_main) trap_n4#F94 139,1,1
-turbo_n_4,368,36,0 duplicate(TurboTrap#tt_main) trap_n4#F95 139,1,1
-turbo_n_8,340,51,0 duplicate(TurboTrap#tt_main) trap_n8#F49 139,1,1
-turbo_n_8,340,47,0 duplicate(TurboTrap#tt_main) trap_n8#F50 139,1,1
-turbo_n_8,340,43,0 duplicate(TurboTrap#tt_main) trap_n8#F51 139,1,1
-turbo_n_8,340,39,0 duplicate(TurboTrap#tt_main) trap_n8#F52 139,1,1
-turbo_n_8,340,36,0 duplicate(TurboTrap#tt_main) trap_n8#F53 139,1,1
-turbo_n_8,344,56,0 duplicate(TurboTrap#tt_main) trap_n8#F54 139,1,1
-turbo_n_8,344,52,0 duplicate(TurboTrap#tt_main) trap_n8#F55 139,1,1
-turbo_n_8,344,48,0 duplicate(TurboTrap#tt_main) trap_n8#F56 139,1,1
-turbo_n_8,344,44,0 duplicate(TurboTrap#tt_main) trap_n8#F57 139,1,1
-turbo_n_8,344,40,0 duplicate(TurboTrap#tt_main) trap_n8#F58 139,1,1
-turbo_n_8,344,36,0 duplicate(TurboTrap#tt_main) trap_n8#F59 139,1,1
-turbo_n_8,348,55,0 duplicate(TurboTrap#tt_main) trap_n8#F60 139,1,1
-turbo_n_8,348,51,0 duplicate(TurboTrap#tt_main) trap_n8#F61 139,1,1
-turbo_n_8,348,47,0 duplicate(TurboTrap#tt_main) trap_n8#F62 139,1,1
-turbo_n_8,348,43,0 duplicate(TurboTrap#tt_main) trap_n8#F63 139,1,1
-turbo_n_8,348,39,0 duplicate(TurboTrap#tt_main) trap_n8#F64 139,1,1
-turbo_n_8,348,36,0 duplicate(TurboTrap#tt_main) trap_n8#F65 139,1,1
-turbo_n_8,352,56,0 duplicate(TurboTrap#tt_main) trap_n8#F66 139,1,1
-turbo_n_8,352,52,0 duplicate(TurboTrap#tt_main) trap_n8#F67 139,1,1
-turbo_n_8,352,48,0 duplicate(TurboTrap#tt_main) trap_n8#F68 139,1,1
-turbo_n_8,352,44,0 duplicate(TurboTrap#tt_main) trap_n8#F69 139,1,1
-turbo_n_8,352,40,0 duplicate(TurboTrap#tt_main) trap_n8#F70 139,1,1
-turbo_n_8,352,36,0 duplicate(TurboTrap#tt_main) trap_n8#F71 139,1,1
-turbo_n_8,356,55,0 duplicate(TurboTrap#tt_main) trap_n8#F72 139,1,1
-turbo_n_8,356,51,0 duplicate(TurboTrap#tt_main) trap_n8#F73 139,1,1
-turbo_n_8,356,47,0 duplicate(TurboTrap#tt_main) trap_n8#F74 139,1,1
-turbo_n_8,356,43,0 duplicate(TurboTrap#tt_main) trap_n8#F75 139,1,1
-turbo_n_8,356,39,0 duplicate(TurboTrap#tt_main) trap_n8#F76 139,1,1
-turbo_n_8,356,36,0 duplicate(TurboTrap#tt_main) trap_n8#F77 139,1,1
-turbo_n_8,360,56,0 duplicate(TurboTrap#tt_main) trap_n8#F78 139,1,1
-turbo_n_8,360,52,0 duplicate(TurboTrap#tt_main) trap_n8#F79 139,1,1
-turbo_n_8,360,48,0 duplicate(TurboTrap#tt_main) trap_n8#F80 139,1,1
-turbo_n_8,360,44,0 duplicate(TurboTrap#tt_main) trap_n8#F81 139,1,1
-turbo_n_8,360,40,0 duplicate(TurboTrap#tt_main) trap_n8#F82 139,1,1
-turbo_n_8,360,36,0 duplicate(TurboTrap#tt_main) trap_n8#F83 139,1,1
-turbo_n_8,364,55,0 duplicate(TurboTrap#tt_main) trap_n8#F84 139,1,1
-turbo_n_8,364,51,0 duplicate(TurboTrap#tt_main) trap_n8#F85 139,1,1
-turbo_n_8,364,47,0 duplicate(TurboTrap#tt_main) trap_n8#F86 139,1,1
-turbo_n_8,364,43,0 duplicate(TurboTrap#tt_main) trap_n8#F87 139,1,1
-turbo_n_8,364,39,0 duplicate(TurboTrap#tt_main) trap_n8#F88 139,1,1
-turbo_n_8,364,36,0 duplicate(TurboTrap#tt_main) trap_n8#F89 139,1,1
-turbo_n_8,368,56,0 duplicate(TurboTrap#tt_main) trap_n8#F90 139,1,1
-turbo_n_8,368,52,0 duplicate(TurboTrap#tt_main) trap_n8#F91 139,1,1
-turbo_n_8,368,48,0 duplicate(TurboTrap#tt_main) trap_n8#F92 139,1,1
-turbo_n_8,368,44,0 duplicate(TurboTrap#tt_main) trap_n8#F93 139,1,1
-turbo_n_8,368,40,0 duplicate(TurboTrap#tt_main) trap_n8#F94 139,1,1
-turbo_n_8,368,36,0 duplicate(TurboTrap#tt_main) trap_n8#F95 139,1,1
-turbo_n_16,340,51,0 duplicate(TurboTrap#tt_main) trap_n16#F49 139,1,1
-turbo_n_16,340,47,0 duplicate(TurboTrap#tt_main) trap_n16#F50 139,1,1
-turbo_n_16,340,43,0 duplicate(TurboTrap#tt_main) trap_n16#F51 139,1,1
-turbo_n_16,340,39,0 duplicate(TurboTrap#tt_main) trap_n16#F52 139,1,1
-turbo_n_16,340,36,0 duplicate(TurboTrap#tt_main) trap_n16#F53 139,1,1
-turbo_n_16,344,56,0 duplicate(TurboTrap#tt_main) trap_n16#F54 139,1,1
-turbo_n_16,344,52,0 duplicate(TurboTrap#tt_main) trap_n16#F55 139,1,1
-turbo_n_16,344,48,0 duplicate(TurboTrap#tt_main) trap_n16#F56 139,1,1
-turbo_n_16,344,44,0 duplicate(TurboTrap#tt_main) trap_n16#F57 139,1,1
-turbo_n_16,344,40,0 duplicate(TurboTrap#tt_main) trap_n16#F58 139,1,1
-turbo_n_16,344,36,0 duplicate(TurboTrap#tt_main) trap_n16#F59 139,1,1
-turbo_n_16,348,55,0 duplicate(TurboTrap#tt_main) trap_n16#F60 139,1,1
-turbo_n_16,348,51,0 duplicate(TurboTrap#tt_main) trap_n16#F61 139,1,1
-turbo_n_16,348,47,0 duplicate(TurboTrap#tt_main) trap_n16#F62 139,1,1
-turbo_n_16,348,43,0 duplicate(TurboTrap#tt_main) trap_n16#F63 139,1,1
-turbo_n_16,348,39,0 duplicate(TurboTrap#tt_main) trap_n16#F64 139,1,1
-turbo_n_16,348,36,0 duplicate(TurboTrap#tt_main) trap_n16#F65 139,1,1
-turbo_n_16,352,56,0 duplicate(TurboTrap#tt_main) trap_n16#F66 139,1,1
-turbo_n_16,352,52,0 duplicate(TurboTrap#tt_main) trap_n16#F67 139,1,1
-turbo_n_16,352,48,0 duplicate(TurboTrap#tt_main) trap_n16#F68 139,1,1
-turbo_n_16,352,44,0 duplicate(TurboTrap#tt_main) trap_n16#F69 139,1,1
-turbo_n_16,352,40,0 duplicate(TurboTrap#tt_main) trap_n16#F70 139,1,1
-turbo_n_16,352,36,0 duplicate(TurboTrap#tt_main) trap_n16#F71 139,1,1
-turbo_n_16,356,55,0 duplicate(TurboTrap#tt_main) trap_n16#F72 139,1,1
-turbo_n_16,356,51,0 duplicate(TurboTrap#tt_main) trap_n16#F73 139,1,1
-turbo_n_16,356,47,0 duplicate(TurboTrap#tt_main) trap_n16#F74 139,1,1
-turbo_n_16,356,43,0 duplicate(TurboTrap#tt_main) trap_n16#F75 139,1,1
-turbo_n_16,356,39,0 duplicate(TurboTrap#tt_main) trap_n16#F76 139,1,1
-turbo_n_16,356,36,0 duplicate(TurboTrap#tt_main) trap_n16#F77 139,1,1
-turbo_n_16,360,56,0 duplicate(TurboTrap#tt_main) trap_n16#F78 139,1,1
-turbo_n_16,360,52,0 duplicate(TurboTrap#tt_main) trap_n16#F79 139,1,1
-turbo_n_16,360,48,0 duplicate(TurboTrap#tt_main) trap_n16#F80 139,1,1
-turbo_n_16,360,44,0 duplicate(TurboTrap#tt_main) trap_n16#F81 139,1,1
-turbo_n_16,360,40,0 duplicate(TurboTrap#tt_main) trap_n16#F82 139,1,1
-turbo_n_16,360,36,0 duplicate(TurboTrap#tt_main) trap_n16#F83 139,1,1
-turbo_n_16,364,55,0 duplicate(TurboTrap#tt_main) trap_n16#F84 139,1,1
-turbo_n_16,364,51,0 duplicate(TurboTrap#tt_main) trap_n16#F85 139,1,1
-turbo_n_16,364,47,0 duplicate(TurboTrap#tt_main) trap_n16#F86 139,1,1
-turbo_n_16,364,43,0 duplicate(TurboTrap#tt_main) trap_n16#F87 139,1,1
-turbo_n_16,364,39,0 duplicate(TurboTrap#tt_main) trap_n16#F88 139,1,1
-turbo_n_16,364,36,0 duplicate(TurboTrap#tt_main) trap_n16#F89 139,1,1
-turbo_n_16,368,56,0 duplicate(TurboTrap#tt_main) trap_n16#F90 139,1,1
-turbo_n_16,368,52,0 duplicate(TurboTrap#tt_main) trap_n16#F91 139,1,1
-turbo_n_16,368,48,0 duplicate(TurboTrap#tt_main) trap_n16#F92 139,1,1
-turbo_n_16,368,44,0 duplicate(TurboTrap#tt_main) trap_n16#F93 139,1,1
-turbo_n_16,368,40,0 duplicate(TurboTrap#tt_main) trap_n16#F94 139,1,1
-turbo_n_16,368,36,0 duplicate(TurboTrap#tt_main) trap_n16#F95 139,1,1
-turbo_n_1,340,51,0 duplicate(TurboTrap#tt_main) trap_n1#F49 139,1,1
-turbo_n_1,340,47,0 duplicate(TurboTrap#tt_main) trap_n1#F50 139,1,1
-turbo_n_1,340,43,0 duplicate(TurboTrap#tt_main) trap_n1#F51 139,1,1
-turbo_n_1,340,39,0 duplicate(TurboTrap#tt_main) trap_n1#F52 139,1,1
-turbo_n_1,340,36,0 duplicate(TurboTrap#tt_main) trap_n1#F53 139,1,1
-turbo_n_1,344,56,0 duplicate(TurboTrap#tt_main) trap_n1#F54 139,1,1
-turbo_n_1,344,52,0 duplicate(TurboTrap#tt_main) trap_n1#F55 139,1,1
-turbo_n_1,344,48,0 duplicate(TurboTrap#tt_main) trap_n1#F56 139,1,1
-turbo_n_1,344,44,0 duplicate(TurboTrap#tt_main) trap_n1#F57 139,1,1
-turbo_n_1,344,40,0 duplicate(TurboTrap#tt_main) trap_n1#F58 139,1,1
-turbo_n_1,344,36,0 duplicate(TurboTrap#tt_main) trap_n1#F59 139,1,1
-turbo_n_1,348,55,0 duplicate(TurboTrap#tt_main) trap_n1#F60 139,1,1
-turbo_n_1,348,51,0 duplicate(TurboTrap#tt_main) trap_n1#F61 139,1,1
-turbo_n_1,348,47,0 duplicate(TurboTrap#tt_main) trap_n1#F62 139,1,1
-turbo_n_1,348,43,0 duplicate(TurboTrap#tt_main) trap_n1#F63 139,1,1
-turbo_n_1,348,39,0 duplicate(TurboTrap#tt_main) trap_n1#F64 139,1,1
-turbo_n_1,348,36,0 duplicate(TurboTrap#tt_main) trap_n1#F65 139,1,1
-turbo_n_1,352,56,0 duplicate(TurboTrap#tt_main) trap_n1#F66 139,1,1
-turbo_n_1,352,52,0 duplicate(TurboTrap#tt_main) trap_n1#F67 139,1,1
-turbo_n_1,352,48,0 duplicate(TurboTrap#tt_main) trap_n1#F68 139,1,1
-turbo_n_1,352,44,0 duplicate(TurboTrap#tt_main) trap_n1#F69 139,1,1
-turbo_n_1,352,40,0 duplicate(TurboTrap#tt_main) trap_n1#F70 139,1,1
-turbo_n_1,352,36,0 duplicate(TurboTrap#tt_main) trap_n1#F71 139,1,1
-turbo_n_1,356,55,0 duplicate(TurboTrap#tt_main) trap_n1#F72 139,1,1
-turbo_n_1,356,51,0 duplicate(TurboTrap#tt_main) trap_n1#F73 139,1,1
-turbo_n_1,356,47,0 duplicate(TurboTrap#tt_main) trap_n1#F74 139,1,1
-turbo_n_1,356,43,0 duplicate(TurboTrap#tt_main) trap_n1#F75 139,1,1
-turbo_n_1,356,39,0 duplicate(TurboTrap#tt_main) trap_n1#F76 139,1,1
-turbo_n_1,356,36,0 duplicate(TurboTrap#tt_main) trap_n1#F77 139,1,1
-turbo_n_1,360,56,0 duplicate(TurboTrap#tt_main) trap_n1#F78 139,1,1
-turbo_n_1,360,52,0 duplicate(TurboTrap#tt_main) trap_n1#F79 139,1,1
-turbo_n_1,360,48,0 duplicate(TurboTrap#tt_main) trap_n1#F80 139,1,1
-turbo_n_1,360,44,0 duplicate(TurboTrap#tt_main) trap_n1#F81 139,1,1
-turbo_n_1,360,40,0 duplicate(TurboTrap#tt_main) trap_n1#F82 139,1,1
-turbo_n_1,360,36,0 duplicate(TurboTrap#tt_main) trap_n1#F83 139,1,1
-turbo_n_1,364,55,0 duplicate(TurboTrap#tt_main) trap_n1#F84 139,1,1
-turbo_n_1,364,51,0 duplicate(TurboTrap#tt_main) trap_n1#F85 139,1,1
-turbo_n_1,364,47,0 duplicate(TurboTrap#tt_main) trap_n1#F86 139,1,1
-turbo_n_1,364,43,0 duplicate(TurboTrap#tt_main) trap_n1#F87 139,1,1
-turbo_n_1,364,39,0 duplicate(TurboTrap#tt_main) trap_n1#F88 139,1,1
-turbo_n_1,364,36,0 duplicate(TurboTrap#tt_main) trap_n1#F89 139,1,1
-turbo_n_1,368,56,0 duplicate(TurboTrap#tt_main) trap_n1#F90 139,1,1
-turbo_n_1,368,52,0 duplicate(TurboTrap#tt_main) trap_n1#F91 139,1,1
-turbo_n_1,368,48,0 duplicate(TurboTrap#tt_main) trap_n1#F92 139,1,1
-turbo_n_1,368,44,0 duplicate(TurboTrap#tt_main) trap_n1#F93 139,1,1
-turbo_n_1,368,40,0 duplicate(TurboTrap#tt_main) trap_n1#F94 139,1,1
-turbo_n_1,368,36,0 duplicate(TurboTrap#tt_main) trap_n1#F95 139,1,1
+turbo_e_4,307,55,0 duplicate(TurboTrap#tt_main) trap_e4#F1 HIDDEN_WARP_NPC,1,1
+turbo_e_4,307,51,0 duplicate(TurboTrap#tt_main) trap_e4#F2 HIDDEN_WARP_NPC,1,1
+turbo_e_4,307,47,0 duplicate(TurboTrap#tt_main) trap_e4#F3 HIDDEN_WARP_NPC,1,1
+turbo_e_4,307,43,0 duplicate(TurboTrap#tt_main) trap_e4#F4 HIDDEN_WARP_NPC,1,1
+turbo_e_4,307,39,0 duplicate(TurboTrap#tt_main) trap_e4#F5 HIDDEN_WARP_NPC,1,1
+turbo_e_4,307,39,0 duplicate(TurboTrap#tt_main) trap_e4#F96 HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,56,0 duplicate(TurboTrap#tt_main) trap_e4#F6 HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,52,0 duplicate(TurboTrap#tt_main) trap_e4#F7 HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,48,0 duplicate(TurboTrap#tt_main) trap_e4#F8 HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,44,0 duplicate(TurboTrap#tt_main) trap_e4#F9 HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,40,0 duplicate(TurboTrap#tt_main) trap_e4#F10 HIDDEN_WARP_NPC,1,1
+turbo_e_4,312,36,0 duplicate(TurboTrap#tt_main) trap_e4#F11 HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,55,0 duplicate(TurboTrap#tt_main) trap_e4#F12 HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,51,0 duplicate(TurboTrap#tt_main) trap_e4#F13 HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,47,0 duplicate(TurboTrap#tt_main) trap_e4#F14 HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,43,0 duplicate(TurboTrap#tt_main) trap_e4#F15 HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,39,0 duplicate(TurboTrap#tt_main) trap_e4#F16 HIDDEN_WARP_NPC,1,1
+turbo_e_4,316,36,0 duplicate(TurboTrap#tt_main) trap_e4#F17 HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,56,0 duplicate(TurboTrap#tt_main) trap_e4#F18 HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,52,0 duplicate(TurboTrap#tt_main) trap_e4#F19 HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,48,0 duplicate(TurboTrap#tt_main) trap_e4#F20 HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,44,0 duplicate(TurboTrap#tt_main) trap_e4#F21 HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,40,0 duplicate(TurboTrap#tt_main) trap_e4#F22 HIDDEN_WARP_NPC,1,1
+turbo_e_4,320,36,0 duplicate(TurboTrap#tt_main) trap_e4#F23 HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,55,0 duplicate(TurboTrap#tt_main) trap_e4#F24 HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,51,0 duplicate(TurboTrap#tt_main) trap_e4#F25 HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,47,0 duplicate(TurboTrap#tt_main) trap_e4#F26 HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,43,0 duplicate(TurboTrap#tt_main) trap_e4#F27 HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,39,0 duplicate(TurboTrap#tt_main) trap_e4#F28 HIDDEN_WARP_NPC,1,1
+turbo_e_4,324,36,0 duplicate(TurboTrap#tt_main) trap_e4#F29 HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,56,0 duplicate(TurboTrap#tt_main) trap_e4#F30 HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,52,0 duplicate(TurboTrap#tt_main) trap_e4#F31 HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,48,0 duplicate(TurboTrap#tt_main) trap_e4#F32 HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,44,0 duplicate(TurboTrap#tt_main) trap_e4#F33 HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,40,0 duplicate(TurboTrap#tt_main) trap_e4#F34 HIDDEN_WARP_NPC,1,1
+turbo_e_4,328,36,0 duplicate(TurboTrap#tt_main) trap_e4#F35 HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,55,0 duplicate(TurboTrap#tt_main) trap_e4#F36 HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,51,0 duplicate(TurboTrap#tt_main) trap_e4#F37 HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,47,0 duplicate(TurboTrap#tt_main) trap_e4#F38 HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,43,0 duplicate(TurboTrap#tt_main) trap_e4#F39 HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,39,0 duplicate(TurboTrap#tt_main) trap_e4#F40 HIDDEN_WARP_NPC,1,1
+turbo_e_4,332,36,0 duplicate(TurboTrap#tt_main) trap_e4#F41 HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,55,0 duplicate(TurboTrap#tt_main) trap_e8#F1 HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,51,0 duplicate(TurboTrap#tt_main) trap_e8#F2 HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,47,0 duplicate(TurboTrap#tt_main) trap_e8#F3 HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,43,0 duplicate(TurboTrap#tt_main) trap_e8#F4 HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,39,0 duplicate(TurboTrap#tt_main) trap_e8#F5 HIDDEN_WARP_NPC,1,1
+turbo_e_8,307,39,0 duplicate(TurboTrap#tt_main) trap_e8#F96 HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,56,0 duplicate(TurboTrap#tt_main) trap_e8#F6 HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,52,0 duplicate(TurboTrap#tt_main) trap_e8#F7 HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,48,0 duplicate(TurboTrap#tt_main) trap_e8#F8 HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,44,0 duplicate(TurboTrap#tt_main) trap_e8#F9 HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,40,0 duplicate(TurboTrap#tt_main) trap_e8#F10 HIDDEN_WARP_NPC,1,1
+turbo_e_8,312,36,0 duplicate(TurboTrap#tt_main) trap_e8#F11 HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,55,0 duplicate(TurboTrap#tt_main) trap_e8#F12 HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,51,0 duplicate(TurboTrap#tt_main) trap_e8#F13 HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,47,0 duplicate(TurboTrap#tt_main) trap_e8#F14 HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,43,0 duplicate(TurboTrap#tt_main) trap_e8#F15 HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,39,0 duplicate(TurboTrap#tt_main) trap_e8#F16 HIDDEN_WARP_NPC,1,1
+turbo_e_8,316,36,0 duplicate(TurboTrap#tt_main) trap_e8#F17 HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,56,0 duplicate(TurboTrap#tt_main) trap_e8#F18 HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,52,0 duplicate(TurboTrap#tt_main) trap_e8#F19 HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,48,0 duplicate(TurboTrap#tt_main) trap_e8#F20 HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,44,0 duplicate(TurboTrap#tt_main) trap_e8#F21 HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,40,0 duplicate(TurboTrap#tt_main) trap_e8#F22 HIDDEN_WARP_NPC,1,1
+turbo_e_8,320,36,0 duplicate(TurboTrap#tt_main) trap_e8#F23 HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,55,0 duplicate(TurboTrap#tt_main) trap_e8#F24 HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,51,0 duplicate(TurboTrap#tt_main) trap_e8#F25 HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,47,0 duplicate(TurboTrap#tt_main) trap_e8#F26 HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,43,0 duplicate(TurboTrap#tt_main) trap_e8#F27 HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,39,0 duplicate(TurboTrap#tt_main) trap_e8#F28 HIDDEN_WARP_NPC,1,1
+turbo_e_8,324,36,0 duplicate(TurboTrap#tt_main) trap_e8#F29 HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,56,0 duplicate(TurboTrap#tt_main) trap_e8#F30 HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,52,0 duplicate(TurboTrap#tt_main) trap_e8#F31 HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,48,0 duplicate(TurboTrap#tt_main) trap_e8#F32 HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,44,0 duplicate(TurboTrap#tt_main) trap_e8#F33 HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,40,0 duplicate(TurboTrap#tt_main) trap_e8#F34 HIDDEN_WARP_NPC,1,1
+turbo_e_8,328,36,0 duplicate(TurboTrap#tt_main) trap_e8#F35 HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,55,0 duplicate(TurboTrap#tt_main) trap_e8#F36 HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,51,0 duplicate(TurboTrap#tt_main) trap_e8#F37 HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,47,0 duplicate(TurboTrap#tt_main) trap_e8#F38 HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,43,0 duplicate(TurboTrap#tt_main) trap_e8#F39 HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,39,0 duplicate(TurboTrap#tt_main) trap_e8#F40 HIDDEN_WARP_NPC,1,1
+turbo_e_8,332,36,0 duplicate(TurboTrap#tt_main) trap_e8#F41 HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,55,0 duplicate(TurboTrap#tt_main) trap_e16#F1 HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,51,0 duplicate(TurboTrap#tt_main) trap_e16#F2 HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,47,0 duplicate(TurboTrap#tt_main) trap_e16#F3 HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,43,0 duplicate(TurboTrap#tt_main) trap_e16#F4 HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,39,0 duplicate(TurboTrap#tt_main) trap_e16#F5 HIDDEN_WARP_NPC,1,1
+turbo_e_16,307,39,0 duplicate(TurboTrap#tt_main) trap_e16#F96 HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,56,0 duplicate(TurboTrap#tt_main) trap_e16#F6 HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,52,0 duplicate(TurboTrap#tt_main) trap_e16#F7 HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,48,0 duplicate(TurboTrap#tt_main) trap_e16#F8 HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,44,0 duplicate(TurboTrap#tt_main) trap_e16#F9 HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,40,0 duplicate(TurboTrap#tt_main) trap_e16#F10 HIDDEN_WARP_NPC,1,1
+turbo_e_16,312,36,0 duplicate(TurboTrap#tt_main) trap_e16#F11 HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,55,0 duplicate(TurboTrap#tt_main) trap_e16#F12 HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,51,0 duplicate(TurboTrap#tt_main) trap_e16#F13 HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,47,0 duplicate(TurboTrap#tt_main) trap_e16#F14 HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,43,0 duplicate(TurboTrap#tt_main) trap_e16#F15 HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,39,0 duplicate(TurboTrap#tt_main) trap_e16#F16 HIDDEN_WARP_NPC,1,1
+turbo_e_16,316,36,0 duplicate(TurboTrap#tt_main) trap_e16#F17 HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,56,0 duplicate(TurboTrap#tt_main) trap_e16#F18 HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,52,0 duplicate(TurboTrap#tt_main) trap_e16#F19 HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,48,0 duplicate(TurboTrap#tt_main) trap_e16#F20 HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,44,0 duplicate(TurboTrap#tt_main) trap_e16#F21 HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,40,0 duplicate(TurboTrap#tt_main) trap_e16#F22 HIDDEN_WARP_NPC,1,1
+turbo_e_16,320,36,0 duplicate(TurboTrap#tt_main) trap_e16#F23 HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,55,0 duplicate(TurboTrap#tt_main) trap_e16#F24 HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,51,0 duplicate(TurboTrap#tt_main) trap_e16#F25 HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,47,0 duplicate(TurboTrap#tt_main) trap_e16#F26 HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,43,0 duplicate(TurboTrap#tt_main) trap_e16#F27 HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,39,0 duplicate(TurboTrap#tt_main) trap_e16#F28 HIDDEN_WARP_NPC,1,1
+turbo_e_16,324,36,0 duplicate(TurboTrap#tt_main) trap_e16#F29 HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,56,0 duplicate(TurboTrap#tt_main) trap_e16#F30 HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,52,0 duplicate(TurboTrap#tt_main) trap_e16#F31 HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,48,0 duplicate(TurboTrap#tt_main) trap_e16#F32 HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,44,0 duplicate(TurboTrap#tt_main) trap_e16#F33 HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,40,0 duplicate(TurboTrap#tt_main) trap_e16#F34 HIDDEN_WARP_NPC,1,1
+turbo_e_16,328,36,0 duplicate(TurboTrap#tt_main) trap_e16#F35 HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,55,0 duplicate(TurboTrap#tt_main) trap_e16#F36 HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,51,0 duplicate(TurboTrap#tt_main) trap_e16#F37 HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,47,0 duplicate(TurboTrap#tt_main) trap_e16#F38 HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,43,0 duplicate(TurboTrap#tt_main) trap_e16#F39 HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,39,0 duplicate(TurboTrap#tt_main) trap_e16#F40 HIDDEN_WARP_NPC,1,1
+turbo_e_16,332,36,0 duplicate(TurboTrap#tt_main) trap_e16#F41 HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,55,0 duplicate(TurboTrap#tt_main) trap_n4#F1 HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,51,0 duplicate(TurboTrap#tt_main) trap_n4#F2 HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,47,0 duplicate(TurboTrap#tt_main) trap_n4#F3 HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,43,0 duplicate(TurboTrap#tt_main) trap_n4#F4 HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,39,0 duplicate(TurboTrap#tt_main) trap_n4#F5 HIDDEN_WARP_NPC,1,1
+turbo_n_4,307,39,0 duplicate(TurboTrap#tt_main) trap_n4#F96 HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,56,0 duplicate(TurboTrap#tt_main) trap_n4#F6 HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,52,0 duplicate(TurboTrap#tt_main) trap_n4#F7 HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,48,0 duplicate(TurboTrap#tt_main) trap_n4#F8 HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,44,0 duplicate(TurboTrap#tt_main) trap_n4#F9 HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,40,0 duplicate(TurboTrap#tt_main) trap_n4#F10 HIDDEN_WARP_NPC,1,1
+turbo_n_4,312,36,0 duplicate(TurboTrap#tt_main) trap_n4#F11 HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,55,0 duplicate(TurboTrap#tt_main) trap_n4#F12 HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,51,0 duplicate(TurboTrap#tt_main) trap_n4#F13 HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,47,0 duplicate(TurboTrap#tt_main) trap_n4#F14 HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,43,0 duplicate(TurboTrap#tt_main) trap_n4#F15 HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,39,0 duplicate(TurboTrap#tt_main) trap_n4#F16 HIDDEN_WARP_NPC,1,1
+turbo_n_4,316,36,0 duplicate(TurboTrap#tt_main) trap_n4#F17 HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,56,0 duplicate(TurboTrap#tt_main) trap_n4#F18 HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,52,0 duplicate(TurboTrap#tt_main) trap_n4#F19 HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,48,0 duplicate(TurboTrap#tt_main) trap_n4#F20 HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,44,0 duplicate(TurboTrap#tt_main) trap_n4#F21 HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,40,0 duplicate(TurboTrap#tt_main) trap_n4#F22 HIDDEN_WARP_NPC,1,1
+turbo_n_4,320,36,0 duplicate(TurboTrap#tt_main) trap_n4#F23 HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,55,0 duplicate(TurboTrap#tt_main) trap_n4#F24 HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,51,0 duplicate(TurboTrap#tt_main) trap_n4#F25 HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,47,0 duplicate(TurboTrap#tt_main) trap_n4#F26 HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,43,0 duplicate(TurboTrap#tt_main) trap_n4#F27 HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,39,0 duplicate(TurboTrap#tt_main) trap_n4#F28 HIDDEN_WARP_NPC,1,1
+turbo_n_4,324,36,0 duplicate(TurboTrap#tt_main) trap_n4#F29 HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,56,0 duplicate(TurboTrap#tt_main) trap_n4#F30 HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,52,0 duplicate(TurboTrap#tt_main) trap_n4#F31 HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,48,0 duplicate(TurboTrap#tt_main) trap_n4#F32 HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,44,0 duplicate(TurboTrap#tt_main) trap_n4#F33 HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,40,0 duplicate(TurboTrap#tt_main) trap_n4#F34 HIDDEN_WARP_NPC,1,1
+turbo_n_4,328,36,0 duplicate(TurboTrap#tt_main) trap_n4#F35 HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,55,0 duplicate(TurboTrap#tt_main) trap_n4#F36 HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,51,0 duplicate(TurboTrap#tt_main) trap_n4#F37 HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,47,0 duplicate(TurboTrap#tt_main) trap_n4#F38 HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,43,0 duplicate(TurboTrap#tt_main) trap_n4#F39 HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,39,0 duplicate(TurboTrap#tt_main) trap_n4#F40 HIDDEN_WARP_NPC,1,1
+turbo_n_4,332,36,0 duplicate(TurboTrap#tt_main) trap_n4#F41 HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,55,0 duplicate(TurboTrap#tt_main) trap_n8#F1 HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,51,0 duplicate(TurboTrap#tt_main) trap_n8#F2 HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,47,0 duplicate(TurboTrap#tt_main) trap_n8#F3 HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,43,0 duplicate(TurboTrap#tt_main) trap_n8#F4 HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,39,0 duplicate(TurboTrap#tt_main) trap_n8#F5 HIDDEN_WARP_NPC,1,1
+turbo_n_8,307,39,0 duplicate(TurboTrap#tt_main) trap_n8#F96 HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,56,0 duplicate(TurboTrap#tt_main) trap_n8#F6 HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,52,0 duplicate(TurboTrap#tt_main) trap_n8#F7 HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,48,0 duplicate(TurboTrap#tt_main) trap_n8#F8 HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,44,0 duplicate(TurboTrap#tt_main) trap_n8#F9 HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,40,0 duplicate(TurboTrap#tt_main) trap_n8#F10 HIDDEN_WARP_NPC,1,1
+turbo_n_8,312,36,0 duplicate(TurboTrap#tt_main) trap_n8#F11 HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,55,0 duplicate(TurboTrap#tt_main) trap_n8#F12 HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,51,0 duplicate(TurboTrap#tt_main) trap_n8#F13 HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,47,0 duplicate(TurboTrap#tt_main) trap_n8#F14 HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,43,0 duplicate(TurboTrap#tt_main) trap_n8#F15 HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,39,0 duplicate(TurboTrap#tt_main) trap_n8#F16 HIDDEN_WARP_NPC,1,1
+turbo_n_8,316,36,0 duplicate(TurboTrap#tt_main) trap_n8#F17 HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,56,0 duplicate(TurboTrap#tt_main) trap_n8#F18 HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,52,0 duplicate(TurboTrap#tt_main) trap_n8#F19 HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,48,0 duplicate(TurboTrap#tt_main) trap_n8#F20 HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,44,0 duplicate(TurboTrap#tt_main) trap_n8#F21 HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,40,0 duplicate(TurboTrap#tt_main) trap_n8#F22 HIDDEN_WARP_NPC,1,1
+turbo_n_8,320,36,0 duplicate(TurboTrap#tt_main) trap_n8#F23 HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,55,0 duplicate(TurboTrap#tt_main) trap_n8#F24 HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,51,0 duplicate(TurboTrap#tt_main) trap_n8#F25 HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,47,0 duplicate(TurboTrap#tt_main) trap_n8#F26 HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,43,0 duplicate(TurboTrap#tt_main) trap_n8#F27 HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,39,0 duplicate(TurboTrap#tt_main) trap_n8#F28 HIDDEN_WARP_NPC,1,1
+turbo_n_8,324,36,0 duplicate(TurboTrap#tt_main) trap_n8#F29 HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,56,0 duplicate(TurboTrap#tt_main) trap_n8#F30 HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,52,0 duplicate(TurboTrap#tt_main) trap_n8#F31 HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,48,0 duplicate(TurboTrap#tt_main) trap_n8#F32 HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,44,0 duplicate(TurboTrap#tt_main) trap_n8#F33 HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,40,0 duplicate(TurboTrap#tt_main) trap_n8#F34 HIDDEN_WARP_NPC,1,1
+turbo_n_8,328,36,0 duplicate(TurboTrap#tt_main) trap_n8#F35 HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,55,0 duplicate(TurboTrap#tt_main) trap_n8#F36 HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,51,0 duplicate(TurboTrap#tt_main) trap_n8#F37 HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,47,0 duplicate(TurboTrap#tt_main) trap_n8#F38 HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,43,0 duplicate(TurboTrap#tt_main) trap_n8#F39 HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,39,0 duplicate(TurboTrap#tt_main) trap_n8#F40 HIDDEN_WARP_NPC,1,1
+turbo_n_8,332,36,0 duplicate(TurboTrap#tt_main) trap_n8#F41 HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,55,0 duplicate(TurboTrap#tt_main) trap_n16#F1 HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,51,0 duplicate(TurboTrap#tt_main) trap_n16#F2 HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,47,0 duplicate(TurboTrap#tt_main) trap_n16#F3 HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,43,0 duplicate(TurboTrap#tt_main) trap_n16#F4 HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,39,0 duplicate(TurboTrap#tt_main) trap_n16#F5 HIDDEN_WARP_NPC,1,1
+turbo_n_16,307,39,0 duplicate(TurboTrap#tt_main) trap_n16#F96 HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,56,0 duplicate(TurboTrap#tt_main) trap_n16#F6 HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,52,0 duplicate(TurboTrap#tt_main) trap_n16#F7 HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,48,0 duplicate(TurboTrap#tt_main) trap_n16#F8 HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,44,0 duplicate(TurboTrap#tt_main) trap_n16#F9 HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,40,0 duplicate(TurboTrap#tt_main) trap_n16#F10 HIDDEN_WARP_NPC,1,1
+turbo_n_16,312,36,0 duplicate(TurboTrap#tt_main) trap_n16#F11 HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,55,0 duplicate(TurboTrap#tt_main) trap_n16#F12 HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,51,0 duplicate(TurboTrap#tt_main) trap_n16#F13 HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,47,0 duplicate(TurboTrap#tt_main) trap_n16#F14 HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,43,0 duplicate(TurboTrap#tt_main) trap_n16#F15 HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,39,0 duplicate(TurboTrap#tt_main) trap_n16#F16 HIDDEN_WARP_NPC,1,1
+turbo_n_16,316,36,0 duplicate(TurboTrap#tt_main) trap_n16#F17 HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,56,0 duplicate(TurboTrap#tt_main) trap_n16#F18 HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,52,0 duplicate(TurboTrap#tt_main) trap_n16#F19 HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,48,0 duplicate(TurboTrap#tt_main) trap_n16#F20 HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,44,0 duplicate(TurboTrap#tt_main) trap_n16#F21 HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,40,0 duplicate(TurboTrap#tt_main) trap_n16#F22 HIDDEN_WARP_NPC,1,1
+turbo_n_16,320,36,0 duplicate(TurboTrap#tt_main) trap_n16#F23 HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,55,0 duplicate(TurboTrap#tt_main) trap_n16#F24 HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,51,0 duplicate(TurboTrap#tt_main) trap_n16#F25 HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,47,0 duplicate(TurboTrap#tt_main) trap_n16#F26 HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,43,0 duplicate(TurboTrap#tt_main) trap_n16#F27 HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,39,0 duplicate(TurboTrap#tt_main) trap_n16#F28 HIDDEN_WARP_NPC,1,1
+turbo_n_16,324,36,0 duplicate(TurboTrap#tt_main) trap_n16#F29 HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,56,0 duplicate(TurboTrap#tt_main) trap_n16#F30 HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,52,0 duplicate(TurboTrap#tt_main) trap_n16#F31 HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,48,0 duplicate(TurboTrap#tt_main) trap_n16#F32 HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,44,0 duplicate(TurboTrap#tt_main) trap_n16#F33 HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,40,0 duplicate(TurboTrap#tt_main) trap_n16#F34 HIDDEN_WARP_NPC,1,1
+turbo_n_16,328,36,0 duplicate(TurboTrap#tt_main) trap_n16#F35 HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,55,0 duplicate(TurboTrap#tt_main) trap_n16#F36 HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,51,0 duplicate(TurboTrap#tt_main) trap_n16#F37 HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,47,0 duplicate(TurboTrap#tt_main) trap_n16#F38 HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,43,0 duplicate(TurboTrap#tt_main) trap_n16#F39 HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,39,0 duplicate(TurboTrap#tt_main) trap_n16#F40 HIDDEN_WARP_NPC,1,1
+turbo_n_16,332,36,0 duplicate(TurboTrap#tt_main) trap_n16#F41 HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,55,0 duplicate(TurboTrap#tt_main) trap_n1#F1 HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,51,0 duplicate(TurboTrap#tt_main) trap_n1#F2 HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,47,0 duplicate(TurboTrap#tt_main) trap_n1#F3 HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,43,0 duplicate(TurboTrap#tt_main) trap_n1#F4 HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,39,0 duplicate(TurboTrap#tt_main) trap_n1#F5 HIDDEN_WARP_NPC,1,1
+turbo_n_1,307,39,0 duplicate(TurboTrap#tt_main) trap_n1#F96 HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,56,0 duplicate(TurboTrap#tt_main) trap_n1#F6 HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,52,0 duplicate(TurboTrap#tt_main) trap_n1#F7 HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,48,0 duplicate(TurboTrap#tt_main) trap_n1#F8 HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,44,0 duplicate(TurboTrap#tt_main) trap_n1#F9 HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,40,0 duplicate(TurboTrap#tt_main) trap_n1#F10 HIDDEN_WARP_NPC,1,1
+turbo_n_1,312,36,0 duplicate(TurboTrap#tt_main) trap_n1#F11 HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,55,0 duplicate(TurboTrap#tt_main) trap_n1#F12 HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,51,0 duplicate(TurboTrap#tt_main) trap_n1#F13 HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,47,0 duplicate(TurboTrap#tt_main) trap_n1#F14 HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,43,0 duplicate(TurboTrap#tt_main) trap_n1#F15 HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,39,0 duplicate(TurboTrap#tt_main) trap_n1#F16 HIDDEN_WARP_NPC,1,1
+turbo_n_1,316,36,0 duplicate(TurboTrap#tt_main) trap_n1#F17 HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,56,0 duplicate(TurboTrap#tt_main) trap_n1#F18 HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,52,0 duplicate(TurboTrap#tt_main) trap_n1#F19 HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,48,0 duplicate(TurboTrap#tt_main) trap_n1#F20 HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,44,0 duplicate(TurboTrap#tt_main) trap_n1#F21 HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,40,0 duplicate(TurboTrap#tt_main) trap_n1#F22 HIDDEN_WARP_NPC,1,1
+turbo_n_1,320,36,0 duplicate(TurboTrap#tt_main) trap_n1#F23 HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,55,0 duplicate(TurboTrap#tt_main) trap_n1#F24 HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,51,0 duplicate(TurboTrap#tt_main) trap_n1#F25 HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,47,0 duplicate(TurboTrap#tt_main) trap_n1#F26 HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,43,0 duplicate(TurboTrap#tt_main) trap_n1#F27 HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,39,0 duplicate(TurboTrap#tt_main) trap_n1#F28 HIDDEN_WARP_NPC,1,1
+turbo_n_1,324,36,0 duplicate(TurboTrap#tt_main) trap_n1#F29 HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,56,0 duplicate(TurboTrap#tt_main) trap_n1#F30 HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,52,0 duplicate(TurboTrap#tt_main) trap_n1#F31 HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,48,0 duplicate(TurboTrap#tt_main) trap_n1#F32 HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,44,0 duplicate(TurboTrap#tt_main) trap_n1#F33 HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,40,0 duplicate(TurboTrap#tt_main) trap_n1#F34 HIDDEN_WARP_NPC,1,1
+turbo_n_1,328,36,0 duplicate(TurboTrap#tt_main) trap_n1#F35 HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,55,0 duplicate(TurboTrap#tt_main) trap_n1#F36 HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,51,0 duplicate(TurboTrap#tt_main) trap_n1#F37 HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,47,0 duplicate(TurboTrap#tt_main) trap_n1#F38 HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,43,0 duplicate(TurboTrap#tt_main) trap_n1#F39 HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,39,0 duplicate(TurboTrap#tt_main) trap_n1#F40 HIDDEN_WARP_NPC,1,1
+turbo_n_1,332,36,0 duplicate(TurboTrap#tt_main) trap_n1#F41 HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,51,0 duplicate(TurboTrap#tt_main) trap_e4#F49 HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,47,0 duplicate(TurboTrap#tt_main) trap_e4#F50 HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,43,0 duplicate(TurboTrap#tt_main) trap_e4#F51 HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,39,0 duplicate(TurboTrap#tt_main) trap_e4#F52 HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,36,0 duplicate(TurboTrap#tt_main) trap_e4#F53 HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,56,0 duplicate(TurboTrap#tt_main) trap_e4#F54 HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,52,0 duplicate(TurboTrap#tt_main) trap_e4#F55 HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,48,0 duplicate(TurboTrap#tt_main) trap_e4#F56 HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,44,0 duplicate(TurboTrap#tt_main) trap_e4#F57 HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,40,0 duplicate(TurboTrap#tt_main) trap_e4#F58 HIDDEN_WARP_NPC,1,1
+turbo_e_4,344,36,0 duplicate(TurboTrap#tt_main) trap_e4#F59 HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,55,0 duplicate(TurboTrap#tt_main) trap_e4#F60 HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,51,0 duplicate(TurboTrap#tt_main) trap_e4#F61 HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,47,0 duplicate(TurboTrap#tt_main) trap_e4#F62 HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,43,0 duplicate(TurboTrap#tt_main) trap_e4#F63 HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,39,0 duplicate(TurboTrap#tt_main) trap_e4#F64 HIDDEN_WARP_NPC,1,1
+turbo_e_4,348,36,0 duplicate(TurboTrap#tt_main) trap_e4#F65 HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,56,0 duplicate(TurboTrap#tt_main) trap_e4#F66 HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,52,0 duplicate(TurboTrap#tt_main) trap_e4#F67 HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,48,0 duplicate(TurboTrap#tt_main) trap_e4#F68 HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,44,0 duplicate(TurboTrap#tt_main) trap_e4#F69 HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,40,0 duplicate(TurboTrap#tt_main) trap_e4#F70 HIDDEN_WARP_NPC,1,1
+turbo_e_4,352,36,0 duplicate(TurboTrap#tt_main) trap_e4#F71 HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,55,0 duplicate(TurboTrap#tt_main) trap_e4#F72 HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,51,0 duplicate(TurboTrap#tt_main) trap_e4#F73 HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,47,0 duplicate(TurboTrap#tt_main) trap_e4#F74 HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,43,0 duplicate(TurboTrap#tt_main) trap_e4#F75 HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,39,0 duplicate(TurboTrap#tt_main) trap_e4#F76 HIDDEN_WARP_NPC,1,1
+turbo_e_4,356,36,0 duplicate(TurboTrap#tt_main) trap_e4#F77 HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,56,0 duplicate(TurboTrap#tt_main) trap_e4#F78 HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,52,0 duplicate(TurboTrap#tt_main) trap_e4#F79 HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,48,0 duplicate(TurboTrap#tt_main) trap_e4#F80 HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,44,0 duplicate(TurboTrap#tt_main) trap_e4#F81 HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,40,0 duplicate(TurboTrap#tt_main) trap_e4#F82 HIDDEN_WARP_NPC,1,1
+turbo_e_4,360,36,0 duplicate(TurboTrap#tt_main) trap_e4#F83 HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,55,0 duplicate(TurboTrap#tt_main) trap_e4#F84 HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,51,0 duplicate(TurboTrap#tt_main) trap_e4#F85 HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,47,0 duplicate(TurboTrap#tt_main) trap_e4#F86 HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,43,0 duplicate(TurboTrap#tt_main) trap_e4#F87 HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,39,0 duplicate(TurboTrap#tt_main) trap_e4#F88 HIDDEN_WARP_NPC,1,1
+turbo_e_4,364,36,0 duplicate(TurboTrap#tt_main) trap_e4#F89 HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,56,0 duplicate(TurboTrap#tt_main) trap_e4#F90 HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,52,0 duplicate(TurboTrap#tt_main) trap_e4#F91 HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,48,0 duplicate(TurboTrap#tt_main) trap_e4#F92 HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,44,0 duplicate(TurboTrap#tt_main) trap_e4#F93 HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,40,0 duplicate(TurboTrap#tt_main) trap_e4#F94 HIDDEN_WARP_NPC,1,1
+turbo_e_4,368,36,0 duplicate(TurboTrap#tt_main) trap_e4#F95 HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,51,0 duplicate(TurboTrap#tt_main) trap_e8#F49 HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,47,0 duplicate(TurboTrap#tt_main) trap_e8#F50 HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,43,0 duplicate(TurboTrap#tt_main) trap_e8#F51 HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,39,0 duplicate(TurboTrap#tt_main) trap_e8#F52 HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,36,0 duplicate(TurboTrap#tt_main) trap_e8#F53 HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,56,0 duplicate(TurboTrap#tt_main) trap_e8#F54 HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,52,0 duplicate(TurboTrap#tt_main) trap_e8#F55 HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,48,0 duplicate(TurboTrap#tt_main) trap_e8#F56 HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,44,0 duplicate(TurboTrap#tt_main) trap_e8#F57 HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,40,0 duplicate(TurboTrap#tt_main) trap_e8#F58 HIDDEN_WARP_NPC,1,1
+turbo_e_8,344,36,0 duplicate(TurboTrap#tt_main) trap_e8#F59 HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,55,0 duplicate(TurboTrap#tt_main) trap_e8#F60 HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,51,0 duplicate(TurboTrap#tt_main) trap_e8#F61 HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,47,0 duplicate(TurboTrap#tt_main) trap_e8#F62 HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,43,0 duplicate(TurboTrap#tt_main) trap_e8#F63 HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,39,0 duplicate(TurboTrap#tt_main) trap_e8#F64 HIDDEN_WARP_NPC,1,1
+turbo_e_8,348,36,0 duplicate(TurboTrap#tt_main) trap_e8#F65 HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,56,0 duplicate(TurboTrap#tt_main) trap_e8#F66 HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,52,0 duplicate(TurboTrap#tt_main) trap_e8#F67 HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,48,0 duplicate(TurboTrap#tt_main) trap_e8#F68 HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,44,0 duplicate(TurboTrap#tt_main) trap_e8#F69 HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,40,0 duplicate(TurboTrap#tt_main) trap_e8#F70 HIDDEN_WARP_NPC,1,1
+turbo_e_8,352,36,0 duplicate(TurboTrap#tt_main) trap_e8#F71 HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,55,0 duplicate(TurboTrap#tt_main) trap_e8#F72 HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,51,0 duplicate(TurboTrap#tt_main) trap_e8#F73 HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,47,0 duplicate(TurboTrap#tt_main) trap_e8#F74 HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,43,0 duplicate(TurboTrap#tt_main) trap_e8#F75 HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,39,0 duplicate(TurboTrap#tt_main) trap_e8#F76 HIDDEN_WARP_NPC,1,1
+turbo_e_8,356,36,0 duplicate(TurboTrap#tt_main) trap_e8#F77 HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,56,0 duplicate(TurboTrap#tt_main) trap_e8#F78 HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,52,0 duplicate(TurboTrap#tt_main) trap_e8#F79 HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,48,0 duplicate(TurboTrap#tt_main) trap_e8#F80 HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,44,0 duplicate(TurboTrap#tt_main) trap_e8#F81 HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,40,0 duplicate(TurboTrap#tt_main) trap_e8#F82 HIDDEN_WARP_NPC,1,1
+turbo_e_8,360,36,0 duplicate(TurboTrap#tt_main) trap_e8#F83 HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,55,0 duplicate(TurboTrap#tt_main) trap_e8#F84 HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,51,0 duplicate(TurboTrap#tt_main) trap_e8#F85 HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,47,0 duplicate(TurboTrap#tt_main) trap_e8#F86 HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,43,0 duplicate(TurboTrap#tt_main) trap_e8#F87 HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,39,0 duplicate(TurboTrap#tt_main) trap_e8#F88 HIDDEN_WARP_NPC,1,1
+turbo_e_8,364,36,0 duplicate(TurboTrap#tt_main) trap_e8#F89 HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,56,0 duplicate(TurboTrap#tt_main) trap_e8#F90 HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,52,0 duplicate(TurboTrap#tt_main) trap_e8#F91 HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,48,0 duplicate(TurboTrap#tt_main) trap_e8#F92 HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,44,0 duplicate(TurboTrap#tt_main) trap_e8#F93 HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,40,0 duplicate(TurboTrap#tt_main) trap_e8#F94 HIDDEN_WARP_NPC,1,1
+turbo_e_8,368,36,0 duplicate(TurboTrap#tt_main) trap_e8#F95 HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,51,0 duplicate(TurboTrap#tt_main) trap_e16#F49 HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,47,0 duplicate(TurboTrap#tt_main) trap_e16#F50 HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,43,0 duplicate(TurboTrap#tt_main) trap_e16#F51 HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,39,0 duplicate(TurboTrap#tt_main) trap_e16#F52 HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,36,0 duplicate(TurboTrap#tt_main) trap_e16#F53 HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,56,0 duplicate(TurboTrap#tt_main) trap_e16#F54 HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,52,0 duplicate(TurboTrap#tt_main) trap_e16#F55 HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,48,0 duplicate(TurboTrap#tt_main) trap_e16#F56 HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,44,0 duplicate(TurboTrap#tt_main) trap_e16#F57 HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,40,0 duplicate(TurboTrap#tt_main) trap_e16#F58 HIDDEN_WARP_NPC,1,1
+turbo_e_16,344,36,0 duplicate(TurboTrap#tt_main) trap_e16#F59 HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,55,0 duplicate(TurboTrap#tt_main) trap_e16#F60 HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,51,0 duplicate(TurboTrap#tt_main) trap_e16#F61 HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,47,0 duplicate(TurboTrap#tt_main) trap_e16#F62 HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,43,0 duplicate(TurboTrap#tt_main) trap_e16#F63 HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,39,0 duplicate(TurboTrap#tt_main) trap_e16#F64 HIDDEN_WARP_NPC,1,1
+turbo_e_16,348,36,0 duplicate(TurboTrap#tt_main) trap_e16#F65 HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,56,0 duplicate(TurboTrap#tt_main) trap_e16#F66 HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,52,0 duplicate(TurboTrap#tt_main) trap_e16#F67 HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,48,0 duplicate(TurboTrap#tt_main) trap_e16#F68 HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,44,0 duplicate(TurboTrap#tt_main) trap_e16#F69 HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,40,0 duplicate(TurboTrap#tt_main) trap_e16#F70 HIDDEN_WARP_NPC,1,1
+turbo_e_16,352,36,0 duplicate(TurboTrap#tt_main) trap_e16#F71 HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,55,0 duplicate(TurboTrap#tt_main) trap_e16#F72 HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,51,0 duplicate(TurboTrap#tt_main) trap_e16#F73 HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,47,0 duplicate(TurboTrap#tt_main) trap_e16#F74 HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,43,0 duplicate(TurboTrap#tt_main) trap_e16#F75 HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,39,0 duplicate(TurboTrap#tt_main) trap_e16#F76 HIDDEN_WARP_NPC,1,1
+turbo_e_16,356,36,0 duplicate(TurboTrap#tt_main) trap_e16#F77 HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,56,0 duplicate(TurboTrap#tt_main) trap_e16#F78 HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,52,0 duplicate(TurboTrap#tt_main) trap_e16#F79 HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,48,0 duplicate(TurboTrap#tt_main) trap_e16#F80 HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,44,0 duplicate(TurboTrap#tt_main) trap_e16#F81 HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,40,0 duplicate(TurboTrap#tt_main) trap_e16#F82 HIDDEN_WARP_NPC,1,1
+turbo_e_16,360,36,0 duplicate(TurboTrap#tt_main) trap_e16#F83 HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,55,0 duplicate(TurboTrap#tt_main) trap_e16#F84 HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,51,0 duplicate(TurboTrap#tt_main) trap_e16#F85 HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,47,0 duplicate(TurboTrap#tt_main) trap_e16#F86 HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,43,0 duplicate(TurboTrap#tt_main) trap_e16#F87 HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,39,0 duplicate(TurboTrap#tt_main) trap_e16#F88 HIDDEN_WARP_NPC,1,1
+turbo_e_16,364,36,0 duplicate(TurboTrap#tt_main) trap_e16#F89 HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,56,0 duplicate(TurboTrap#tt_main) trap_e16#F90 HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,52,0 duplicate(TurboTrap#tt_main) trap_e16#F91 HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,48,0 duplicate(TurboTrap#tt_main) trap_e16#F92 HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,44,0 duplicate(TurboTrap#tt_main) trap_e16#F93 HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,40,0 duplicate(TurboTrap#tt_main) trap_e16#F94 HIDDEN_WARP_NPC,1,1
+turbo_e_16,368,36,0 duplicate(TurboTrap#tt_main) trap_e16#F95 HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,51,0 duplicate(TurboTrap#tt_main) trap_n4#F49 HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,47,0 duplicate(TurboTrap#tt_main) trap_n4#F50 HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,43,0 duplicate(TurboTrap#tt_main) trap_n4#F51 HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,39,0 duplicate(TurboTrap#tt_main) trap_n4#F52 HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,36,0 duplicate(TurboTrap#tt_main) trap_n4#F53 HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,56,0 duplicate(TurboTrap#tt_main) trap_n4#F54 HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,52,0 duplicate(TurboTrap#tt_main) trap_n4#F55 HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,48,0 duplicate(TurboTrap#tt_main) trap_n4#F56 HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,44,0 duplicate(TurboTrap#tt_main) trap_n4#F57 HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,40,0 duplicate(TurboTrap#tt_main) trap_n4#F58 HIDDEN_WARP_NPC,1,1
+turbo_n_4,344,36,0 duplicate(TurboTrap#tt_main) trap_n4#F59 HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,55,0 duplicate(TurboTrap#tt_main) trap_n4#F60 HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,51,0 duplicate(TurboTrap#tt_main) trap_n4#F61 HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,47,0 duplicate(TurboTrap#tt_main) trap_n4#F62 HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,43,0 duplicate(TurboTrap#tt_main) trap_n4#F63 HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,39,0 duplicate(TurboTrap#tt_main) trap_n4#F64 HIDDEN_WARP_NPC,1,1
+turbo_n_4,348,36,0 duplicate(TurboTrap#tt_main) trap_n4#F65 HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,56,0 duplicate(TurboTrap#tt_main) trap_n4#F66 HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,52,0 duplicate(TurboTrap#tt_main) trap_n4#F67 HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,48,0 duplicate(TurboTrap#tt_main) trap_n4#F68 HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,44,0 duplicate(TurboTrap#tt_main) trap_n4#F69 HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,40,0 duplicate(TurboTrap#tt_main) trap_n4#F70 HIDDEN_WARP_NPC,1,1
+turbo_n_4,352,36,0 duplicate(TurboTrap#tt_main) trap_n4#F71 HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,55,0 duplicate(TurboTrap#tt_main) trap_n4#F72 HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,51,0 duplicate(TurboTrap#tt_main) trap_n4#F73 HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,47,0 duplicate(TurboTrap#tt_main) trap_n4#F74 HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,43,0 duplicate(TurboTrap#tt_main) trap_n4#F75 HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,39,0 duplicate(TurboTrap#tt_main) trap_n4#F76 HIDDEN_WARP_NPC,1,1
+turbo_n_4,356,36,0 duplicate(TurboTrap#tt_main) trap_n4#F77 HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,56,0 duplicate(TurboTrap#tt_main) trap_n4#F78 HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,52,0 duplicate(TurboTrap#tt_main) trap_n4#F79 HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,48,0 duplicate(TurboTrap#tt_main) trap_n4#F80 HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,44,0 duplicate(TurboTrap#tt_main) trap_n4#F81 HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,40,0 duplicate(TurboTrap#tt_main) trap_n4#F82 HIDDEN_WARP_NPC,1,1
+turbo_n_4,360,36,0 duplicate(TurboTrap#tt_main) trap_n4#F83 HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,55,0 duplicate(TurboTrap#tt_main) trap_n4#F84 HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,51,0 duplicate(TurboTrap#tt_main) trap_n4#F85 HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,47,0 duplicate(TurboTrap#tt_main) trap_n4#F86 HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,43,0 duplicate(TurboTrap#tt_main) trap_n4#F87 HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,39,0 duplicate(TurboTrap#tt_main) trap_n4#F88 HIDDEN_WARP_NPC,1,1
+turbo_n_4,364,36,0 duplicate(TurboTrap#tt_main) trap_n4#F89 HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,56,0 duplicate(TurboTrap#tt_main) trap_n4#F90 HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,52,0 duplicate(TurboTrap#tt_main) trap_n4#F91 HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,48,0 duplicate(TurboTrap#tt_main) trap_n4#F92 HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,44,0 duplicate(TurboTrap#tt_main) trap_n4#F93 HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,40,0 duplicate(TurboTrap#tt_main) trap_n4#F94 HIDDEN_WARP_NPC,1,1
+turbo_n_4,368,36,0 duplicate(TurboTrap#tt_main) trap_n4#F95 HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,51,0 duplicate(TurboTrap#tt_main) trap_n8#F49 HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,47,0 duplicate(TurboTrap#tt_main) trap_n8#F50 HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,43,0 duplicate(TurboTrap#tt_main) trap_n8#F51 HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,39,0 duplicate(TurboTrap#tt_main) trap_n8#F52 HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,36,0 duplicate(TurboTrap#tt_main) trap_n8#F53 HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,56,0 duplicate(TurboTrap#tt_main) trap_n8#F54 HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,52,0 duplicate(TurboTrap#tt_main) trap_n8#F55 HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,48,0 duplicate(TurboTrap#tt_main) trap_n8#F56 HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,44,0 duplicate(TurboTrap#tt_main) trap_n8#F57 HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,40,0 duplicate(TurboTrap#tt_main) trap_n8#F58 HIDDEN_WARP_NPC,1,1
+turbo_n_8,344,36,0 duplicate(TurboTrap#tt_main) trap_n8#F59 HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,55,0 duplicate(TurboTrap#tt_main) trap_n8#F60 HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,51,0 duplicate(TurboTrap#tt_main) trap_n8#F61 HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,47,0 duplicate(TurboTrap#tt_main) trap_n8#F62 HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,43,0 duplicate(TurboTrap#tt_main) trap_n8#F63 HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,39,0 duplicate(TurboTrap#tt_main) trap_n8#F64 HIDDEN_WARP_NPC,1,1
+turbo_n_8,348,36,0 duplicate(TurboTrap#tt_main) trap_n8#F65 HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,56,0 duplicate(TurboTrap#tt_main) trap_n8#F66 HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,52,0 duplicate(TurboTrap#tt_main) trap_n8#F67 HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,48,0 duplicate(TurboTrap#tt_main) trap_n8#F68 HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,44,0 duplicate(TurboTrap#tt_main) trap_n8#F69 HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,40,0 duplicate(TurboTrap#tt_main) trap_n8#F70 HIDDEN_WARP_NPC,1,1
+turbo_n_8,352,36,0 duplicate(TurboTrap#tt_main) trap_n8#F71 HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,55,0 duplicate(TurboTrap#tt_main) trap_n8#F72 HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,51,0 duplicate(TurboTrap#tt_main) trap_n8#F73 HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,47,0 duplicate(TurboTrap#tt_main) trap_n8#F74 HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,43,0 duplicate(TurboTrap#tt_main) trap_n8#F75 HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,39,0 duplicate(TurboTrap#tt_main) trap_n8#F76 HIDDEN_WARP_NPC,1,1
+turbo_n_8,356,36,0 duplicate(TurboTrap#tt_main) trap_n8#F77 HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,56,0 duplicate(TurboTrap#tt_main) trap_n8#F78 HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,52,0 duplicate(TurboTrap#tt_main) trap_n8#F79 HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,48,0 duplicate(TurboTrap#tt_main) trap_n8#F80 HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,44,0 duplicate(TurboTrap#tt_main) trap_n8#F81 HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,40,0 duplicate(TurboTrap#tt_main) trap_n8#F82 HIDDEN_WARP_NPC,1,1
+turbo_n_8,360,36,0 duplicate(TurboTrap#tt_main) trap_n8#F83 HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,55,0 duplicate(TurboTrap#tt_main) trap_n8#F84 HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,51,0 duplicate(TurboTrap#tt_main) trap_n8#F85 HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,47,0 duplicate(TurboTrap#tt_main) trap_n8#F86 HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,43,0 duplicate(TurboTrap#tt_main) trap_n8#F87 HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,39,0 duplicate(TurboTrap#tt_main) trap_n8#F88 HIDDEN_WARP_NPC,1,1
+turbo_n_8,364,36,0 duplicate(TurboTrap#tt_main) trap_n8#F89 HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,56,0 duplicate(TurboTrap#tt_main) trap_n8#F90 HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,52,0 duplicate(TurboTrap#tt_main) trap_n8#F91 HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,48,0 duplicate(TurboTrap#tt_main) trap_n8#F92 HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,44,0 duplicate(TurboTrap#tt_main) trap_n8#F93 HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,40,0 duplicate(TurboTrap#tt_main) trap_n8#F94 HIDDEN_WARP_NPC,1,1
+turbo_n_8,368,36,0 duplicate(TurboTrap#tt_main) trap_n8#F95 HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,51,0 duplicate(TurboTrap#tt_main) trap_n16#F49 HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,47,0 duplicate(TurboTrap#tt_main) trap_n16#F50 HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,43,0 duplicate(TurboTrap#tt_main) trap_n16#F51 HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,39,0 duplicate(TurboTrap#tt_main) trap_n16#F52 HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,36,0 duplicate(TurboTrap#tt_main) trap_n16#F53 HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,56,0 duplicate(TurboTrap#tt_main) trap_n16#F54 HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,52,0 duplicate(TurboTrap#tt_main) trap_n16#F55 HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,48,0 duplicate(TurboTrap#tt_main) trap_n16#F56 HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,44,0 duplicate(TurboTrap#tt_main) trap_n16#F57 HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,40,0 duplicate(TurboTrap#tt_main) trap_n16#F58 HIDDEN_WARP_NPC,1,1
+turbo_n_16,344,36,0 duplicate(TurboTrap#tt_main) trap_n16#F59 HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,55,0 duplicate(TurboTrap#tt_main) trap_n16#F60 HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,51,0 duplicate(TurboTrap#tt_main) trap_n16#F61 HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,47,0 duplicate(TurboTrap#tt_main) trap_n16#F62 HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,43,0 duplicate(TurboTrap#tt_main) trap_n16#F63 HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,39,0 duplicate(TurboTrap#tt_main) trap_n16#F64 HIDDEN_WARP_NPC,1,1
+turbo_n_16,348,36,0 duplicate(TurboTrap#tt_main) trap_n16#F65 HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,56,0 duplicate(TurboTrap#tt_main) trap_n16#F66 HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,52,0 duplicate(TurboTrap#tt_main) trap_n16#F67 HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,48,0 duplicate(TurboTrap#tt_main) trap_n16#F68 HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,44,0 duplicate(TurboTrap#tt_main) trap_n16#F69 HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,40,0 duplicate(TurboTrap#tt_main) trap_n16#F70 HIDDEN_WARP_NPC,1,1
+turbo_n_16,352,36,0 duplicate(TurboTrap#tt_main) trap_n16#F71 HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,55,0 duplicate(TurboTrap#tt_main) trap_n16#F72 HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,51,0 duplicate(TurboTrap#tt_main) trap_n16#F73 HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,47,0 duplicate(TurboTrap#tt_main) trap_n16#F74 HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,43,0 duplicate(TurboTrap#tt_main) trap_n16#F75 HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,39,0 duplicate(TurboTrap#tt_main) trap_n16#F76 HIDDEN_WARP_NPC,1,1
+turbo_n_16,356,36,0 duplicate(TurboTrap#tt_main) trap_n16#F77 HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,56,0 duplicate(TurboTrap#tt_main) trap_n16#F78 HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,52,0 duplicate(TurboTrap#tt_main) trap_n16#F79 HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,48,0 duplicate(TurboTrap#tt_main) trap_n16#F80 HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,44,0 duplicate(TurboTrap#tt_main) trap_n16#F81 HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,40,0 duplicate(TurboTrap#tt_main) trap_n16#F82 HIDDEN_WARP_NPC,1,1
+turbo_n_16,360,36,0 duplicate(TurboTrap#tt_main) trap_n16#F83 HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,55,0 duplicate(TurboTrap#tt_main) trap_n16#F84 HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,51,0 duplicate(TurboTrap#tt_main) trap_n16#F85 HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,47,0 duplicate(TurboTrap#tt_main) trap_n16#F86 HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,43,0 duplicate(TurboTrap#tt_main) trap_n16#F87 HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,39,0 duplicate(TurboTrap#tt_main) trap_n16#F88 HIDDEN_WARP_NPC,1,1
+turbo_n_16,364,36,0 duplicate(TurboTrap#tt_main) trap_n16#F89 HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,56,0 duplicate(TurboTrap#tt_main) trap_n16#F90 HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,52,0 duplicate(TurboTrap#tt_main) trap_n16#F91 HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,48,0 duplicate(TurboTrap#tt_main) trap_n16#F92 HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,44,0 duplicate(TurboTrap#tt_main) trap_n16#F93 HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,40,0 duplicate(TurboTrap#tt_main) trap_n16#F94 HIDDEN_WARP_NPC,1,1
+turbo_n_16,368,36,0 duplicate(TurboTrap#tt_main) trap_n16#F95 HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,51,0 duplicate(TurboTrap#tt_main) trap_n1#F49 HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,47,0 duplicate(TurboTrap#tt_main) trap_n1#F50 HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,43,0 duplicate(TurboTrap#tt_main) trap_n1#F51 HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,39,0 duplicate(TurboTrap#tt_main) trap_n1#F52 HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,36,0 duplicate(TurboTrap#tt_main) trap_n1#F53 HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,56,0 duplicate(TurboTrap#tt_main) trap_n1#F54 HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,52,0 duplicate(TurboTrap#tt_main) trap_n1#F55 HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,48,0 duplicate(TurboTrap#tt_main) trap_n1#F56 HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,44,0 duplicate(TurboTrap#tt_main) trap_n1#F57 HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,40,0 duplicate(TurboTrap#tt_main) trap_n1#F58 HIDDEN_WARP_NPC,1,1
+turbo_n_1,344,36,0 duplicate(TurboTrap#tt_main) trap_n1#F59 HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,55,0 duplicate(TurboTrap#tt_main) trap_n1#F60 HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,51,0 duplicate(TurboTrap#tt_main) trap_n1#F61 HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,47,0 duplicate(TurboTrap#tt_main) trap_n1#F62 HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,43,0 duplicate(TurboTrap#tt_main) trap_n1#F63 HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,39,0 duplicate(TurboTrap#tt_main) trap_n1#F64 HIDDEN_WARP_NPC,1,1
+turbo_n_1,348,36,0 duplicate(TurboTrap#tt_main) trap_n1#F65 HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,56,0 duplicate(TurboTrap#tt_main) trap_n1#F66 HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,52,0 duplicate(TurboTrap#tt_main) trap_n1#F67 HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,48,0 duplicate(TurboTrap#tt_main) trap_n1#F68 HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,44,0 duplicate(TurboTrap#tt_main) trap_n1#F69 HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,40,0 duplicate(TurboTrap#tt_main) trap_n1#F70 HIDDEN_WARP_NPC,1,1
+turbo_n_1,352,36,0 duplicate(TurboTrap#tt_main) trap_n1#F71 HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,55,0 duplicate(TurboTrap#tt_main) trap_n1#F72 HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,51,0 duplicate(TurboTrap#tt_main) trap_n1#F73 HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,47,0 duplicate(TurboTrap#tt_main) trap_n1#F74 HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,43,0 duplicate(TurboTrap#tt_main) trap_n1#F75 HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,39,0 duplicate(TurboTrap#tt_main) trap_n1#F76 HIDDEN_WARP_NPC,1,1
+turbo_n_1,356,36,0 duplicate(TurboTrap#tt_main) trap_n1#F77 HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,56,0 duplicate(TurboTrap#tt_main) trap_n1#F78 HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,52,0 duplicate(TurboTrap#tt_main) trap_n1#F79 HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,48,0 duplicate(TurboTrap#tt_main) trap_n1#F80 HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,44,0 duplicate(TurboTrap#tt_main) trap_n1#F81 HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,40,0 duplicate(TurboTrap#tt_main) trap_n1#F82 HIDDEN_WARP_NPC,1,1
+turbo_n_1,360,36,0 duplicate(TurboTrap#tt_main) trap_n1#F83 HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,55,0 duplicate(TurboTrap#tt_main) trap_n1#F84 HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,51,0 duplicate(TurboTrap#tt_main) trap_n1#F85 HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,47,0 duplicate(TurboTrap#tt_main) trap_n1#F86 HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,43,0 duplicate(TurboTrap#tt_main) trap_n1#F87 HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,39,0 duplicate(TurboTrap#tt_main) trap_n1#F88 HIDDEN_WARP_NPC,1,1
+turbo_n_1,364,36,0 duplicate(TurboTrap#tt_main) trap_n1#F89 HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,56,0 duplicate(TurboTrap#tt_main) trap_n1#F90 HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,52,0 duplicate(TurboTrap#tt_main) trap_n1#F91 HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,48,0 duplicate(TurboTrap#tt_main) trap_n1#F92 HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,44,0 duplicate(TurboTrap#tt_main) trap_n1#F93 HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,40,0 duplicate(TurboTrap#tt_main) trap_n1#F94 HIDDEN_WARP_NPC,1,1
+turbo_n_1,368,36,0 duplicate(TurboTrap#tt_main) trap_n1#F95 HIDDEN_WARP_NPC,1,1
- script TurboTrap_2#tt_main -1,{
end;
@@ -3536,55 +3536,55 @@ OnTouch:
percentheal -2,0;
}
}
-turbo_e_4,336,56,0 duplicate(TurboTrap_2#tt_main) trap_e4#F42 139,1,1
-turbo_e_4,336,52,0 duplicate(TurboTrap_2#tt_main) trap_e4#F43 139,1,1
-turbo_e_4,336,48,0 duplicate(TurboTrap_2#tt_main) trap_e4#F44 139,1,1
-turbo_e_4,336,44,0 duplicate(TurboTrap_2#tt_main) trap_e4#F45 139,1,1
-turbo_e_4,336,50,0 duplicate(TurboTrap_2#tt_main) trap_e4#F46 139,1,1
-turbo_e_4,336,36,0 duplicate(TurboTrap_2#tt_main) trap_e4#F47 139,1,1
-turbo_e_4,340,55,0 duplicate(TurboTrap_2#tt_main) trap_e4#F48 139,1,1
-turbo_e_8,336,56,0 duplicate(TurboTrap_2#tt_main) trap_e8#F42 139,1,1
-turbo_e_8,336,52,0 duplicate(TurboTrap_2#tt_main) trap_e8#F43 139,1,1
-turbo_e_8,336,48,0 duplicate(TurboTrap_2#tt_main) trap_e8#F44 139,1,1
-turbo_e_8,336,44,0 duplicate(TurboTrap_2#tt_main) trap_e8#F45 139,1,1
-turbo_e_8,336,50,0 duplicate(TurboTrap_2#tt_main) trap_e8#F46 139,1,1
-turbo_e_8,336,36,0 duplicate(TurboTrap_2#tt_main) trap_e8#F47 139,1,1
-turbo_e_8,340,55,0 duplicate(TurboTrap_2#tt_main) trap_e8#F48 139,1,1
-turbo_e_16,336,56,0 duplicate(TurboTrap_2#tt_main) trap_e16#F42 139,1,1
-turbo_e_16,336,52,0 duplicate(TurboTrap_2#tt_main) trap_e16#F43 139,1,1
-turbo_e_16,336,48,0 duplicate(TurboTrap_2#tt_main) trap_e16#F44 139,1,1
-turbo_e_16,336,44,0 duplicate(TurboTrap_2#tt_main) trap_e16#F45 139,1,1
-turbo_e_16,336,50,0 duplicate(TurboTrap_2#tt_main) trap_e16#F46 139,1,1
-turbo_e_16,336,36,0 duplicate(TurboTrap_2#tt_main) trap_e16#F47 139,1,1
-turbo_e_16,340,55,0 duplicate(TurboTrap_2#tt_main) trap_e16#F48 139,1,1
-turbo_n_4,336,56,0 duplicate(TurboTrap_2#tt_main) trap_n4#F42 139,1,1
-turbo_n_4,336,52,0 duplicate(TurboTrap_2#tt_main) trap_n4#F43 139,1,1
-turbo_n_4,336,48,0 duplicate(TurboTrap_2#tt_main) trap_n4#F44 139,1,1
-turbo_n_4,336,44,0 duplicate(TurboTrap_2#tt_main) trap_n4#F45 139,1,1
-turbo_n_4,336,50,0 duplicate(TurboTrap_2#tt_main) trap_n4#F46 139,1,1
-turbo_n_4,336,36,0 duplicate(TurboTrap_2#tt_main) trap_n4#F47 139,1,1
-turbo_n_4,340,55,0 duplicate(TurboTrap_2#tt_main) trap_n4#F48 139,1,1
-turbo_n_8,336,56,0 duplicate(TurboTrap_2#tt_main) trap_n8#F42 139,1,1
-turbo_n_8,336,52,0 duplicate(TurboTrap_2#tt_main) trap_n8#F43 139,1,1
-turbo_n_8,336,48,0 duplicate(TurboTrap_2#tt_main) trap_n8#F44 139,1,1
-turbo_n_8,336,44,0 duplicate(TurboTrap_2#tt_main) trap_n8#F45 139,1,1
-turbo_n_8,336,50,0 duplicate(TurboTrap_2#tt_main) trap_n8#F46 139,1,1
-turbo_n_8,336,36,0 duplicate(TurboTrap_2#tt_main) trap_n8#F47 139,1,1
-turbo_n_8,340,55,0 duplicate(TurboTrap_2#tt_main) trap_n8#F48 139,1,1
-turbo_n_16,336,56,0 duplicate(TurboTrap_2#tt_main) trap_n16#F42 139,1,1
-turbo_n_16,336,52,0 duplicate(TurboTrap_2#tt_main) trap_n16#F43 139,1,1
-turbo_n_16,336,48,0 duplicate(TurboTrap_2#tt_main) trap_n16#F44 139,1,1
-turbo_n_16,336,44,0 duplicate(TurboTrap_2#tt_main) trap_n16#F45 139,1,1
-turbo_n_16,336,50,0 duplicate(TurboTrap_2#tt_main) trap_n16#F46 139,1,1
-turbo_n_16,336,36,0 duplicate(TurboTrap_2#tt_main) trap_n16#F47 139,1,1
-turbo_n_16,340,55,0 duplicate(TurboTrap_2#tt_main) trap_n16#F48 139,1,1
-turbo_n_1,336,56,0 duplicate(TurboTrap_2#tt_main) trap_n1#F42 139,1,1
-turbo_n_1,336,52,0 duplicate(TurboTrap_2#tt_main) trap_n1#F43 139,1,1
-turbo_n_1,336,48,0 duplicate(TurboTrap_2#tt_main) trap_n1#F44 139,1,1
-turbo_n_1,336,44,0 duplicate(TurboTrap_2#tt_main) trap_n1#F45 139,1,1
-turbo_n_1,336,50,0 duplicate(TurboTrap_2#tt_main) trap_n1#F46 139,1,1
-turbo_n_1,336,36,0 duplicate(TurboTrap_2#tt_main) trap_n1#F47 139,1,1
-turbo_n_1,340,55,0 duplicate(TurboTrap_2#tt_main) trap_n1#F48 139,1,1
+turbo_e_4,336,56,0 duplicate(TurboTrap_2#tt_main) trap_e4#F42 HIDDEN_WARP_NPC,1,1
+turbo_e_4,336,52,0 duplicate(TurboTrap_2#tt_main) trap_e4#F43 HIDDEN_WARP_NPC,1,1
+turbo_e_4,336,48,0 duplicate(TurboTrap_2#tt_main) trap_e4#F44 HIDDEN_WARP_NPC,1,1
+turbo_e_4,336,44,0 duplicate(TurboTrap_2#tt_main) trap_e4#F45 HIDDEN_WARP_NPC,1,1
+turbo_e_4,336,50,0 duplicate(TurboTrap_2#tt_main) trap_e4#F46 HIDDEN_WARP_NPC,1,1
+turbo_e_4,336,36,0 duplicate(TurboTrap_2#tt_main) trap_e4#F47 HIDDEN_WARP_NPC,1,1
+turbo_e_4,340,55,0 duplicate(TurboTrap_2#tt_main) trap_e4#F48 HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,56,0 duplicate(TurboTrap_2#tt_main) trap_e8#F42 HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,52,0 duplicate(TurboTrap_2#tt_main) trap_e8#F43 HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,48,0 duplicate(TurboTrap_2#tt_main) trap_e8#F44 HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,44,0 duplicate(TurboTrap_2#tt_main) trap_e8#F45 HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,50,0 duplicate(TurboTrap_2#tt_main) trap_e8#F46 HIDDEN_WARP_NPC,1,1
+turbo_e_8,336,36,0 duplicate(TurboTrap_2#tt_main) trap_e8#F47 HIDDEN_WARP_NPC,1,1
+turbo_e_8,340,55,0 duplicate(TurboTrap_2#tt_main) trap_e8#F48 HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,56,0 duplicate(TurboTrap_2#tt_main) trap_e16#F42 HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,52,0 duplicate(TurboTrap_2#tt_main) trap_e16#F43 HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,48,0 duplicate(TurboTrap_2#tt_main) trap_e16#F44 HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,44,0 duplicate(TurboTrap_2#tt_main) trap_e16#F45 HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,50,0 duplicate(TurboTrap_2#tt_main) trap_e16#F46 HIDDEN_WARP_NPC,1,1
+turbo_e_16,336,36,0 duplicate(TurboTrap_2#tt_main) trap_e16#F47 HIDDEN_WARP_NPC,1,1
+turbo_e_16,340,55,0 duplicate(TurboTrap_2#tt_main) trap_e16#F48 HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,56,0 duplicate(TurboTrap_2#tt_main) trap_n4#F42 HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,52,0 duplicate(TurboTrap_2#tt_main) trap_n4#F43 HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,48,0 duplicate(TurboTrap_2#tt_main) trap_n4#F44 HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,44,0 duplicate(TurboTrap_2#tt_main) trap_n4#F45 HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,50,0 duplicate(TurboTrap_2#tt_main) trap_n4#F46 HIDDEN_WARP_NPC,1,1
+turbo_n_4,336,36,0 duplicate(TurboTrap_2#tt_main) trap_n4#F47 HIDDEN_WARP_NPC,1,1
+turbo_n_4,340,55,0 duplicate(TurboTrap_2#tt_main) trap_n4#F48 HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,56,0 duplicate(TurboTrap_2#tt_main) trap_n8#F42 HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,52,0 duplicate(TurboTrap_2#tt_main) trap_n8#F43 HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,48,0 duplicate(TurboTrap_2#tt_main) trap_n8#F44 HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,44,0 duplicate(TurboTrap_2#tt_main) trap_n8#F45 HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,50,0 duplicate(TurboTrap_2#tt_main) trap_n8#F46 HIDDEN_WARP_NPC,1,1
+turbo_n_8,336,36,0 duplicate(TurboTrap_2#tt_main) trap_n8#F47 HIDDEN_WARP_NPC,1,1
+turbo_n_8,340,55,0 duplicate(TurboTrap_2#tt_main) trap_n8#F48 HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,56,0 duplicate(TurboTrap_2#tt_main) trap_n16#F42 HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,52,0 duplicate(TurboTrap_2#tt_main) trap_n16#F43 HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,48,0 duplicate(TurboTrap_2#tt_main) trap_n16#F44 HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,44,0 duplicate(TurboTrap_2#tt_main) trap_n16#F45 HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,50,0 duplicate(TurboTrap_2#tt_main) trap_n16#F46 HIDDEN_WARP_NPC,1,1
+turbo_n_16,336,36,0 duplicate(TurboTrap_2#tt_main) trap_n16#F47 HIDDEN_WARP_NPC,1,1
+turbo_n_16,340,55,0 duplicate(TurboTrap_2#tt_main) trap_n16#F48 HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,56,0 duplicate(TurboTrap_2#tt_main) trap_n1#F42 HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,52,0 duplicate(TurboTrap_2#tt_main) trap_n1#F43 HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,48,0 duplicate(TurboTrap_2#tt_main) trap_n1#F44 HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,44,0 duplicate(TurboTrap_2#tt_main) trap_n1#F45 HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,50,0 duplicate(TurboTrap_2#tt_main) trap_n1#F46 HIDDEN_WARP_NPC,1,1
+turbo_n_1,336,36,0 duplicate(TurboTrap_2#tt_main) trap_n1#F47 HIDDEN_WARP_NPC,1,1
+turbo_n_1,340,55,0 duplicate(TurboTrap_2#tt_main) trap_n1#F48 HIDDEN_WARP_NPC,1,1
- script bing_1#tt_main -1,{
end;
@@ -3605,12 +3605,12 @@ OnTouch:
enablenpc "bing2#"+.@w$;
end;
}
-turbo_e_4,217,214,0 duplicate(bing_1#tt_main) bing#e4 45,3,3
-turbo_e_8,217,214,0 duplicate(bing_1#tt_main) bing#e8 45,3,3
-turbo_e_16,217,214,0 duplicate(bing_1#tt_main) bing#e16 45,3,3
-turbo_n_4,217,214,0 duplicate(bing_1#tt_main) bing#n4 45,3,3
-turbo_n_8,217,214,0 duplicate(bing_1#tt_main) bing#n8 45,3,3
-turbo_n_16,217,214,0 duplicate(bing_1#tt_main) bing#n16 45,3,3
+turbo_e_4,217,214,0 duplicate(bing_1#tt_main) bing#e4 WARPNPC,3,3
+turbo_e_8,217,214,0 duplicate(bing_1#tt_main) bing#e8 WARPNPC,3,3
+turbo_e_16,217,214,0 duplicate(bing_1#tt_main) bing#e16 WARPNPC,3,3
+turbo_n_4,217,214,0 duplicate(bing_1#tt_main) bing#n4 WARPNPC,3,3
+turbo_n_8,217,214,0 duplicate(bing_1#tt_main) bing#n8 WARPNPC,3,3
+turbo_n_16,217,214,0 duplicate(bing_1#tt_main) bing#n16 WARPNPC,3,3
- script bing_2#tt_main -1,{
end;
@@ -3631,14 +3631,14 @@ OnInit:
disablenpc "bing2#"+.@w$;
end;
}
-turbo_e_4,217,214,0 duplicate(bing_2#tt_main) bing2#e4 45,3,3
-turbo_e_8,217,214,0 duplicate(bing_2#tt_main) bing2#e8 45,3,3
-turbo_e_16,217,214,0 duplicate(bing_2#tt_main) bing2#e16 45,3,3
-turbo_n_4,217,214,0 duplicate(bing_2#tt_main) bing2#n4 45,3,3
-turbo_n_8,217,214,0 duplicate(bing_2#tt_main) bing2#n8 45,3,3
-turbo_n_16,217,214,0 duplicate(bing_2#tt_main) bing2#n16 45,3,3
-
-turbo_room,130,92,3 script Kafra Staff#tt 115,{
+turbo_e_4,217,214,0 duplicate(bing_2#tt_main) bing2#e4 WARPNPC,3,3
+turbo_e_8,217,214,0 duplicate(bing_2#tt_main) bing2#e8 WARPNPC,3,3
+turbo_e_16,217,214,0 duplicate(bing_2#tt_main) bing2#e16 WARPNPC,3,3
+turbo_n_4,217,214,0 duplicate(bing_2#tt_main) bing2#n4 WARPNPC,3,3
+turbo_n_8,217,214,0 duplicate(bing_2#tt_main) bing2#n8 WARPNPC,3,3
+turbo_n_16,217,214,0 duplicate(bing_2#tt_main) bing2#n16 WARPNPC,3,3
+
+turbo_room,130,92,3 script Kafra Staff#tt 4_F_KAFRA3,{
cutin "kafra_03",2;
mes "[Kafra Staff]";
mes "Welcome~ The Kafra Services";
@@ -3655,10 +3655,10 @@ turbo_room,130,92,3 script Kafra Staff#tt 115,{
}
-turbo_room,124,86,0 shop Turbo Track Merchant 90,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,1065:-1,1750:-1
+turbo_room,124,86,0 shop Turbo Track Merchant 4_F_01,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,1065:-1,1750:-1
// Official name: "TBT_Guide#Broadcast"
-turbo_room,99,120,4 script Turbo Track Guide 124,{
+turbo_room,99,120,4 script Turbo Track Guide 4_F_TELEPORTER,{
mes "[Turbo Track Guide]";
mes "Good day~";
mes "Is there anything that";
@@ -3973,7 +3973,7 @@ OnWin_e16:
end;
}
-turbo_room,102,117,3 script Hall of Honor#tt 857,{
+turbo_room,102,117,3 script Hall of Honor#tt 4_BOARD3,{
mes "^2F4F4FTurbo Track Hall of Honor^000000";
mes " ";
mes "The First:";
@@ -3984,7 +3984,7 @@ turbo_room,102,117,3 script Hall of Honor#tt 857,{
close;
}
-turbo_room,77,115,5 script Solo Mode#tt::TurboSoloNames 857,{
+turbo_room,77,115,5 script Solo Mode#tt::TurboSoloNames 4_BOARD3,{
mes "^2F4F4FSolo Mode Record^000000";
mes " ";
mes "The best player";
@@ -3993,7 +3993,7 @@ turbo_room,77,115,5 script Solo Mode#tt::TurboSoloNames 857,{
close;
}
-turbo_room,87,114,5 script Normal Mode Record#tt::TurboNormalNames 857,{
+turbo_room,87,114,5 script Normal Mode Record#tt::TurboNormalNames 4_BOARD3,{
mes "<<Recent Top Players>>";
mes "Winners of Normal Mode - 4 Person";
mes "^4d4dff" + $ttnames$[1] + "^000000";
@@ -4004,7 +4004,7 @@ turbo_room,87,114,5 script Normal Mode Record#tt::TurboNormalNames 857,{
close;
}
-turbo_room,112,114,3 script Expert Mode Record::TurboExpertNames 857,{
+turbo_room,112,114,3 script Expert Mode Record::TurboExpertNames 4_BOARD3,{
mes "<<Recent Top Players>>";
mes "Winners of Expert Mode - 4 Person";
mes "^4d4dff" + $ttnames$[4] + "^000000";
@@ -4015,7 +4015,7 @@ turbo_room,112,114,3 script Expert Mode Record::TurboExpertNames 857,{
close;
}
-turbo_room,97,117,5 script Hall of Honor#tt2 857,{
+turbo_room,97,117,5 script Hall of Honor#tt2 4_BOARD3,{
mes "^2F4F4FTurbo Track Hall of Honor^000000";
mes " ";
mes "1st: ^4d4dff" + $ttnames$[9] + "^000000";
@@ -4026,11 +4026,11 @@ turbo_room,97,117,5 script Hall of Honor#tt2 857,{
close;
}
-turbo_room,75,95,5 duplicate(TurboSoloNames) Solo Mode#1 857
-turbo_room,67,95,5 duplicate(TurboNormalNames) Normal Mode Records#1 857
-turbo_room,71,95,5 duplicate(TurboExpertNames) Expert Mode Records#1 857
+turbo_room,75,95,5 duplicate(TurboSoloNames) Solo Mode#1 4_BOARD3
+turbo_room,67,95,5 duplicate(TurboNormalNames) Normal Mode Records#1 4_BOARD3
+turbo_room,71,95,5 duplicate(TurboExpertNames) Expert Mode Records#1 4_BOARD3
-turbo_room,93,117,5 script Point Exchange Helper 125,{
+turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -4444,7 +4444,7 @@ turbo_room,93,117,5 script Point Exchange Helper 125,{
}
}
-turbo_room,106,117,3 script Point Manager#tt 833,{
+turbo_room,106,117,3 script Point Manager#tt 4_M_ZONDAOYAJI,{
mes "[Turbo Track Point Manager]";
mes "Good day.";
mes "Did you enjoy your";
@@ -4589,7 +4589,7 @@ S_ExchangePoints:
}
}
-alde_gld,183,204,0 script en_turbo 45,1,1,{
+alde_gld,183,204,0 script en_turbo WARPNPC,1,1,{
OnTouch:
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
@@ -4668,7 +4668,7 @@ OnTouch:
end;
}
-alde_gld,186,199,3 script Turbo Track Guide#Entran 845,{
+alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{
mes "[Guide]";
mes "Welcome to";
mes "the Al De Baran";
@@ -4801,7 +4801,7 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 845,{
}
}
-alde_gld,178,180,0 script Sign#TBT 837,{
+alde_gld,178,180,0 script Sign#TBT 2_BULLETIN_BOARD,{
mes "[Al De Baran Turbo Track]";
mes "This way...";
mes "to the Al De Baran";
diff --git a/npc/pre-re/airports/izlude.txt b/npc/pre-re/airports/izlude.txt
index 29e07da86..b581c283e 100644
--- a/npc/pre-re/airports/izlude.txt
+++ b/npc/pre-re/airports/izlude.txt
@@ -8,4 +8,4 @@
//= Official NPCs.
//============================================================
-izlude,206,55,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90
+izlude,206,55,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 4_F_01
diff --git a/npc/pre-re/cities/alberta.txt b/npc/pre-re/cities/alberta.txt
index 20efaad81..4ba223b6e 100644
--- a/npc/pre-re/cities/alberta.txt
+++ b/npc/pre-re/cities/alberta.txt
@@ -13,29 +13,29 @@
// cities/amatsu.txt
//============================================================
-alberta,245,93,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 709
+alberta,245,93,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 4_M_SEAMAN
// cities/ayothaya.txt
//============================================================
-alberta,247,42,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 843
+alberta,247,42,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 4_M_THAIONGBAK
// cities/gonryun.txt
//============================================================
-alberta,245,69,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 776
+alberta,245,69,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 4_M_TWMIDMAN
// cities/louyang.txt
//============================================================
-alberta,245,45,3 duplicate(Girl_louyang) Girl#0lou 815
+alberta,245,45,3 duplicate(Girl_louyang) Girl#0lou 4_F_CHNDRESS1
// cities/moscovia.txt
//============================================================
-alberta,245,66,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 960
+alberta,245,66,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 4_F_RUSWOMAN2
// quests/quests_alberta.txt
//============================================================
-alberta,247,122,4 duplicate(Sailor_alberta) Sailor#tur 709
-alberta,248,89,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 121
+alberta,247,122,4 duplicate(Sailor_alberta) Sailor#tur 4_M_SEAMAN
+alberta,248,89,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 2_M_MOLGENSTEIN
// quests/skills/merchant_skills.txt
//============================================================
-alberta,232,106,6 duplicate(Gershaun_alberta) Gershaun 57
+alberta,232,106,6 duplicate(Gershaun_alberta) Gershaun 1_M_LIBRARYMASTER
diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt
index 531d8a40c..dfd4d3114 100644
--- a/npc/pre-re/cities/izlude.txt
+++ b/npc/pre-re/cities/izlude.txt
@@ -11,12 +11,12 @@
//= 1.0 First Version.
//============================================================
-izlude,201,181,2 duplicate(Sailor_izlude) Sailor#izlude 100
-izlude,55,74,2 duplicate(Bonne_izlude) Bonne#izlude 90
-izlude,135,78,2 duplicate(Charfri_izlude) Charfri#izlude 91
-izlude,119,121,2 duplicate(Cuskoal_izlude) Cuskoal#izlude 124
-izlude,150,118,2 duplicate(Dega_izlude) Dega#izlude 84
-izlude,150,143,2 duplicate(Kylick_izlude) Kylick#izlude 97
-izlude,56,126,2 duplicate(Red_izlude) Red#izlude 85
-izlude,58,126,2 duplicate(Cebalis_izlude) Cebalis#izlude 98
-izlude,124,178,2 duplicate(Soldier_izlude) Soldier#izlude 105
+izlude,201,181,2 duplicate(Sailor_izlude) Sailor#izlude 4W_SAILOR
+izlude,55,74,2 duplicate(Bonne_izlude) Bonne#izlude 4_F_01
+izlude,135,78,2 duplicate(Charfri_izlude) Charfri#izlude 4_F_02
+izlude,119,121,2 duplicate(Cuskoal_izlude) Cuskoal#izlude 4_F_TELEPORTER
+izlude,150,118,2 duplicate(Dega_izlude) Dega#izlude 4_M_02
+izlude,150,143,2 duplicate(Kylick_izlude) Kylick#izlude 4W_M_01
+izlude,56,126,2 duplicate(Red_izlude) Red#izlude 4_M_03
+izlude,58,126,2 duplicate(Cebalis_izlude) Cebalis#izlude 4W_M_02
+izlude,124,178,2 duplicate(Soldier_izlude) Soldier#izlude 8W_SOLDIER
diff --git a/npc/pre-re/cities/jawaii.txt b/npc/pre-re/cities/jawaii.txt
index 764612d7c..52527e372 100644
--- a/npc/pre-re/cities/jawaii.txt
+++ b/npc/pre-re/cities/jawaii.txt
@@ -11,4 +11,4 @@
//= 1.0 First Version.
//============================================================
-izlude,171,185,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71
+izlude,171,185,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 1_F_LIBRARYGIRL
diff --git a/npc/pre-re/cities/yuno.txt b/npc/pre-re/cities/yuno.txt
index 944c0e72f..db9617882 100644
--- a/npc/pre-re/cities/yuno.txt
+++ b/npc/pre-re/cities/yuno.txt
@@ -11,10 +11,10 @@
//= 1.0 First version.
//============================================================
-yuno,150,283,4 duplicate(JunoSoldier1) Juno Soldier#juno 105
-yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 105
-yuno,227,292,4 duplicate(JunoSoldier3) Juno Soldier#3juno 105
-yuno,165,228,4 duplicate(JunoSoldier4) Juno Soldier#4juno 105
-yuno,150,228,4 duplicate(JunoSoldier5) Juno Soldier#5juno 105
-yuno,334,182,4 duplicate(JunoSoldier6) Juno Soldier#6juno 105
-yuno,263,320,4 duplicate(JunoSoldier7) Juno Soldier#7juno 105
+yuno,150,283,4 duplicate(JunoSoldier1) Juno Soldier#juno 8W_SOLDIER
+yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 8W_SOLDIER
+yuno,227,292,4 duplicate(JunoSoldier3) Juno Soldier#3juno 8W_SOLDIER
+yuno,165,228,4 duplicate(JunoSoldier4) Juno Soldier#4juno 8W_SOLDIER
+yuno,150,228,4 duplicate(JunoSoldier5) Juno Soldier#5juno 8W_SOLDIER
+yuno,334,182,4 duplicate(JunoSoldier6) Juno Soldier#6juno 8W_SOLDIER
+yuno,263,320,4 duplicate(JunoSoldier7) Juno Soldier#7juno 8W_SOLDIER
diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt
index 6cdcc77ab..ebdc144e9 100644
--- a/npc/pre-re/guides/guides_alberta.txt
+++ b/npc/pre-re/guides/guides_alberta.txt
@@ -19,7 +19,7 @@
// -Thanks to $ephiroth.
//============================================================
-alberta,23,238,4 script Guide#alb::AlbGuide 105,{
+alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{
cutin "prt_soldier",2;
mes "[Alberta Guide]";
mes "Welcome to Alberta,";
@@ -154,4 +154,4 @@ alberta,23,238,4 script Guide#alb::AlbGuide 105,{
end;
}
-alberta,120,60,3 duplicate(AlbGuide) Guide#2alb 105 \ No newline at end of file
+alberta,120,60,3 duplicate(AlbGuide) Guide#2alb 8W_SOLDIER \ No newline at end of file
diff --git a/npc/pre-re/guides/guides_aldebaran.txt b/npc/pre-re/guides/guides_aldebaran.txt
index 8c68f6b7a..6abac6474 100644
--- a/npc/pre-re/guides/guides_aldebaran.txt
+++ b/npc/pre-re/guides/guides_aldebaran.txt
@@ -19,7 +19,7 @@
//= 1.7 Fixed viewpoint coordinates [Playtester]
//============================================================
-aldebaran,139,63,4 script Soldier#alde 105,{
+aldebaran,139,63,4 script Soldier#alde 8W_SOLDIER,{
cutin "prt_soldier",2;
mes "[Al De Baran Guard]";
mes "I'm just an ordinary guard";
@@ -54,7 +54,7 @@ aldebaran,139,63,4 script Soldier#alde 105,{
end;
}
-aldebaran,133,108,4 script Soldier#2alde 105,{
+aldebaran,133,108,4 script Soldier#2alde 8W_SOLDIER,{
cutin "prt_soldier",2;
mes "[Al De Baran Guard]";
mes "I'm just an";
diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt
index 15129e4ad..85bd79047 100644
--- a/npc/pre-re/guides/guides_amatsu.txt
+++ b/npc/pre-re/guides/guides_amatsu.txt
@@ -13,7 +13,7 @@
//= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf]
//============================================================
-amatsu,207,89,3 script Amatsu Guide#ama 758,{
+amatsu,207,89,3 script Amatsu Guide#ama 4_F_JPN,{
mes "[Amachang]";
mes "Welcome to Amatsu,";
mes "the town of kind towners";
@@ -67,7 +67,7 @@ amatsu,207,89,3 script Amatsu Guide#ama 758,{
}
}
-amatsu,251,283,4 script Guide Man#2ama 767,{
+amatsu,251,283,4 script Guide Man#2ama 8_M_JPNSOLDIER,{
mes "[Guide Man]";
mes "Welcome, tourist from Rune-Midgard.";
mes "I'm the guide of";
diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt
index b8220873c..d13aa93e9 100644
--- a/npc/pre-re/guides/guides_ayothaya.txt
+++ b/npc/pre-re/guides/guides_ayothaya.txt
@@ -11,7 +11,7 @@
//= 1.0 First version [L0ne_W0lf]
//============================================================
-ayothaya,203,169,3 script Noi#ayo 839,{
+ayothaya,203,169,3 script Noi#ayo 4_F_THAIGIRL,{
mes "[Noi]";
mes "Welcome to Ayotaya.";
mes "Our beautiful village is built";
diff --git a/npc/pre-re/guides/guides_comodo.txt b/npc/pre-re/guides/guides_comodo.txt
index f9e068dec..de803a9c5 100644
--- a/npc/pre-re/guides/guides_comodo.txt
+++ b/npc/pre-re/guides/guides_comodo.txt
@@ -17,15 +17,15 @@
//= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
//============================================================
-comodo,322,178,4 script Comodo Guide#cmd::CmdGuide 700,{
+comodo,322,178,4 script Comodo Guide#cmd::CmdGuide 8_F_GIRL,{
callfunc "F_CmdGuide","Native Kokomo";
}
-comodo,176,350,4 script Comodo Guide#2cmd 700,{
+comodo,176,350,4 script Comodo Guide#2cmd 8_F_GIRL,{
callfunc "F_CmdGuide","Native Nutcoco";
}
-comodo,37,219,4 script Guide#2cmd 700,{
+comodo,37,219,4 script Guide#2cmd 8_F_GIRL,{
callfunc "F_CmdGuide","Native Papaya";
}
diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt
index bd4ec75f6..9eefe2535 100644
--- a/npc/pre-re/guides/guides_einbroch.txt
+++ b/npc/pre-re/guides/guides_einbroch.txt
@@ -16,7 +16,7 @@
//= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
//============================================================
-einbroch,72,202,4 script Guide#ein::EinGuide 852,{
+einbroch,72,202,4 script Guide#ein::EinGuide 4_M_EIN_SOLDIER,{
cutin "ein_soldier",2;
mes "[Einbroch Guide]";
mes "Welcome";
@@ -201,10 +201,10 @@ einbroch,72,202,4 script Guide#ein::EinGuide 852,{
end;
}
-einbroch,155,43,4 duplicate(EinGuide) Guide#2ein 852
-einbroch,162,317,4 duplicate(EinGuide) Guide#3ein 852
+einbroch,155,43,4 duplicate(EinGuide) Guide#2ein 4_M_EIN_SOLDIER
+einbroch,162,317,4 duplicate(EinGuide) Guide#3ein 4_M_EIN_SOLDIER
-einbech,67,37,4 script Guide#4ein::EinGuide2 852,{
+einbech,67,37,4 script Guide#4ein::EinGuide2 4_M_EIN_SOLDIER,{
cutin "ein_soldier",2;
mes "[Einbech Guide]";
mes "Welcome to Einbech,";
@@ -346,4 +346,4 @@ einbech,67,37,4 script Guide#4ein::EinGuide2 852,{
end;
}
-einbech,48,214,4 duplicate(EinGuide2) Guide#5ein 852
+einbech,48,214,4 duplicate(EinGuide2) Guide#5ein 4_M_EIN_SOLDIER
diff --git a/npc/pre-re/guides/guides_geffen.txt b/npc/pre-re/guides/guides_geffen.txt
index e691f9e53..46d7e9007 100644
--- a/npc/pre-re/guides/guides_geffen.txt
+++ b/npc/pre-re/guides/guides_geffen.txt
@@ -18,7 +18,7 @@
//= Thanks to $ephiroth.
//============================================================
-geffen,203,116,0 script Guide#gef::GefGuide 705,{
+geffen,203,116,0 script Guide#gef::GefGuide 4_M_GEF_SOLDIER,{
cutin "gef_soldier",2;
mes "[Geffen Guide]";
mes "Welcome to Geffen,";
@@ -169,4 +169,4 @@ geffen,203,116,0 script Guide#gef::GefGuide 705,{
end;
}
-geffen,118,62,0 duplicate(GefGuide) Guide#2gef 705
+geffen,118,62,0 duplicate(GefGuide) Guide#2gef 4_M_GEF_SOLDIER
diff --git a/npc/pre-re/guides/guides_gonryun.txt b/npc/pre-re/guides/guides_gonryun.txt
index 3c8c3ac83..de9b2d599 100644
--- a/npc/pre-re/guides/guides_gonryun.txt
+++ b/npc/pre-re/guides/guides_gonryun.txt
@@ -11,7 +11,7 @@
//= 1.0 First version [L0ne_W0lf]
//============================================================
-gonryun,163,60,4 script Kunlun Guide#gon 780,{
+gonryun,163,60,4 script Kunlun Guide#gon 8_M_TWSOLDIER,{
mes "[He Yuen Zhe]";
mes "Ni Hao!";
mes "Welcome to Kunlun~";
diff --git a/npc/pre-re/guides/guides_hugel.txt b/npc/pre-re/guides/guides_hugel.txt
index b1d64970f..b8a9711b1 100644
--- a/npc/pre-re/guides/guides_hugel.txt
+++ b/npc/pre-re/guides/guides_hugel.txt
@@ -13,7 +13,7 @@
//= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf]
//============================================================
-hugel,98,56,3 script Hugel Guide Granny#huge 863,0,0,{
+hugel,98,56,3 script Hugel Guide Granny#huge 4_F_LGTGRAND,0,0,{
mes "[Hugel Guide Granny]";
mes "Oh, hello~ you are one energetic adventurer.";
mes "Welcome to Hugel. I was honored to guide you to this beautiful village.";
diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt
index 241d5ce40..ef84be488 100644
--- a/npc/pre-re/guides/guides_izlude.txt
+++ b/npc/pre-re/guides/guides_izlude.txt
@@ -17,7 +17,7 @@
// -Thanks to $ephiroth.
//============================================================
-izlude,121,87,6 script Guide#iz 105,{
+izlude,121,87,6 script Guide#iz 8W_SOLDIER,{
cutin "prt_soldier",2;
mes "[Izlude Guide]";
mes "Welcome to Izlude,";
diff --git a/npc/pre-re/guides/guides_juno.txt b/npc/pre-re/guides/guides_juno.txt
index 9475cb0e2..c1a847717 100644
--- a/npc/pre-re/guides/guides_juno.txt
+++ b/npc/pre-re/guides/guides_juno.txt
@@ -19,7 +19,7 @@
//= 1.7 Rescripted to official 10.3 standards. [L0ne_W0lf]
//============================================================
-yuno,153,47,4 script Juno Guide#yuno 700,{
+yuno,153,47,4 script Juno Guide#yuno 8_F_GIRL,{
mes "[Ms. Yoon]";
mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
mes "the city of Juno!";
diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt
index 1d57d5b10..b194c546c 100644
--- a/npc/pre-re/guides/guides_lighthalzen.txt
+++ b/npc/pre-re/guides/guides_lighthalzen.txt
@@ -13,7 +13,7 @@
//= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf]
//============================================================
-lighthalzen,207,310,5 script Guide#lhz::LhzGuide 852,{
+lighthalzen,207,310,5 script Guide#lhz::LhzGuide 4_M_EIN_SOLDIER,{
cutin "ein_soldier",2;
mes "[Lighthalzen Guide]";
mes "Welcome to Lighthalzen,";
@@ -218,8 +218,8 @@ lighthalzen,207,310,5 script Guide#lhz::LhzGuide 852,{
end;
}
-lighthalzen,220,311,3 duplicate(LhzGuide) Guide#2lhz 852
+lighthalzen,220,311,3 duplicate(LhzGuide) Guide#2lhz 4_M_EIN_SOLDIER
-lighthalzen,154,100,5 duplicate(LhzGuide) Guide#3lhz 852
+lighthalzen,154,100,5 duplicate(LhzGuide) Guide#3lhz 4_M_EIN_SOLDIER
-lighthalzen,307,224,3 duplicate(LhzGuide) Guide#4lhz 852
+lighthalzen,307,224,3 duplicate(LhzGuide) Guide#4lhz 4_M_EIN_SOLDIER
diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt
index 52e83c4ed..8b5b14c8b 100644
--- a/npc/pre-re/guides/guides_louyang.txt
+++ b/npc/pre-re/guides/guides_louyang.txt
@@ -13,7 +13,7 @@
//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
-louyang,213,213,3 script Soldier#BA::LouGuide 825,{
+louyang,213,213,3 script Soldier#BA::LouGuide 4_M_CHNSOLDIER,{
mes "[Soldier]";
mes "Welcome to Louyang,";
mes "a city with a long";
@@ -123,9 +123,9 @@ louyang,213,213,3 script Soldier#BA::LouGuide 825,{
close;
}
-louyang,160,175,3 duplicate(LouGuide) Soldier#BB 825
+louyang,160,175,3 duplicate(LouGuide) Soldier#BB 4_M_CHNSOLDIER
-louyang,224,104,3 script Representative#lou 818,{
+louyang,224,104,3 script Representative#lou 4_F_CHNWOMAN,{
mes "[Representative]";
mes "Welcome to Louyang,";
mes "an ancient land with";
diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt
index 52dd77cac..d4b136094 100644
--- a/npc/pre-re/guides/guides_morroc.txt
+++ b/npc/pre-re/guides/guides_morroc.txt
@@ -16,7 +16,7 @@
// -Thanks to $ephiroth.
//============================================================
-morocc,153,286,6 script Guide#moc::MocGuide 707,{
+morocc,153,286,6 script Guide#moc::MocGuide 4_M_MOC_SOLDIER,{
cutin "moc_soldier",2;
mes "[Morroc Guide]";
mes "Welcome to Morroc,";
@@ -159,4 +159,4 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{
end;
}
-morocc,54,97,0 duplicate(MocGuide) Guide#2moc 707
+morocc,54,97,0 duplicate(MocGuide) Guide#2moc 4_M_MOC_SOLDIER
diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt
index a06e1d8fa..b71f35006 100644
--- a/npc/pre-re/guides/guides_moscovia.txt
+++ b/npc/pre-re/guides/guides_moscovia.txt
@@ -11,7 +11,7 @@
//= 1.0 First Version. [Kisuka]
//============================================================
-moscovia,161,76,4 script Moscovia Guide#mosk 959,{
+moscovia,161,76,4 script Moscovia Guide#mosk 4_F_RUSWOMAN1,{
mes "[Moscovia Guide]";
mes "Welcome to Moscovia";
mes "Here is the paradise spreading on";
diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt
index 4eb165199..4c7a9b586 100644
--- a/npc/pre-re/guides/guides_niflheim.txt
+++ b/npc/pre-re/guides/guides_niflheim.txt
@@ -13,7 +13,7 @@
//= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf]
//============================================================
-niflheim,107,156,6 script Roaming Man#nif 798,{
+niflheim,107,156,6 script Roaming Man#nif 4_M_NFMAN,{
mes "[Ricael]";
mes "You must be lost...";
mes "Why would anyone come";
diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt
index 5244fb3b7..4efc96737 100644
--- a/npc/pre-re/guides/guides_payon.txt
+++ b/npc/pre-re/guides/guides_payon.txt
@@ -19,7 +19,7 @@
//= 1.6 Rescripted to official 10.3 standards. [L0ne_W0lf]
//============================================================
-payon,162,67,4 script Guide#pay 708,{
+payon,162,67,4 script Guide#pay 4_M_PAY_SOLDIER,{
cutin "pay_soldier",2;
mes "[Payon Guide]";
mes "Welcome to the";
@@ -188,7 +188,7 @@ payon,162,67,4 script Guide#pay 708,{
end;
}
-pay_arche,85,30,2 script Guide#2pay 708,{
+pay_arche,85,30,2 script Guide#2pay 4_M_PAY_SOLDIER,{
cutin "pay_soldier",2;
mes "[Payon Guide]";
mes "Welcome to the";
diff --git a/npc/pre-re/guides/guides_prontera.txt b/npc/pre-re/guides/guides_prontera.txt
index 68be56b2e..7a97a764c 100644
--- a/npc/pre-re/guides/guides_prontera.txt
+++ b/npc/pre-re/guides/guides_prontera.txt
@@ -21,7 +21,7 @@
// -Thanks to Brainstorm.
//============================================================
-prontera,154,187,4 script Guide#prt::PrtGuide 105,{
+prontera,154,187,4 script Guide#prt::PrtGuide 8W_SOLDIER,{
cutin "prt_soldier",2;
mes "[Prontera Guide]";
mes "Welcome to Prontera,";
@@ -231,10 +231,10 @@ prontera,154,187,4 script Guide#prt::PrtGuide 105,{
end;
}
-prontera,282,208,2 duplicate(PrtGuide) East Gate-Guide 105
+prontera,282,208,2 duplicate(PrtGuide) East Gate-Guide 8W_SOLDIER
-prontera,29,200,6 duplicate(PrtGuide) West Gate-Guide 105
+prontera,29,200,6 duplicate(PrtGuide) West Gate-Guide 8W_SOLDIER
-prontera,160,29,0 duplicate(PrtGuide) South Gate-Guide 105
+prontera,160,29,0 duplicate(PrtGuide) South Gate-Guide 8W_SOLDIER
-prontera,151,330,4 duplicate(PrtGuide) North Gate-Guide 105
+prontera,151,330,4 duplicate(PrtGuide) North Gate-Guide 8W_SOLDIER
diff --git a/npc/pre-re/guides/guides_rachel.txt b/npc/pre-re/guides/guides_rachel.txt
index c78068071..2380a465a 100644
--- a/npc/pre-re/guides/guides_rachel.txt
+++ b/npc/pre-re/guides/guides_rachel.txt
@@ -17,7 +17,7 @@
//= 1.2b Deleted a unnecessary "end". [Samuray22]
//============================================================
-rachel,138,146,5 script Rachel Guide 934,{
+rachel,138,146,5 script Rachel Guide 4_M_RASWORD,{
mes "[Rachel Guide]";
mes "Welcome to the capital of";
mes "Arunafeltz, Rachel where a warm";
diff --git a/npc/pre-re/guides/guides_umbala.txt b/npc/pre-re/guides/guides_umbala.txt
index dee3cf27a..23ce98c29 100644
--- a/npc/pre-re/guides/guides_umbala.txt
+++ b/npc/pre-re/guides/guides_umbala.txt
@@ -15,7 +15,7 @@
//= 1.6 Corrected activating ontouch. [L0ne_W0lf]
//============================================================
-umbala,128,94,4 script Adventurer#um 702,{
+umbala,128,94,4 script Adventurer#um 4_F_GON,{
mes "[Adventurer]";
mes "This is a very strange place...";
mes "It's underdeveloped, and there";
diff --git a/npc/pre-re/guides/guides_veins.txt b/npc/pre-re/guides/guides_veins.txt
index 5d448c635..99df4106e 100644
--- a/npc/pre-re/guides/guides_veins.txt
+++ b/npc/pre-re/guides/guides_veins.txt
@@ -13,7 +13,7 @@
//= 1.2 Fixed a few small typos. [L0ne_W0lf]
//============================================================
-veins,210,345,5 script Veins Guide#1::ve_guide 934,{
+veins,210,345,5 script Veins Guide#1::ve_guide 4_M_RASWORD,{
mes "[Veins Guide]";
mes "Desert City Veins welcomes adventurers seeking shelter from harsh sandstorms.";
mes "If this is the first time for you to use the guide services, why don't you check the...";
@@ -124,4 +124,4 @@ veins,210,345,5 script Veins Guide#1::ve_guide 934,{
close;
}
-veins,189,101,5 duplicate(ve_guide) Veins Guide#2 934
+veins,189,101,5 duplicate(ve_guide) Veins Guide#2 4_M_RASWORD
diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index f69d4556a..2faef7c87 100644
--- a/npc/pre-re/jobs/1-1/acolyte.txt
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -28,7 +28,7 @@
//= 2.2 Fixed an issue with completequest by adding checkquest. [Kisuka]
//============================================================
-prt_church,184,41,4 script Cleric#aco 60,{
+prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{
if (Upper == 1) {
if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) {
if (Class == Job_Novice_High) {
@@ -245,7 +245,7 @@ prt_church,184,41,4 script Cleric#aco 60,{
}
}
-prt_fild03,365,255,2 script Ascetic#aco 89,{
+prt_fild03,365,255,2 script Ascetic#aco 4_M_ORIENT02,{
mes "[Father Rubalkabara]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 6) {
@@ -322,7 +322,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
}
}
-moc_fild07,41,355,4 script Ascetic#2aco 95,{
+moc_fild07,41,355,4 script Ascetic#2aco 4_F_SISTER,{
mes "[Mother Mathilda]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 7) {
@@ -391,7 +391,7 @@ moc_fild07,41,355,4 script Ascetic#2aco 95,{
}
}
-prt_fild00,208,218,6 script Ascetic#3aco 98,{
+prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{
mes "[Father Yosuke]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 8) {
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
index 1b928ff13..d8bb041f9 100644
--- a/npc/pre-re/jobs/1-1/archer.txt
+++ b/npc/pre-re/jobs/1-1/archer.txt
@@ -22,7 +22,7 @@
//= 1.9 Added Quest Log commands. [L0ne_W0lf]
//============================================================
-payon_in02,64,71,4 script Archer Guildsman#archer 85,{
+payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
mes "[Archer Guildsman]";
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index df53e3440..e5f80bd3d 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -23,7 +23,7 @@
//= 2.0 Moved "Dollshoi" and "Ponka-Hontas" NPCs. [Euphy]
//============================================================
-geffen_in,164,124,4 script Mage Guildsman 123,{
+geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{
if (Upper == 1) {
if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) {
if (Class == Job_Novice_High) {
@@ -285,7 +285,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{
}
}
-geffen_in,164,112,4 script Mixing Machine 111,{
+geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
mes "[Mixing Machine]";
mes "This machine is the property of the Geffen Mage Guild and is used only for mixing solutions for magic purposes.";
next;
@@ -599,10 +599,10 @@ geffen_in,164,112,4 script Mixing Machine 111,{
// are also used in the Sage skill quests, and have
// been moved to npc/quests/mage_solution.txt.
//
-// pay_arche,122,100,0 script Dollshoi 88,{}
-// moc_ruins,91,150,0 script Ponka-Hontas 93,{}
+// pay_arche,122,100,0 script Dollshoi 4_M_ORIENT01,{}
+// moc_ruins,91,150,0 script Ponka-Hontas 4_F_04,{}
-geffen_in,177,112,4 script Bookshelf 111,{
+geffen_in,177,112,4 script Bookshelf HIDDEN_NPC,{
mes "[Guide Book]";
mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care.";
next;
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 531c47df3..631e29516 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -28,7 +28,7 @@
//= 2.3 Fixed an issue with completequest by adding checkquest. [Kisuka]
//============================================================
-alberta_in,53,43,6 script Merchant#mer 86,{
+alberta_in,53,43,6 script Merchant#mer 4_M_04,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) {
mes "[Chief Mahnsoo]";
@@ -509,7 +509,7 @@ S_GiveSerial:
return;
}
-alberta_in,28,29,2 script Merchant Guildsman#mer 83,{
+alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
if (BaseJob == Job_Merchant) {
mes "[Union Staff Kay]";
mes "Heya pal.";
@@ -786,7 +786,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 83,{
}
}
-morocc_in,140,102,4 script Student#mer 86,{
+morocc_in,140,102,4 script Student#mer 4_M_04,{
if ((job_merchant_q == 4) || (job_merchant_q == 3)) {
mes "[Dyer's Student]";
mes "You're from";
@@ -871,7 +871,7 @@ morocc_in,140,102,4 script Student#mer 86,{
}
}
-geffen_in,155,122,4 script Guild Staff#mer 47,{
+geffen_in,155,122,4 script Guild Staff#mer 1_M_01,{
if (job_merchant_q == 4 || job_merchant_q == 3) {
mes "[Guild Staff]";
mes "Ah, you must be with the Merchant Guild. Finally, my package has arrived! Alright...!";
@@ -952,7 +952,7 @@ geffen_in,155,122,4 script Guild Staff#mer 47,{
}
}
-prontera,248,42,0 script Kafra Employee#mer 116,{
+prontera,248,42,0 script Kafra Employee#mer 4_F_KAFRA2,{
cutin "kafra_02",2;
if (job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 2 || job_merchant_q2 == 1) {
mes "[Kafra Employee]";
@@ -1070,7 +1070,7 @@ prontera,248,42,0 script Kafra Employee#mer 116,{
}
}
-//izlu2dun,106,58,4 script Kafra Employee#mer 116,{
+//izlu2dun,106,58,4 script Kafra Employee#mer 4_F_KAFRA2,{
function script F_MercKafra {
if ((job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 8 || job_merchant_q2 == 7)) {
mes "[Kafra Employee]";
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
index 0887b2027..8b4a9f974 100644
--- a/npc/pre-re/jobs/1-1/swordman.txt
+++ b/npc/pre-re/jobs/1-1/swordman.txt
@@ -35,7 +35,7 @@
//= 2.3 Added Quest Log commands. [L0ne_W0lf]
//============================================================
-izlude_in,74,172,4 script Swordman#swd_1 119,{
+izlude_in,74,172,4 script Swordman#swd_1 2_M_SWORDMASTER,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
mes "[Swordman]";
@@ -201,7 +201,7 @@ izlude_in,74,172,4 script Swordman#swd_1 119,{
}
}
-izlude_in,62,170,6 script Swordman#swd_2 85,{
+izlude_in,62,170,6 script Swordman#swd_2 4_M_03,{
mes "[Swordman]";
if (BaseJob == Job_Swordman) {
mes "Sorry guy, but I can only allow Novices to enter the Test Hall.";
@@ -233,7 +233,7 @@ izlude_in,62,170,6 script Swordman#swd_2 85,{
}
}
-izlude_in,30,175,4 script Swordman#swd_3 92,{
+izlude_in,30,175,4 script Swordman#swd_3 4_F_03,{
mes "[Swordman]";
mes "I will tell you about the Test! Listen carefully, I won't repeat myself.";
next;
@@ -260,7 +260,7 @@ izlude_in,30,175,4 script Swordman#swd_3 92,{
close;
}
-izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{
+izlude_in,30,163,0 script Test Hall Staff#swd_1 8W_SOLDIER,{
mes "[Test Hall Staff]";
if (BaseJob == Job_Swordman) {
mes "Hm? How did you get inside? You're not supposed to be in here, so please leave now.";
@@ -296,19 +296,19 @@ izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{
// Examination Courses NPCs
//============================================================
// 1-1
-job_sword1,230,245,2 script Medic#swd_1 105,{
+job_sword1,230,245,2 script Medic#swd_1 8W_SOLDIER,{
callfunc "F_JobSwdMedic","1st";
}
-job_sword1,230,242,2 script Test Hall Staff#swd_2 105,{
+job_sword1,230,242,2 script Test Hall Staff#swd_2 8W_SOLDIER,{
callfunc "F_JobSwdStaff",1;
}
-job_sword1,230,207,2 script Medic#2swd_2 105,{
+job_sword1,230,207,2 script Medic#2swd_2 8W_SOLDIER,{
callfunc "F_JobSwdMedic","2nd";
}
-job_sword1,230,204,2 script Test Hall Staff#2swd_3 105,{
+job_sword1,230,204,2 script Test Hall Staff#2swd_3 8W_SOLDIER,{
callfunc "F_JobSwdStaff",1;
}
-job_sword1,223,167,2 script Mae#swd_1_success 92,{
+job_sword1,223,167,2 script Mae#swd_1_success 4_F_03,{
mapannounce "job_sword1","Applicant " + strcharinfo(0) + ". You successfully passed the test.",bc_map;
set job_sword_q,4;
mes "[Mae]";
@@ -368,28 +368,28 @@ OnTouch:
job_sword1,223,243,0 warp checkp1-2#swd_1 1,1,job_sword1,11,206
job_sword1,223,205,0 warp checkp2-3#swd_1 1,1,job_sword1,11,168
-job_sword1,7,245,0 script Test Hall Staff#swd_4 45,1,3,{
+job_sword1,7,245,0 script Test Hall Staff#swd_4 WARPNPC,1,3,{
callfunc "F_JobSwdTestStaff",10,245;
}
-job_sword1,8,207,0 script Test Hall Staff#swd_5 45,1,6,{
+job_sword1,8,207,0 script Test Hall Staff#swd_5 WARPNPC,1,6,{
callfunc "F_JobSwdTestStaff",11,207;
}
-job_sword1,8,169,0 script Test Hall Staff#swd_6 45,1,6,{
+job_sword1,8,169,0 script Test Hall Staff#swd_6 WARPNPC,1,6,{
callfunc "F_JobSwdTestStaff",11,169;
}
-job_sword1,192,244,0 script Test Hall Staff#swd_7 45,1,3,{
+job_sword1,192,244,0 script Test Hall Staff#swd_7 WARPNPC,1,3,{
callfunc "F_JobSwdTestStaff2","1st",215,244;
}
-job_sword1,193,207,0 script Test Hall Staff#swd_8 45,1,3,{
+job_sword1,193,207,0 script Test Hall Staff#swd_8 WARPNPC,1,3,{
callfunc "F_JobSwdTestStaff2","2nd",215,205;
warp "job_sword1",215,205;
}
-job_sword1,193,168,0 script Test Hall Staff#swd_9 45,1,3,{
+job_sword1,193,168,0 script Test Hall Staff#swd_9 WARPNPC,1,3,{
callfunc "F_JobSwdTestStaff2","3rd",215,167;
}
diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt
index e1e34b144..389c257f5 100644
--- a/npc/pre-re/jobs/1-1/thief.txt
+++ b/npc/pre-re/jobs/1-1/thief.txt
@@ -20,7 +20,7 @@
//= 1.8 Added Quest Log commands. [L0ne_W0lf]
//============================================================
-moc_prydb1,39,129,2 script Thief Guide 69,{
+moc_prydb1,39,129,2 script Thief Guide 1_F_04,{
if (Upper == 1) {
if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) {
if (Class == Job_Novice_High) {
@@ -346,7 +346,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{
close;
}
-moc_prydb1,42,133,2 script Comrade 118,{
+moc_prydb1,42,133,2 script Comrade 2_M_THIEFMASTER,{
if (BaseJob == Job_Thief) {
mes "[Brad]";
mes "We don't have any special events yet. Come some other time when there's news, alright?";
@@ -448,7 +448,7 @@ moc_prydb1,42,133,2 script Comrade 118,{
}
}
-moc_ruins,141,125,3 script Mr. Irrelevant 83,{
+moc_ruins,141,125,3 script Mr. Irrelevant 4_M_01,{
if (BaseJob == Job_Thief) {
mes "[Mr. Irrelevant]";
mes "Ah, I see that you are now a Thief. I always knew you'd join us.";
diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt
index 909ba2d88..2f15fa995 100644
--- a/npc/pre-re/jobs/novice/novice.txt
+++ b/npc/pre-re/jobs/novice/novice.txt
@@ -24,21 +24,21 @@
//============================================================
// Bulletin Board
-new_1-1,66,114,4 script Bulletin Board#nv 111,{
+new_1-1,66,114,4 script Bulletin Board#nv HIDDEN_NPC,{
mes "^FF0000=================================^000000";
mes "^FF0000 ^000000 ^E40CAA[Welcome]^CC0000 to ^FF9000Novice^7FFF00 Training ^00FF00Grounds ^E40CAA[Welcome]^FF0000^000000";
mes "^FF0000=================================^000000";
close;
}
-new_1-1,144,116,2 script Guard#nv1 105,{
+new_1-1,144,116,2 script Guard#nv1 8W_SOLDIER,{
mes "[Training Grounds Guard]";
mes "Welcome to the Training Grounds.";
mes "You are now in the outer court yard. Please go inside the castle to begin your training.";
close;
}
-new_1-1,144,107,2 script Guard#nv2 105,{
+new_1-1,144,107,2 script Guard#nv2 8W_SOLDIER,{
mes "[Training Grounds Guard]";
if(rand(2)) {
mes "Come in!";
@@ -60,7 +60,7 @@ new_1-1,144,107,2 script Guard#nv2 105,{
}
// Receptionist
-new_1-2,100,29,4 script Receptionist#nv1 86,{
+new_1-2,100,29,4 script Receptionist#nv1 4_M_04,{
mes "[Training Grounds Receptionist]";
mes "Hello, you look to be new here.";
mes "What is your name?";
@@ -177,7 +177,7 @@ new_1-2,100,29,4 script Receptionist#nv1 86,{
}
}
-new_1-1,53,114,4 script Shion#nv1 727,{
+new_1-1,53,114,4 script Shion#nv1 4_F_JOB_HUNTER,{
if (nov_get_item04 > 9 || nov_get_item05 > 9) {
mes "[Shion]";
mes "Hm...?";
@@ -349,7 +349,7 @@ new_1-1,53,114,4 script Shion#nv1 727,{
}
// Interfaces Tutor
-new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{
+new_1-2,99,105,3 script Interfaces Tutor#nv1 4_M_CRU,{
if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
mes "[Kris]";
mes "You've completed all the essential courses. Have you spoken to the assistant tutors already? The field combat training will be your next course. Would you like to proceed?";
@@ -626,7 +626,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{
}
}
-new_1-2,83,111,3 script Skill Tutor#nv 753,{
+new_1-2,83,111,3 script Skill Tutor#nv 4_M_MONK,{
if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
mes "[Cecil]";
mes "Huh...?";
@@ -883,7 +883,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 753,{
}
}
-new_1-2,115,111,3 script Item Tutor#nv 726,{
+new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{
if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
mes "[Alice]";
mes "Huh...?";
@@ -1231,7 +1231,7 @@ new_1-2,115,111,3 script Item Tutor#nv 726,{
}
}
-new_1-2,118,108,3 script Kafra Employee#nv1 117,{
+new_1-2,118,108,3 script Kafra Employee#nv1 4_F_KAFRA1,{
mes "[Kafra Employee]";
mes "Welcome to";
mes "Kafra Corporation.";
@@ -1530,7 +1530,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{
}
//Interface Assistant
-new_1-2,161,182,5 script Instructor#nv 92,{
+new_1-2,161,182,5 script Instructor#nv 4_F_03,{
mes "[Edwin]";
mes "Welcome to my class.";
mes "Choose the subject you";
@@ -1699,7 +1699,7 @@ new_1-2,161,182,5 script Instructor#nv 92,{
}
}
-new_1-2,182,182,3 script Somatology Instructor 754,{
+new_1-2,182,182,3 script Somatology Instructor 4_M_SAGE_A,{
mes "[Jare Riotte]";
mes "Welcome, new adventurer.";
mes "I, Jare Riotte will help you to learn about the fundamental";
@@ -1890,7 +1890,7 @@ new_1-2,182,182,3 script Somatology Instructor 754,{
}
}
-new_1-2,184,172,1 script Understandings of Skills 47,{
+new_1-2,184,172,1 script Understandings of Skills 1_M_01,{
mes "[Leo Handerson]";
mes "Welcome~";
mes "Oh look at this";
@@ -2150,7 +2150,7 @@ new_1-2,184,172,1 script Understandings of Skills 47,{
}
}
-new_1-2,121,101,2 script Guide Soldier#nv1 105,{
+new_1-2,121,101,2 script Guide Soldier#nv1 8W_SOLDIER,{
mes "[Guide Soldier]";
mes "We Guide Soldiers provide location information at the entrance of every town. You can easily find us by our special uniforms.";
next;
@@ -2163,7 +2163,7 @@ new_1-2,121,101,2 script Guide Soldier#nv1 105,{
close;
}
-new_1-2,17,182,5 script Helper#nv 84,{
+new_1-2,17,182,5 script Helper#nv 4_M_02,{
if (nov_2nd_cos < 11) {
mes "[Elmeen]";
mes "Congratulations!";
@@ -2449,7 +2449,7 @@ new_1-2,17,182,5 script Helper#nv 84,{
}
}
-new_1-2,38,182,3 script Entrance Guard#nv 92,{
+new_1-2,38,182,3 script Entrance Guard#nv 4_F_03,{
if (nov_2nd_cos == 0) {
mes "[Muriel]";
mes "I'm sorry, but I can't let anybody who hasn't been instructed on fighting enter the Field Combat Training Grounds.";
@@ -2617,7 +2617,7 @@ new_1-2,38,182,3 script Entrance Guard#nv 92,{
}
//Teleport NPC
-new_1-3,95,30,4 script Trainer#nv1::NovHoffman 84,{
+new_1-3,95,30,4 script Trainer#nv1::NovHoffman 4_M_02,{
mes "[Hoffman]";
mes "Hey there~";
mes "I'm here to provide";
@@ -2690,12 +2690,12 @@ new_1-3,95,30,4 script Trainer#nv1::NovHoffman 84,{
}
}
-new_2-3,95,30,4 duplicate(NovHoffman) Trainer#nv2 84
-new_3-3,95,30,4 duplicate(NovHoffman) Trainer#nv3 84
-new_4-3,95,30,4 duplicate(NovHoffman) Trainer#nv4 84
-new_5-3,95,30,4 duplicate(NovHoffman) Trainer#nv5 84
+new_2-3,95,30,4 duplicate(NovHoffman) Trainer#nv2 4_M_02
+new_3-3,95,30,4 duplicate(NovHoffman) Trainer#nv3 4_M_02
+new_4-3,95,30,4 duplicate(NovHoffman) Trainer#nv4 4_M_02
+new_5-3,95,30,4 duplicate(NovHoffman) Trainer#nv5 4_M_02
-new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 85,{
+new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 4_M_03,{
mes "[Keyman]";
mes "Good!!";
mes "Now you know how to fight";
@@ -2721,15 +2721,15 @@ new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 85,{
}
}
-new_2-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv2 85
-new_3-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv3 85
-new_4-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv4 85
-new_5-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv5 85
+new_2-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv2 4_M_03
+new_3-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv3 4_M_03
+new_4-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv4 4_M_03
+new_5-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv5 4_M_03
//Potato Merchant
-new_1-2,28,185,4 shop Potato Merchant 90,516:15
+new_1-2,28,185,4 shop Potato Merchant 4_F_01,516:15
-new_1-4,100,29,1 script Hanson#nv 46,{
+new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{
if (checkweight(909,400) == 0) {
mes "[Hanson]";
mes "All of the items you are carrying must be quite a burden. Where did you get so much things? Please lighten your weight by getting rid of things you don't need.";
@@ -3961,7 +3961,7 @@ S_UserJobchoice:
}
//Novice Instructor
-new_1-4,91,22,4 script Bruce#nv 57,{
+new_1-4,91,22,4 script Bruce#nv 1_M_LIBRARYMASTER,{
if (Class == Job_Novice) {
if (nov_3_swordman == 20) {
mes "[Bruce]";
diff --git a/npc/pre-re/kafras/kafras.txt b/npc/pre-re/kafras/kafras.txt
index b5fbbd31e..e900a0fa6 100644
--- a/npc/pre-re/kafras/kafras.txt
+++ b/npc/pre-re/kafras/kafras.txt
@@ -19,4 +19,4 @@
// Izlude
//============================================================
-izlude,134,87,3 duplicate(kaf_izlude) Kafra Employee#iz 117
+izlude,134,87,3 duplicate(kaf_izlude) Kafra Employee#iz 4_F_KAFRA1
diff --git a/npc/pre-re/merchants/ammo_boxes.txt b/npc/pre-re/merchants/ammo_boxes.txt
index 28b220e17..a78adaca6 100644
--- a/npc/pre-re/merchants/ammo_boxes.txt
+++ b/npc/pre-re/merchants/ammo_boxes.txt
@@ -10,4 +10,4 @@
//= 1.0 First version, Pre-Renewal duplicates.
//============================================================
-izlude,171,127,3 duplicate(mdk) Magazine Dealer Kenny#iz 83
+izlude,171,127,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01
diff --git a/npc/pre-re/merchants/ammo_dealer.txt b/npc/pre-re/merchants/ammo_dealer.txt
index 4286121b2..8cf77542b 100644
--- a/npc/pre-re/merchants/ammo_dealer.txt
+++ b/npc/pre-re/merchants/ammo_dealer.txt
@@ -10,4 +10,4 @@
//= 1.0 First version, Pre-Renewal duplicates.
//============================================================
-izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 86
+izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04
diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt
index 60864123d..d303f35b4 100644
--- a/npc/pre-re/merchants/shops.txt
+++ b/npc/pre-re/merchants/shops.txt
@@ -14,9 +14,9 @@
//=======================================================
// Izlude
//=======================================================
-izlude,105,99,0 shop Butcher#iz 54,517:-1
-izlude,94,98,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1
-izlude,105,92,7 shop Vendor from Milk Ranch#i 90,519:-1
-izlude,164,138,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-izlude_in,115,61,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-izlude_in,121,64,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
+izlude,105,99,0 shop Butcher#iz 1_M_JOBGUIDER,517:-1
+izlude,94,98,4 shop Fruit Gardener#iz 1_M_INNKEEPER,512:-1,513:-1,515:-1,516:-1
+izlude,105,92,7 shop Vendor from Milk Ranch#i 4_F_01,519:-1
+izlude,164,138,4 shop Pet Groomer#iz 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,115,61,0 shop Tool Dealer#iz 1_M_01,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_in,121,64,3 shop Trading Merchant#iz 4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
diff --git a/npc/pre-re/other/bulletin_boards.txt b/npc/pre-re/other/bulletin_boards.txt
index d4a50491f..ed2b210c0 100644
--- a/npc/pre-re/other/bulletin_boards.txt
+++ b/npc/pre-re/other/bulletin_boards.txt
@@ -10,7 +10,7 @@
//= 1.0 Moved Izlude NPCs to Pre-RE/RE paths.
//============================================================
-izlude,131,116,4 script Bulletin Board#5 837,{
+izlude,131,116,4 script Bulletin Board#5 2_BULLETIN_BOARD,{
mes "[Izlude: The Satellite City]";
mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accommodate its burgeoning population.";
next;
diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt
index 938c3dfa7..5c382a0e0 100644
--- a/npc/pre-re/other/mercenary_rent.txt
+++ b/npc/pre-re/other/mercenary_rent.txt
@@ -11,5 +11,5 @@
//= 1.0 First version. [Daegaladh]
//============================================================
-izlude,47,139,5 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 734
-izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892
+izlude,47,139,5 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 4_M_JOB_KNIGHT2
+izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 4_F_HUGRANMA
diff --git a/npc/pre-re/other/msg_boards.txt b/npc/pre-re/other/msg_boards.txt
index 01c10e265..60c7133f0 100644
--- a/npc/pre-re/other/msg_boards.txt
+++ b/npc/pre-re/other/msg_boards.txt
@@ -13,13 +13,13 @@
// Izlude
//============================================================
-izlude,54,139,1 script Sign#Iz1 111,{
+izlude,54,139,1 script Sign#Iz1 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Welcome to the Swordsman Academy.";
close;
}
-izlude,144,148,1 script Sign#Iz2 111,{
+izlude,144,148,1 script Sign#Iz2 HIDDEN_NPC,{
mes "^993300- The Sign Reads -^000000";
mes "Welcome.";
close;
diff --git a/npc/pre-re/other/pvp.txt b/npc/pre-re/other/pvp.txt
index de49cfdc3..55d6bae79 100644
--- a/npc/pre-re/other/pvp.txt
+++ b/npc/pre-re/other/pvp.txt
@@ -13,7 +13,7 @@
// PVP Warpers
//============================================================
-pvp_y_room,86,85,4 script Fight Square Reception#8 105,{
+pvp_y_room,86,85,4 script Fight Square Reception#8 8W_SOLDIER,{
callfunc "F_PVP_FSRS";
end;
@@ -22,7 +22,7 @@ OnInit:
end;
}
-pvp_n_room,30,85,4 script Fight Square Reception#n 105,{
+pvp_n_room,30,85,4 script Fight Square Reception#n 8W_SOLDIER,{
callfunc "F_PVP_FSRS";
end;
diff --git a/npc/pre-re/other/resetskill.txt b/npc/pre-re/other/resetskill.txt
index 698b89e51..b7af66906 100644
--- a/npc/pre-re/other/resetskill.txt
+++ b/npc/pre-re/other/resetskill.txt
@@ -13,7 +13,7 @@
//= 1.0 First version. [L0ne_W0lf]
//============================================================
-prontera,146,232,4 script Hypnotist#2 124,{
+prontera,146,232,4 script Hypnotist#2 4_F_TELEPORTER,{
mes "[Hypnotist]";
mes "Greetings, adventurer.";
mes "I'm a member of the Hypnotist";
diff --git a/npc/pre-re/other/turbo_track.txt b/npc/pre-re/other/turbo_track.txt
index 24ebea721..ec670fbad 100644
--- a/npc/pre-re/other/turbo_track.txt
+++ b/npc/pre-re/other/turbo_track.txt
@@ -11,4 +11,4 @@
//= 1.0 Split Peco Peco Manager NPC.
//============================================================
-alde_gld,181,199,5 duplicate(MountManager_turbo) Peco Peco Manager 845
+alde_gld,181,199,5 duplicate(MountManager_turbo) Peco Peco Manager 4_F_RACING
diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt
index 678d93ee3..79c121ba5 100644
--- a/npc/pre-re/quests/collection/quest_alligator.txt
+++ b/npc/pre-re/quests/collection/quest_alligator.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-cmd_fild01,362,256,3 script Cuir#Gator_Hunt 106,{
+cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{
if (checkquest(60119) != -1) {
if (checkquest(60119,HUNTING) != 2 ) {
mes "[Cuir]";
diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt
index 10020be11..6815c62e1 100644
--- a/npc/pre-re/quests/collection/quest_caramel.txt
+++ b/npc/pre-re/quests/collection/quest_caramel.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 95,{
+mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{
if (checkquest(60116) != -1) {
if (checkquest(60116,HUNTING) != 2 ) {
mes "[Yullo]";
diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt
index e30ea5a6a..7ba4cab02 100644
--- a/npc/pre-re/quests/collection/quest_coco.txt
+++ b/npc/pre-re/quests/collection/quest_coco.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-mjolnir_01,293,20,3 script Nutters#Coco_Hunt 779,{
+mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{
if (checkquest(60113) != -1) {
if (checkquest(60113,HUNTING) != 2 ) {
mes "[Nutters]";
diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt
index de9cb68c7..ecdb6b0fb 100644
--- a/npc/pre-re/quests/collection/quest_creamy.txt
+++ b/npc/pre-re/quests/collection/quest_creamy.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-prt_fild04,356,148,3 script Laertes#Creamy_Hunt 798,{
+prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{
if (checkquest(60122) != -1) {
if (checkquest(60122,HUNTING) != 2 ) {
mes "[Laertes]";
diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt
index 1742d9618..242e7bca2 100644
--- a/npc/pre-re/quests/collection/quest_demonpungus.txt
+++ b/npc/pre-re/quests/collection/quest_demonpungus.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-ein_fild01,43,249,0 script Local Villager#hunt 898,{
+ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{
if (checkquest(60125) != -1) {
if (checkquest(60125,HUNTING) != 2 ) {
mes "[Local Villager]";
diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt
index 1b6f37e28..35d48aef7 100644
--- a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt
+++ b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt
@@ -11,7 +11,7 @@
//= 1.0 First version.
//============================================================
-nif_fild02,332,327,4 script Deadman 795,{
+nif_fild02,332,327,4 script Deadman 4_M_NFDEADMAN,{
if (checkquest(60173) != -1) {
if (checkquest(60173,HUNTING) != 2 ) {
diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt
index 8648d6c8c..62f0ed45d 100644
--- a/npc/pre-re/quests/collection/quest_dokebi.txt
+++ b/npc/pre-re/quests/collection/quest_dokebi.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-pay_fild10,108,357,5 script Li#Dokebi_Hunt 90,{
+pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{
if (checkquest(60128) != -1) {
if (checkquest(60128,HUNTING) != 2 ) {
mes "[Li]";
diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt
index fe46a3118..552a1096f 100644
--- a/npc/pre-re/quests/collection/quest_dryad.txt
+++ b/npc/pre-re/quests/collection/quest_dryad.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-um_fild01,34,281,5 script Lilla#Dryad_Hunt 724,{
+um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{
if (checkquest(60131) != -1) {
if (checkquest(60131,HUNTING) != 2 ) {
mes "[Lilla]";
diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt
index 8687872ad..bd11cf8ae 100644
--- a/npc/pre-re/quests/collection/quest_fabre.txt
+++ b/npc/pre-re/quests/collection/quest_fabre.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-gef_fild07,321,193,4 script Langry#Fabre_Hunt 754,{
+gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{
if (checkquest(60107) != -1) {
if (checkquest(60107,HUNTING) != 2 ) {
mes "[Langry]";
diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt
index 8acaee3ae..5c9321aa6 100644
--- a/npc/pre-re/quests/collection/quest_frilldora.txt
+++ b/npc/pre-re/quests/collection/quest_frilldora.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 725,{
+moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{
if (checkquest(60134) != -1) {
if (checkquest(60134,HUNTING) != 2 ) {
mes "[Lemly]";
diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt
index 628b3e26f..292a38459 100644
--- a/npc/pre-re/quests/collection/quest_goat.txt
+++ b/npc/pre-re/quests/collection/quest_goat.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-ein_fild06,82,171,0 script Vegetable Farmer#Goat 919,{
+ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{
if (checkquest(60137) != -1) {
if (checkquest(60137,HUNTING) != 2 ) {
mes "[Vegetable Farmer]";
diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt
index 41142aaaf..2c927ea40 100644
--- a/npc/pre-re/quests/collection/quest_golem.txt
+++ b/npc/pre-re/quests/collection/quest_golem.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-moc_fild11,57,138,0 script Private Jeremy#hunt 707,{
+moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{
if (checkquest(60140) != -1) {
if (checkquest(60140,HUNTING) != 2 ) {
mes "[Private Jeremy]";
diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt
index 6b5a25050..c534448d4 100644
--- a/npc/pre-re/quests/collection/quest_hode.txt
+++ b/npc/pre-re/quests/collection/quest_hode.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-moc_fild17,208,346,5 script Shone#Hode_Hunt 707,{
+moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{
if (checkquest(60104) != -1) {
if (checkquest(60104,HUNTING) != 2 ) {
mes "[Shone]";
diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt
index 72e17f4f0..185ff2067 100644
--- a/npc/pre-re/quests/collection/quest_leafcat.txt
+++ b/npc/pre-re/quests/collection/quest_leafcat.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 877,{
+ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{
if (checkquest(60143) != -1) {
if (checkquest(60143,HUNTING) != 2 ) {
mes "[Lella]";
diff --git a/npc/pre-re/quests/collection/quest_mantis.txt b/npc/pre-re/quests/collection/quest_mantis.txt
index ab540e005..3eb18ca4f 100644
--- a/npc/pre-re/quests/collection/quest_mantis.txt
+++ b/npc/pre-re/quests/collection/quest_mantis.txt
@@ -11,7 +11,7 @@
//= 1.0 First version.
//============================================================
-lou_fild01,240,354,4 script Mantis Researcher 878,{
+lou_fild01,240,354,4 script Mantis Researcher 4_M_OILMAN,{
if (checkquest(60179) != -1) {
if (checkquest(60179,HUNTING) != 2 ) {
diff --git a/npc/pre-re/quests/collection/quest_pecopeco.txt b/npc/pre-re/quests/collection/quest_pecopeco.txt
index 6befd6076..3460320ce 100644
--- a/npc/pre-re/quests/collection/quest_pecopeco.txt
+++ b/npc/pre-re/quests/collection/quest_pecopeco.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 97,{
+moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{
if (checkquest(60101) != -1) {
if (checkquest(60101,HUNTING) != 2 ) {
mes "[Gregor]";
diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt
index 607137cfe..64aafe42f 100644
--- a/npc/pre-re/quests/collection/quest_pupa.txt
+++ b/npc/pre-re/quests/collection/quest_pupa.txt
@@ -12,7 +12,7 @@
//= 1.0 First version.
//============================================================
-gef_fild04,191,54,3 script Halgus#Pupa_Hunt 123,{
+gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{
if (checkquest(60110) != -1) {
if (checkquest(60110,HUNTING) != 2 ) {
mes "[Halgus]";
diff --git a/npc/pre-re/quests/collection/quest_zhupolong.txt b/npc/pre-re/quests/collection/quest_zhupolong.txt
index b5a6360bf..a167ec3e5 100644
--- a/npc/pre-re/quests/collection/quest_zhupolong.txt
+++ b/npc/pre-re/quests/collection/quest_zhupolong.txt
@@ -11,7 +11,7 @@
//= 1.0 First version.
//============================================================
-lou_dun02,161,264,4 script Dragon Hunter 732,{
+lou_dun02,161,264,4 script Dragon Hunter 4_M_JOB_HUNTER,{
if (checkquest(60182) != -1) {
if (checkquest(60182,HUNTING) != 2 ) {
diff --git a/npc/pre-re/quests/first_class/tu_archer.txt b/npc/pre-re/quests/first_class/tu_archer.txt
index 8686b5483..5f53d0385 100644
--- a/npc/pre-re/quests/first_class/tu_archer.txt
+++ b/npc/pre-re/quests/first_class/tu_archer.txt
@@ -11,4 +11,4 @@
//= 1.0 First version. [Euphy]
//============================================================
-mjolnir_11,27,223,3 duplicate(Acolyte_Tu) Acolyte#tu 95
+mjolnir_11,27,223,3 duplicate(Acolyte_Tu) Acolyte#tu 4_F_SISTER
diff --git a/npc/pre-re/quests/monstertamers.txt b/npc/pre-re/quests/monstertamers.txt
index 594a8ed8e..6d998fdbf 100644
--- a/npc/pre-re/quests/monstertamers.txt
+++ b/npc/pre-re/quests/monstertamers.txt
@@ -10,4 +10,4 @@
//= 1.0 Moved Izlude NPC to pre-re/re paths.
//============================================================
-izlude_in,129,64,4 duplicate(MonsterTamer_izlude) Monster Tamer#izu 125
+izlude_in,129,64,4 duplicate(MonsterTamer_izlude) Monster Tamer#izu 4_M_TELEPORTER
diff --git a/npc/pre-re/quests/mrsmile.txt b/npc/pre-re/quests/mrsmile.txt
index 8b304070d..525221af9 100644
--- a/npc/pre-re/quests/mrsmile.txt
+++ b/npc/pre-re/quests/mrsmile.txt
@@ -11,4 +11,4 @@
//= 1.0 First version.
//============================================================
-izlude,129,118,4 duplicate(SmileHelper) Smile Assistance#iz 92
+izlude,129,118,4 duplicate(SmileHelper) Smile Assistance#iz 4_F_03
diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt
index 8effb510b..ec291e16e 100644
--- a/npc/pre-re/quests/quests_13_1.txt
+++ b/npc/pre-re/quests/quests_13_1.txt
@@ -10,4 +10,4 @@
//= 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy]
//============================================================
-izlude,101,173,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 100
+izlude,101,173,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 4W_SAILOR
diff --git a/npc/pre-re/quests/quests_izlude.txt b/npc/pre-re/quests/quests_izlude.txt
index 2b12066db..aac9f5467 100644
--- a/npc/pre-re/quests/quests_izlude.txt
+++ b/npc/pre-re/quests/quests_izlude.txt
@@ -10,4 +10,4 @@
//= 1.0 First version.
//============================================================
-izlude,182,186,2 duplicate(Edgar_izlude) Edgar#izlude 49
+izlude,182,186,2 duplicate(Edgar_izlude) Edgar#izlude 1_M_03
diff --git a/npc/pre-re/quests/quests_lighthalzen.txt b/npc/pre-re/quests/quests_lighthalzen.txt
index 708045ab1..c9365857a 100644
--- a/npc/pre-re/quests/quests_lighthalzen.txt
+++ b/npc/pre-re/quests/quests_lighthalzen.txt
@@ -10,4 +10,4 @@
//= 1.0 First version.
//============================================================
-izlude,186,57,5 duplicate(Scamp) Scamp#iz 853
+izlude,186,57,5 duplicate(Scamp) Scamp#iz 4_M_YURI
diff --git a/npc/pre-re/quests/quests_nameless.txt b/npc/pre-re/quests/quests_nameless.txt
index fa56dfbd2..77654e084 100644
--- a/npc/pre-re/quests/quests_nameless.txt
+++ b/npc/pre-re/quests/quests_nameless.txt
@@ -12,4 +12,4 @@
//= 1.0 Moved Dorian to pre-re/re paths.
//============================================================
-izlude_in,110,64,3 duplicate(Dorian_izlude) Dorian 878,2,2
+izlude_in,110,64,3 duplicate(Dorian_izlude) Dorian 4_M_OILMAN,2,2
diff --git a/npc/pre-re/quests/quests_veins.txt b/npc/pre-re/quests/quests_veins.txt
index 64c4cd3b3..23262d482 100644
--- a/npc/pre-re/quests/quests_veins.txt
+++ b/npc/pre-re/quests/quests_veins.txt
@@ -10,4 +10,4 @@
//= 1.0 First version.
//============================================================
-ve_fild05,257,130,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 945
+ve_fild05,257,130,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 4_M_DST_GRAND
diff --git a/npc/pre-re/warps/fields/morroc_fild.txt b/npc/pre-re/warps/fields/morroc_fild.txt
index 1e8fa0fa5..c79538814 100644
--- a/npc/pre-re/warps/fields/morroc_fild.txt
+++ b/npc/pre-re/warps/fields/morroc_fild.txt
@@ -41,7 +41,7 @@ moc_fild03,70,341,0 warp mocf04-1 5,2,moc_fild02,332,23
//moc_fild04,14,98,0 warp mocf07 1,11,moc_fild05,378,119
//moc_fild04,175,18,0 warp mocf08 3,2,moc_fild08,170,380
//moc_fild04,19,206,0 warp mocf09 3,15,moc_fild05,373,208
-//moc_fild04,219,327,0 script mocf016 45,3,4,{ set @anthell,0; warp "anthell01",35,262; }
+//moc_fild04,219,327,0 script mocf016 WARPNPC,3,4,{ set @anthell,0; warp "anthell01",35,262; }
//moc_fild04,292,381,0 warp mocf01-2 10,1,moc_fild01,76,25
//moc_fild04,314,381,0 warp mocf01-3 10,1,moc_fild01,76,25
//moc_fild04,336,381,0 warp mocf01-4 10,1,moc_fild01,76,25
@@ -94,7 +94,7 @@ moc_fild13,308,49,0 warp mocf06-1 2,4,moc_fild03,20,37
//moc_fild14,196,382,0 warp mocf16-1 4,2,moc_fild08,204,19
//moc_fild15,104,16,0 warp mocf26 9,2,moc_fild16,125,380
//moc_fild15,158,363,0 warp mocf18-1 6,2,moc_fild09,126,23
-//moc_fild15,258,253,0 script mocf017 45,3,3,{ set @anthell,1; warp "anthell01",35,262; }
+//moc_fild15,258,253,0 script mocf017 WARPNPC,3,3,{ set @anthell,1; warp "anthell01",35,262; }
//moc_fild15,348,18,0 warp mocf27 5,2,moc_fild16,334,379
//moc_fild15,367,276,0 warp mocf25-1 2,4,moc_fild14,19,278
//moc_fild15,38,105,0 warp mocf23-1 2,4,moc_fild11,376,197
diff --git a/npc/pre-re/warps/fields/veins_fild.txt b/npc/pre-re/warps/fields/veins_fild.txt
index ca93a2266..0bb03797b 100644
--- a/npc/pre-re/warps/fields/veins_fild.txt
+++ b/npc/pre-re/warps/fields/veins_fild.txt
@@ -28,7 +28,7 @@ ve_fild04,115,50,0 warp ve_fild4-3 1,1,ve_fild06,80,183
ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48
ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183
ve_fild06,153,220,0 warp ve_fild6-1 1,1,veins,218,355
-ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{
+ve_fild06,81,177,0 script ve_fild6-2 WARPNPC,1,1,{
if (rand(2))
warp "ve_fild04",115,55;
else
diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt
index 981d33cb5..f429e46e6 100644
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -27,7 +27,7 @@
//= 1.5 Updated RE/Pre-RE EXP. [Euphy]
//============================================================
-geffen,132,38,3 script Bard#2 51,{
+geffen,132,38,3 script Bard#2 1_M_BARD,{
if (bard_q > 5) set gef_bard_q,bard_q;
set @name$,strcharinfo(0);
if (gef_bard_q > 29) {
@@ -1365,7 +1365,7 @@ S_StorySong:
}
}
-morocc,134,111,3 script Bard#3 741,{
+morocc,134,111,3 script Bard#3 2_M_BARD_ORIENT,{
set @name$,strcharinfo(0);
if (gef_bard_q == 31) {
mes "[Kino Kitty]";
@@ -2064,7 +2064,7 @@ morocc,134,111,3 script Bard#3 741,{
}
}
-morocc,132,111,3 script Little Girl#Jorti 703,{
+morocc,132,111,3 script Little Girl#Jorti 4_F_KID2,{
if (gef_bard_q > 9 && gef_bard_q < 30) {
mes "[Jorti]";
mes "Jorti tries not to cry anymore because it hurts Uncle Kino and then he coughs up more blood.";
@@ -2130,7 +2130,7 @@ morocc,132,111,3 script Little Girl#Jorti 703,{
}
}
-yuno_in01,172,100,3 script Old Man#bq1 712,{
+yuno_in01,172,100,3 script Old Man#bq1 4_M_05,{
if (gef_bard_q > 11 && gef_bard_q < 20) {
mes "[Sketzi Bundin]";
mes "Well, did you find what you were seeking for? Although all we have are old, dusty books, I hope you come by to visit. And please give my regards to your Bard friends.";
@@ -2193,7 +2193,7 @@ yuno_in01,172,100,3 script Old Man#bq1 712,{
}
}
-yuno_in01,163,101,0 script Old Book#bq 111,{
+yuno_in01,163,101,0 script Old Book#bq HIDDEN_NPC,{
set @name$,strcharinfo(0);
if ((gef_bard_q > 11) && (gef_bard_q < 14)) {
if (!rand(5)) {
@@ -2249,7 +2249,7 @@ yuno_in01,163,101,0 script Old Book#bq 111,{
}
-yuno_in01,173,96,0 script Luke's Songs Vol.1 111,{
+yuno_in01,173,96,0 script Luke's Songs Vol.1 HIDDEN_NPC,{
if (gef_bard_q > 11) {
mes "[Preface]";
mes "I, Luke of Izlude, greatest of Bards in my time, leave the lyrics of my essential songs for posterity.";
@@ -2355,7 +2355,7 @@ yuno_in01,173,96,0 script Luke's Songs Vol.1 111,{
}
}
-yuno_in01,173,94,0 script Battle Songs 111,{
+yuno_in01,173,94,0 script Battle Songs HIDDEN_NPC,{
if (gef_bard_q > 11) {
mes "[Drumming in the battlefield]";
mes "This song was written to give courage to soldiers on the battlefield.";
@@ -2400,7 +2400,7 @@ yuno_in01,173,94,0 script Battle Songs 111,{
}
-yuno_in01,173,92,0 script Apple of Idun 111,{
+yuno_in01,173,92,0 script Apple of Idun HIDDEN_NPC,{
if (gef_bard_q > 11) {
mes "[Apple of Idun]";
mes "This song praises the golden apples of the goddess Idun. These were the source of the God's power, as it prevented them from growing old.";
@@ -2465,7 +2465,7 @@ yuno_in01,173,92,0 script Apple of Idun 111,{
}
}
-payon,181,172,3 script Bard#4 51,{
+payon,181,172,3 script Bard#4 1_M_BARD,{
set @name$,strcharinfo(0);
if (gef_bard_q == 2 || gef_bard_q == 22) {
mes "[Gunther Doubleharmony]";
@@ -2764,7 +2764,7 @@ payon,181,172,3 script Bard#4 51,{
}
-yuno_in04,20,123,7 script Representative#bq 95,{
+yuno_in04,20,123,7 script Representative#bq 4_F_SISTER,{
//set @check = GetGlobalVar "040708_god2"
mes "[Marlin Putiur]";
if (god_brising == 3) {
@@ -2892,7 +2892,7 @@ yuno_in04,20,123,7 script Representative#bq 95,{
}
}
-yuno_in04,33,119,3 script Adventurer#1 828,{
+yuno_in04,33,119,3 script Adventurer#1 4_M_ROGUE,{
mes "...";
next;
mes "...";
diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt
index 852f93619..5effd046a 100644
--- a/npc/quests/bunnyband.txt
+++ b/npc/quests/bunnyband.txt
@@ -14,7 +14,7 @@
//= 1.6 Cleaning. [Euphy]
//============================================================
-alberta,26,229,0 script Kafra Employee#bunny 83,{
+alberta,26,229,0 script Kafra Employee#bunny 4_M_01,{
if (BUNYBND == 1) {
mes "[Kafra Employee]";
mes "Hello there~!";
diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index 1b94ab8ea..8242bcc96 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -27,7 +27,7 @@
//= 1.8a Minor cleaning. [Euphy]
//============================================================
-prt_castle,43,30,3 script Charles Orleans#cook 878,{
+prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
if (MaxWeight - Weight < 2000) {
mes "[Charles Orleans]";
mes "Just one second.";
@@ -1478,7 +1478,7 @@ L_End:
end;
}
-prt_castle,45,35,5 script Madeleine Chu#cook 886,{
+prt_castle,45,35,5 script Madeleine Chu#cook 4_COOK,{
if (MaxWeight - Weight < 2000) {
mes "[Madeleine Chu]";
mes "I'm sorry, but right now";
@@ -2117,7 +2117,7 @@ S_SellSets:
return;
}
-prt_castle,45,28,3 script Child with Cat#cook 877,{
+prt_castle,45,28,3 script Child with Cat#cook 4_F_YUNYANG,{
set .@nyu,rand(1,2);
if (.@nyu == 1) {
cutin "nyuang_1",2;
@@ -2140,7 +2140,7 @@ prt_castle,45,28,3 script Child with Cat#cook 877,{
end;
}
-prt_castle,44,30,5 script Wickebine#cook 725,{
+prt_castle,44,30,5 script Wickebine#cook 4_F_JOB_ASSASSIN,{
disablenpc "Wickebine#cook";
end;
@@ -2157,7 +2157,7 @@ OnDisable:
end;
}
-payon,209,127,3 script Servant 88,{
+payon,209,127,3 script Servant 4_M_ORIENT01,{
if (!checkweight(555,1)) {
mes "[Chulsoo]";
mes "Hold on, you're carrying";
diff --git a/npc/quests/counteragent_mixture.txt b/npc/quests/counteragent_mixture.txt
index dc54d625a..9d5b82ae4 100644
--- a/npc/quests/counteragent_mixture.txt
+++ b/npc/quests/counteragent_mixture.txt
@@ -14,7 +14,7 @@
//= 2.2b Follow up fixes to bugreport:1122 [L0ne_W0lf]
//============================================================
-alberta_in,133,55,3 script Louitz#cm 84,{
+alberta_in,133,55,3 script Louitz#cm 4_M_02,{
if (molgenstain == 2) {
mes "[Merchant Louitz]";
mes "Oh, it's you again.";
@@ -303,7 +303,7 @@ alberta_in,133,55,3 script Louitz#cm 84,{
close;
}
-geffen,181,114,3 script Aure Dupon#cm 82,{
+geffen,181,114,3 script Aure Dupon#cm 4_KID01,{
if (molgenstain == 2) {
mes "[Aure Dupon]";
mes "It seems that our";
@@ -392,7 +392,7 @@ geffen,181,114,3 script Aure Dupon#cm 82,{
close;
}
-geffen_in,141,140,3 script Molgenstein#cm 121,{
+geffen_in,141,140,3 script Molgenstein#cm 2_M_MOLGENSTEIN,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
diff --git a/npc/quests/dandelion_request.txt b/npc/quests/dandelion_request.txt
index a5c7f0149..47d9964f7 100644
--- a/npc/quests/dandelion_request.txt
+++ b/npc/quests/dandelion_request.txt
@@ -12,7 +12,7 @@
//= 1.3 Added GM management function. [Euphy]
//============================================================
-izlude,103,106,3 script Guildsman#1 48,3,3,{
+izlude,103,106,3 script Guildsman#1 1_M_02,3,3,{
if(checkweight(7416,1) != 1)
{
@@ -442,7 +442,7 @@ OnTouch:
}
}
-prontera,237,313,3 script Nun#moc 79,3,3,{
+prontera,237,313,3 script Nun#moc 1_F_PRIEST,3,3,{
if(checkweight(7416,1) != 1)
{
@@ -637,7 +637,7 @@ OnTouch:
}
}
-alberta,129,59,3 script Guildsman#2 49,3,3,{
+alberta,129,59,3 script Guildsman#2 1_M_03,3,3,{
if(checkweight(7416,1) != 1)
{
@@ -1172,7 +1172,7 @@ OnTouch:
}
}
-geffen,123,109,3 script Academy Staff 742,3,3,{
+geffen,123,109,3 script Academy Staff 2_M_SAGE_B,3,3,{
if(checkweight(7416,1) != 1)
{
@@ -1332,7 +1332,7 @@ OnTouch:
}
}
-morocc,155,56,3 script Miya 93,3,3,{
+morocc,155,56,3 script Miya 4_F_04,3,3,{
if(checkweight(7416,1) != 1)
{
@@ -1621,7 +1621,7 @@ OnTouch:
}
}
-payon,231,323,3 script Guildsman#3 59,3,3,{
+payon,231,323,3 script Guildsman#3 1_M_ORIENT01,3,3,{
if(checkweight(7416,1) != 1)
{
@@ -2080,7 +2080,7 @@ OnTouch:
}
}
-morocc,43,108,5 script Sharp-Looking Kid 82,{
+morocc,43,108,5 script Sharp-Looking Kid 4_KID01,{
if((Class == Job_Assassin) || (Class == Job_Assassin_Cross))
{
@@ -2156,7 +2156,7 @@ morocc,43,108,5 script Sharp-Looking Kid 82,{
}
}
-morocc,45,110,1 script #maobar1 45,2,2,{
+morocc,45,110,1 script #maobar1 WARPNPC,2,2,{
OnTouch:
if(mao_request || Class == Job_Assassin || Class == Job_Assassin_Cross) warp "que_job01",9,94;
@@ -2228,28 +2228,28 @@ OnTouch:
}
}
-que_job01,6,94,1 script #maobar2 45,2,2,{
+que_job01,6,94,1 script #maobar2 WARPNPC,2,2,{
OnTouch:
warp "morocc",45,103;
end;
}
-que_job01,17,48,1 script #maobar3 45,2,2,{
+que_job01,17,48,1 script #maobar3 WARPNPC,2,2,{
OnTouch:
warp "que_job01",68,92;
end;
}
-que_job01,68,96,1 script #maobar4 45,2,2,{
+que_job01,68,96,1 script #maobar4 WARPNPC,2,2,{
OnTouch:
warp "que_job01",17,53;
end;
}
-que_job01,80,77,1 script #maobar5 45,2,2,{
+que_job01,80,77,1 script #maobar5 WARPNPC,2,2,{
OnTouch:
if(mao_request > 1) warp "que_job01",61,50;
@@ -2360,14 +2360,14 @@ OnTouch:
}
}
-que_job01,65,50,1 script #maobar4-2 45,2,2,{
+que_job01,65,50,1 script #maobar4-2 WARPNPC,2,2,{
OnTouch:
warp "que_job01",84,77;
end;
}
-que_job01,81,79,5 script Idle Knight 733,{
+que_job01,81,79,5 script Idle Knight 4_M_JOB_KNIGHT1,{
mes "[Litheron]";
mes "What's the matter?";
@@ -2387,7 +2387,7 @@ que_job01,81,79,5 script Idle Knight 733,{
close;
}
-que_job01,82,95,3 script Bar Master 46,{
+que_job01,82,95,3 script Bar Master 1_ETC_01,{
if(checkweight(12112,1) != 1)
{
@@ -2667,7 +2667,7 @@ que_job01,82,95,3 script Bar Master 46,{
}
}
-que_job01,49,49,5 script Tao 877,{
+que_job01,49,49,5 script Tao 4_F_YUNYANG,{
if(mao_request == 28 || mao_request == 29 || mao_request == 126 || mao_request == 127)
{
@@ -2722,7 +2722,7 @@ que_job01,49,49,5 script Tao 877,{
}
}
-que_job01,51,55,1 script #roombar1 45,1,1,{
+que_job01,51,55,1 script #roombar1 WARPNPC,1,1,{
OnTouch:
if(mao_request == 2 || mao_request == 24 || mao_request == 28 || mao_request == 29 || mao_request == 123 || mao_request == 126 || mao_request == 127 || prt_curse == 24)
@@ -2825,7 +2825,7 @@ OnTimer250000:
end;
}
-que_job01,12,13,1 script #maobar6 139,1,1,{
+que_job01,12,13,1 script #maobar6 HIDDEN_WARP_NPC,1,1,{
OnInit:
disablenpc "#maobar7";
@@ -2840,7 +2840,7 @@ OnTouch:
end;
}
-que_job01,51,44,1 script #roombar2 45,1,1,{
+que_job01,51,44,1 script #roombar2 WARPNPC,1,1,{
OnTouch:
if(mao_request == 25 || (mao_request > 102 && mao_request < 123))
@@ -2954,7 +2954,7 @@ OnTimer250000:
end;
}
-que_job01,80,17,1 script #maobar7 45,1,1,{
+que_job01,80,17,1 script #maobar7 WARPNPC,1,1,{
OnInit:
disablenpc "#maobar7";
@@ -2969,7 +2969,7 @@ OnTouch:
end;
}
-que_job01,144,51,1 script #maobar8 45,1,1,{
+que_job01,144,51,1 script #maobar8 WARPNPC,1,1,{
OnInit:
disablenpc "#maobar8";
@@ -2984,7 +2984,7 @@ OnTouch:
end;
}
-que_job01,11,4,1 script #maoexit1 45,1,1,{
+que_job01,11,4,1 script #maoexit1 WARPNPC,1,1,{
OnTouch:
warp "que_job01",52,50;
@@ -2992,7 +2992,7 @@ OnTouch:
end;
}
-que_job01,80,27,1 script #maoexit2 45,1,1,{
+que_job01,80,27,1 script #maoexit2 WARPNPC,1,1,{
OnTouch:
warp "que_job01",52,50;
@@ -3000,7 +3000,7 @@ OnTouch:
end;
}
-que_job01,144,61,1 script #maoexit3 45,1,1,{
+que_job01,144,61,1 script #maoexit3 WARPNPC,1,1,{
OnTouch:
warp "que_job01",52,50;
@@ -3008,7 +3008,7 @@ OnTouch:
end;
}
-que_job01,16,21,5 script Valdes#1 55,{
+que_job01,16,21,5 script Valdes#1 1_M_JOBTESTER,{
if(checkweight(7417,1) != 1)
{
@@ -3500,7 +3500,7 @@ OnEnter:
end;
}
-que_job01,17,11,3 script Valdes#2 55,{
+que_job01,17,11,3 script Valdes#2 1_M_JOBTESTER,{
OnInit:
disablenpc "Valdes#2";
@@ -3511,7 +3511,7 @@ OnEnter:
end;
}
-que_job01,142,56,5 script Valdes#3 55,{
+que_job01,142,56,5 script Valdes#3 1_M_JOBTESTER,{
OnInit:
disablenpc "Valdes#3";
@@ -3522,7 +3522,7 @@ OnEnter:
end;
}
-que_job01,19,18,3 script Lin#1 885,{
+que_job01,19,18,3 script Lin#1 4_F_ACROSS,{
cutin "mocseal_rin01.bmp",2;
if (mao_request < 3)
@@ -3593,7 +3593,7 @@ OnEnter:
end;
}
-que_job01,13,9,7 script Lin#2 885,{
+que_job01,13,9,7 script Lin#2 4_F_ACROSS,{
OnInit:
disablenpc "Lin#2";
@@ -3604,7 +3604,7 @@ OnEnter:
end;
}
-que_job01,84,17,3 script Lin#2-1 885,{
+que_job01,84,17,3 script Lin#2-1 4_F_ACROSS,{
if (mao_request == 103)
{
@@ -4143,7 +4143,7 @@ que_job01,84,17,3 script Lin#2-1 885,{
end;
}
-que_job01,79,15,1 script R 880,{
+que_job01,79,15,1 script R 4_M_MASKMAN,{
if(mao_request == 103)
{
@@ -4588,7 +4588,7 @@ que_job01,79,15,1 script R 880,{
end;
}
-que_job01,147,54,3 script Lin#3 885,{
+que_job01,147,54,3 script Lin#3 4_F_ACROSS,{
OnInit:
disablenpc "Lin#3";
@@ -4599,7 +4599,7 @@ OnEnter:
end;
}
-que_job01,13,17,5 script Kidd#1 884,{
+que_job01,13,17,5 script Kidd#1 4_M_ACROSS,{
cutin "mocseal_kid01.bmp",2;
if (mao_request < 3)
@@ -4669,7 +4669,7 @@ OnEnter:
end;
}
-que_job01,12,8,7 script Kidd#2 884,{
+que_job01,12,8,7 script Kidd#2 4_M_ACROSS,{
OnInit:
disablenpc "Kidd#2";
@@ -4680,7 +4680,7 @@ OnEnter:
end;
}
-que_job01,148,54,3 script Kidd#3 884,{
+que_job01,148,54,3 script Kidd#3 4_M_ACROSS,{
OnInit:
disablenpc "Kidd#3";
@@ -4691,7 +4691,7 @@ OnEnter:
end;
}
-que_job01,91,83,3 script Kidd#hall 884,{
+que_job01,91,83,3 script Kidd#hall 4_M_ACROSS,{
if (mao_request == 124)
{
@@ -5540,7 +5540,7 @@ que_job01,91,83,3 script Kidd#hall 884,{
end;
}
-que_job01,89,85,5 script Dandelion Member 880,{
+que_job01,89,85,5 script Dandelion Member 4_M_MASKMAN,{
if(checkweight(12112,1) != 1)
{
@@ -6028,7 +6028,7 @@ que_job01,89,85,5 script Dandelion Member 880,{
end;
}
-yuno_in04,180,106,3 script Reading Girl 73,{
+yuno_in04,180,106,3 script Reading Girl 1_F_MERCHANT_01,{
if (mao_request == 5)
{
@@ -6316,7 +6316,7 @@ yuno_in04,180,106,3 script Reading Girl 73,{
}
}
-yuno_in04,175,129,0 script Workbook#mao 111,{
+yuno_in04,175,129,0 script Workbook#mao HIDDEN_NPC,{
if (mao_request == 7)
{
@@ -6426,7 +6426,7 @@ OnInit:
end;
}
-yuno_in04,174,130,5 script Kidd#book 884,{
+yuno_in04,174,130,5 script Kidd#book 4_M_ACROSS,{
mes "[Kidd]";
mes "......";
@@ -6457,7 +6457,7 @@ OnTimer180000:
stopnpctimer;
}
-que_job01,6,79,5 script Lin#stairs 885,{
+que_job01,6,79,5 script Lin#stairs 4_F_ACROSS,{
OnInit:
disablenpc "Lin#stairs";
@@ -6468,7 +6468,7 @@ OnEnter:
end;
}
-que_job01,8,77,1 script #linstairs 139,3,3,{
+que_job01,8,77,1 script #linstairs HIDDEN_WARP_NPC,3,3,{
if (mao_request == 109)
{
@@ -6680,7 +6680,7 @@ que_job01,8,77,1 script #linstairs 139,3,3,{
}
}
-moc_fild10,281,148,1 script Upturned Spot#water 111,{
+moc_fild10,281,148,1 script Upturned Spot#water HIDDEN_NPC,{
if (mao_request == 14)
{
@@ -6782,7 +6782,7 @@ moc_fild10,281,148,1 script Upturned Spot#water 111,{
end;
}
-moc_fild19,21,33,1 script Unturned Spot#wind 111,{
+moc_fild19,21,33,1 script Unturned Spot#wind HIDDEN_NPC,{
if (mao_request == 10)
{
@@ -6991,7 +6991,7 @@ moc_fild19,21,33,1 script Unturned Spot#wind 111,{
end;
}
-moc_fild12,280,36,1 script Unturned Spot#earth 111,{
+moc_fild12,280,36,1 script Unturned Spot#earth HIDDEN_NPC,{
if (mao_request == 13)
{
@@ -7106,7 +7106,7 @@ moc_fild12,280,36,1 script Unturned Spot#earth 111,{
cutin "mocseal_earth02.bmp",255;
}
-moc_fild07,192,166,1 script Unturned Spot#fire 111,{
+moc_fild07,192,166,1 script Unturned Spot#fire HIDDEN_NPC,{
if (mao_request == 15)
{
@@ -7209,7 +7209,7 @@ moc_fild07,192,166,1 script Unturned Spot#fire 111,{
cutin "mocseal_fire02.bmp",255;
}
-morocc_in,46,125,5 script Assistant 729,{
+morocc_in,46,125,5 script Assistant 4_F_NOVICE,{
if (mao_request > 18 && mao_request < 100)
{
@@ -7493,7 +7493,7 @@ morocc_in,46,125,5 script Assistant 729,{
}
}
-que_job01,15,8,1 script #mao_table 139,1,1,{
+que_job01,15,8,1 script #mao_table HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (mao_request == 24)
@@ -7640,7 +7640,7 @@ OnEnter:
end;
}
-que_job01,147,55,1 script #mao_empty 139,1,1,{
+que_job01,147,55,1 script #mao_empty HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (mao_request == 122)
@@ -7666,7 +7666,7 @@ OnEnter:
end;
}
-que_job01,144,57,1 script #Rabsent 139,1,1,{
+que_job01,144,57,1 script #Rabsent HIDDEN_WARP_NPC,1,1,{
OnTouch:
if(mao_request == 25)
@@ -7739,7 +7739,7 @@ OnEnter:
end;
}
-moc_castle,40,20,3 script Man 849,{
+moc_castle,40,20,3 script Man 4_M_DIEMAN,{
if ((mao_request > 27 && mao_request < 31) || (mao_request > 125 && mao_request < 129))
{
@@ -7796,7 +7796,7 @@ OnInit:
end;
}
-que_job02,14,182,1 script #maogate1 139,1,1,{
+que_job02,14,182,1 script #maogate1 HIDDEN_WARP_NPC,1,1,{
OnEnter:
enablenpc "#maogate1";
@@ -7868,7 +7868,7 @@ OnTimer597000:
end;
}
-que_job02,14,181,1 script #maogate1_talk1 139,2,2,{
+que_job02,14,181,1 script #maogate1_talk1 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "#maogate1_talk1";
@@ -7909,7 +7909,7 @@ OnTouch:
end;
}
-que_job02,17,150,1 script #maogate1_talk2 139,2,2,{
+que_job02,17,150,1 script #maogate1_talk2 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate1_talk2";
@@ -7955,7 +7955,7 @@ OnTouch:
end;
}
-que_job02,16,97,1 script #maogate1_talk3 139,2,2,{
+que_job02,16,97,1 script #maogate1_talk3 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate1_talk3";
@@ -8012,7 +8012,7 @@ OnTouch:
end;
}
-que_job02,44,33,1 script #maogate1_talk4 139,2,2,{
+que_job02,44,33,1 script #maogate1_talk4 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate1_talk4";
@@ -8064,7 +8064,7 @@ OnTouch:
end;
}
-que_job02,93,21,1 script #maogate1_talk5 139,2,2,{
+que_job02,93,21,1 script #maogate1_talk5 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate1_talk5";
@@ -8101,7 +8101,7 @@ OnTouch:
end;
}
-que_job02,93,21,1 script #maogate1_talk6 139,3,3,{
+que_job02,93,21,1 script #maogate1_talk6 HIDDEN_WARP_NPC,3,3,{
OnStop:
disablenpc "#maogate1_talk6";
@@ -8174,7 +8174,7 @@ OnTouch:
end;
}
-que_job02,180,144,1 script #maogate1_talk7 139,2,2,{
+que_job02,180,144,1 script #maogate1_talk7 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate1_talk7";
@@ -8228,7 +8228,7 @@ OnTouch:
end;
}
-que_job02,77,179,1 script #maogate1_talk8 139,2,2,{
+que_job02,77,179,1 script #maogate1_talk8 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate1_talk8";
@@ -8276,7 +8276,7 @@ OnTimer20100:
end;
}
-que_job02,73,82,1 script #maogate1_battle 139,2,2,{
+que_job02,73,82,1 script #maogate1_battle HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate1_battle";
@@ -8322,7 +8322,7 @@ OnMyMobDead:
end;
}
-que_job02,66,85,5 script Dandelion Member#1_bt 880,{
+que_job02,66,85,5 script Dandelion Member#1_bt 4_M_MASKMAN,{
if(mao_request == 26 || mao_request == 27)
{
@@ -8384,7 +8384,7 @@ OnEnter:
end;
}
-que_job02,87,83,1 script #maogate1_setting 139,2,2,{
+que_job02,87,83,1 script #maogate1_setting HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate1_setting";
@@ -8407,7 +8407,7 @@ OnTouch:
}
}
-que_job02,117,101,1 script #maogate1_end 139,3,3,{
+que_job02,117,101,1 script #maogate1_end HIDDEN_WARP_NPC,3,3,{
OnInit:
disablenpc "#maogate1_end";
@@ -8600,7 +8600,7 @@ OnMyMobDead:
end;
}
-que_job02,116,108,5 script Kidd#maogate1_1 884,{
+que_job02,116,108,5 script Kidd#maogate1_1 4_M_ACROSS,{
OnInit:
disablenpc "Kidd#maogate1_1";
@@ -8611,7 +8611,7 @@ OnEnter:
end;
}
-que_job02,126,103,5 script Kidd#maogate1_2 884,{
+que_job02,126,103,5 script Kidd#maogate1_2 4_M_ACROSS,{
end;
@@ -8629,7 +8629,7 @@ OnMyMobDead:
end;
}
-que_job02,121,106,1 script Lin#maogate1_1 885,{
+que_job02,121,106,1 script Lin#maogate1_1 4_F_ACROSS,{
OnInit:
disablenpc "Lin#maogate1_1";
@@ -8640,7 +8640,7 @@ OnEnter:
end;
}
-que_job02,127,101,1 script Lin#maogate1_2 885,{
+que_job02,127,101,1 script Lin#maogate1_2 4_F_ACROSS,{
OnInit:
disablenpc "Lin#maogate1_2";
@@ -8651,7 +8651,7 @@ OnEnter:
end;
}
-que_job02,124,109,3 script R#maogate1 880,{
+que_job02,124,109,3 script R#maogate1 4_M_MASKMAN,{
OnInit:
disablenpc "R#maogate1";
@@ -8666,7 +8666,7 @@ OnSpell:
end;
}
-que_job02,113,107,5 script Dandelion#maogate1_1 880,{
+que_job02,113,107,5 script Dandelion#maogate1_1 4_M_MASKMAN,{
OnInit:
disablenpc "Dandelion#maogate1_1";
@@ -8677,7 +8677,7 @@ OnEnter:
end;
}
-que_job02,121,100,7 script Dandelion#maogate1_2 880,{
+que_job02,121,100,7 script Dandelion#maogate1_2 4_M_MASKMAN,{
OnInit:
disablenpc "Dandelion#maogate1_2";
@@ -8696,7 +8696,7 @@ OnSpell2:
end;
}
-que_job02,122,98,1 script Dandelion#maogate1_3 880,{
+que_job02,122,98,1 script Dandelion#maogate1_3 4_M_MASKMAN,{
OnInit:
disablenpc "Dandelion#maogate1_3";
@@ -8711,7 +8711,7 @@ OnSpell:
end;
}
-que_job02,122,111,5 script Dandelion#maogate1_4 880,{
+que_job02,122,111,5 script Dandelion#maogate1_4 4_M_MASKMAN,{
OnInit:
disablenpc "Dandelion#maogate1_4";
@@ -8726,7 +8726,7 @@ OnSpell:
end;
}
-que_job02,122,106,1 script #maogate1_end2 139,15,15,{
+que_job02,122,106,1 script #maogate1_end2 HIDDEN_WARP_NPC,15,15,{
OnInit:
disablenpc "#maogate1_end2";
@@ -8779,7 +8779,7 @@ OnTouch:
}
}
-que_job03,14,182,1 script #maogate2 139,1,1,{
+que_job03,14,182,1 script #maogate2 HIDDEN_WARP_NPC,1,1,{
OnEnter:
enablenpc "#maogate2";
@@ -8851,7 +8851,7 @@ OnTimer597000:
end;
}
-que_job03,14,181,1 script #maogate2_talk1 139,2,2,{
+que_job03,14,181,1 script #maogate2_talk1 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "#maogate2_talk1";
@@ -8892,7 +8892,7 @@ OnTouch:
end;
}
-que_job03,17,150,1 script #maogate2_talk2 139,2,2,{
+que_job03,17,150,1 script #maogate2_talk2 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate2_talk2";
@@ -8938,7 +8938,7 @@ OnTouch:
end;
}
-que_job03,16,97,1 script #maogate2_talk3 139,2,2,{
+que_job03,16,97,1 script #maogate2_talk3 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate2_talk3";
@@ -8995,7 +8995,7 @@ OnTouch:
end;
}
-que_job03,44,33,1 script #maogate2_talk4 139,2,2,{
+que_job03,44,33,1 script #maogate2_talk4 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate2_talk4";
@@ -9047,7 +9047,7 @@ OnTouch:
end;
}
-que_job03,93,21,1 script #maogate2_talk5 139,2,2,{
+que_job03,93,21,1 script #maogate2_talk5 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate2_talk5";
@@ -9084,7 +9084,7 @@ OnTouch:
end;
}
-que_job03,93,21,1 script #maogate2_talk6 139,3,3,{
+que_job03,93,21,1 script #maogate2_talk6 HIDDEN_WARP_NPC,3,3,{
OnStop:
disablenpc "#maogate2_talk6";
@@ -9157,7 +9157,7 @@ OnTouch:
end;
}
-que_job03,180,144,1 script #maogate2_talk7 139,2,2,{
+que_job03,180,144,1 script #maogate2_talk7 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate2_talk7";
@@ -9211,7 +9211,7 @@ OnTouch:
end;
}
-que_job03,77,179,1 script #maogate2_talk8 139,2,2,{
+que_job03,77,179,1 script #maogate2_talk8 HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate2_talk8";
@@ -9259,7 +9259,7 @@ OnTimer20100:
end;
}
-que_job03,73,82,1 script #maogate2_battle 139,2,2,{
+que_job03,73,82,1 script #maogate2_battle HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate2_battle";
@@ -9305,7 +9305,7 @@ OnMyMobDead:
end;
}
-que_job03,66,85,5 script Dandelion Member#2_bt 880,{
+que_job03,66,85,5 script Dandelion Member#2_bt 4_M_MASKMAN,{
if(mao_request == 124 || mao_request == 125)
{
@@ -9377,7 +9377,7 @@ OnEnter:
end;
}
-que_job03,87,83,1 script #maogate2_setting 139,2,2,{
+que_job03,87,83,1 script #maogate2_setting HIDDEN_WARP_NPC,2,2,{
OnStop:
disablenpc "#maogate2_setting";
@@ -9400,7 +9400,7 @@ OnTouch:
}
}
-que_job03,117,101,1 script #maogate2_end 139,3,3,{
+que_job03,117,101,1 script #maogate2_end HIDDEN_WARP_NPC,3,3,{
OnInit:
disablenpc "#maogate2_end";
@@ -9594,7 +9594,7 @@ OnMyMobDead:
end;
}
-que_job03,116,108,5 script Kidd#maogate2_1 884,{
+que_job03,116,108,5 script Kidd#maogate2_1 4_M_ACROSS,{
OnInit:
disablenpc "Kidd#maogate2_1";
@@ -9605,7 +9605,7 @@ OnEnter:
end;
}
-que_job03,126,103,5 script Kidd#maogate2_2 884,{
+que_job03,126,103,5 script Kidd#maogate2_2 4_M_ACROSS,{
end;
@@ -9623,7 +9623,7 @@ OnMyMobDead:
end;
}
-que_job03,121,106,1 script Lin#maogate2_1 885,{
+que_job03,121,106,1 script Lin#maogate2_1 4_F_ACROSS,{
OnInit:
disablenpc "Lin#maogate2_1";
@@ -9634,7 +9634,7 @@ OnEnter:
end;
}
-que_job03,127,101,1 script Lin#maogate2_2 885,{
+que_job03,127,101,1 script Lin#maogate2_2 4_F_ACROSS,{
OnInit:
disablenpc "Lin#maogate2_2";
@@ -9645,7 +9645,7 @@ OnEnter:
end;
}
-que_job03,124,109,3 script R#maogate2 880,{
+que_job03,124,109,3 script R#maogate2 4_M_MASKMAN,{
OnInit:
disablenpc "R#maogate2";
@@ -9660,7 +9660,7 @@ OnSpell:
end;
}
-que_job03,113,107,5 script Dandelion#maogate2_1 880,{
+que_job03,113,107,5 script Dandelion#maogate2_1 4_M_MASKMAN,{
OnInit:
disablenpc "Dandelion#maogate2_1";
@@ -9671,7 +9671,7 @@ OnEnter:
end;
}
-que_job03,121,100,7 script Dandelion#maogate2_2 880,{
+que_job03,121,100,7 script Dandelion#maogate2_2 4_M_MASKMAN,{
OnInit:
disablenpc "Dandelion#maogate2_2";
@@ -9690,7 +9690,7 @@ OnSpell2:
end;
}
-que_job03,122,98,1 script Dandelion#maogate2_3 880,{
+que_job03,122,98,1 script Dandelion#maogate2_3 4_M_MASKMAN,{
OnInit:
disablenpc "Dandelion#maogate2_3";
@@ -9705,7 +9705,7 @@ OnSpell:
end;
}
-que_job03,122,111,5 script Dandelion#maogate2_4 880,{
+que_job03,122,111,5 script Dandelion#maogate2_4 4_M_MASKMAN,{
OnInit:
disablenpc "Dandelion#maogate2_4";
@@ -9720,7 +9720,7 @@ OnSpell:
end;
}
-que_job03,122,106,1 script #maogate2_end2 139,15,15,{
+que_job03,122,106,1 script #maogate2_end2 HIDDEN_WARP_NPC,15,15,{
OnInit:
disablenpc "#maogate2_end2";
@@ -9772,7 +9772,7 @@ OnTouch:
}
}
-morocc,30,29,5 script Member#mao1 880,10,15,{
+morocc,30,29,5 script Member#mao1 4_M_MASKMAN,10,15,{
mes "[Chairman]";
mes "So it's agreed.";
@@ -9855,7 +9855,7 @@ OnTouch:
}
}
-morocc,29,26,0 script Member#mao2 880,{
+morocc,29,26,0 script Member#mao2 4_M_MASKMAN,{
mes "[Chairman]";
mes "So it's agreed.";
@@ -9892,7 +9892,7 @@ OnEnter:
end;
}
-morocc,33,27,1 script Member#mao3 880,{
+morocc,33,27,1 script Member#mao3 4_M_MASKMAN,{
mes "[Chairman]";
mes "So it's agreed.";
@@ -9929,7 +9929,7 @@ OnEnter:
end;
}
-morocc,34,30,3 script Member#mao4 880,{
+morocc,34,30,3 script Member#mao4 4_M_MASKMAN,{
mes "[Chairman]";
mes "So it's agreed.";
@@ -10166,7 +10166,7 @@ OnMyMobDead:
end;
}
-que_job01,68,88,5 script Simon#mao 881,{
+que_job01,68,88,5 script Simon#mao 4_M_SITDOWN,{
mes "[Simon]";
mes "...No. How many";
@@ -10217,9 +10217,9 @@ que_job01,68,88,5 script Simon#mao 881,{
close;
}
-que_job01,70,84,1 duplicate(Simon#mao) Kimmie 882,0,0
+que_job01,70,84,1 duplicate(Simon#mao) Kimmie 4_F_SITDOWN,0,0
-sec_in02,38,162,0 script Morroc Invasion Manager 882,{
+sec_in02,38,162,0 script Morroc Invasion Manager 4_F_SITDOWN,{
callfunc "F_GM_NPC";
mes "A total of " + $maoattack + " users completed";
mes "the Satan Morroc: Lin Quest.";
diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt
index 16b34331b..6bccc7347 100644
--- a/npc/quests/doomed_swords.txt
+++ b/npc/quests/doomed_swords.txt
@@ -21,7 +21,7 @@
//= 1.5 Added missing checkweight. [L0ne_W0lf]
//============================================================
-prt_in,162,11,2 script Ghatu#magum 86,{
+prt_in,162,11,2 script Ghatu#magum 4_M_04,{
if (event_magum == 0) {
if (dmdswrd_Q2 & 1 || dmdswrd_Q2 & 2 || dmdswrd_Q2 & 4 || dmdswrd_Q2 & 8 || dmdswrd_Q2 & 16 || dmdswrd_Q2 & 32) {
mes "[Ghatu]";
@@ -116,7 +116,7 @@ prt_in,162,11,2 script Ghatu#magum 86,{
close;
}
-prontera,197,188,2 script Veeyop#magum 50,{
+prontera,197,188,2 script Veeyop#magum 1_M_04,{
if (dmdswrd_Q2 & 1) {
mes "[Veeyop]";
mes "You know, talking";
@@ -156,7 +156,7 @@ prontera,197,188,2 script Veeyop#magum 50,{
close;
}
-morocc,281,178,2 script Cetsu#magum 97,{
+morocc,281,178,2 script Cetsu#magum 4W_M_01,{
if (dmdswrd_Q2 & 2) {
mes "[Cetsu]";
mes "I keep thinking about";
@@ -208,7 +208,7 @@ morocc,281,178,2 script Cetsu#magum 97,{
close;
}
-izlude_in,173,88,2 script Nain#magum 102,{
+izlude_in,173,88,2 script Nain#magum 8_F,{
if (dmdswrd_Q2 == 4) {
mes "[Nain]";
mes "It doesn't matter how";
@@ -252,7 +252,7 @@ izlude_in,173,88,2 script Nain#magum 102,{
close;
}
-pay_fild08,218,283,2 script Mysterious Man#magum 89,{
+pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{
if (checkweight(1201,1) == 0) {
mes "[Mysterious Man]";
mes "Hold it.";
diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt
index 172d90caa..e4a1ddf58 100644
--- a/npc/quests/doomed_swords_quest.txt
+++ b/npc/quests/doomed_swords_quest.txt
@@ -16,7 +16,7 @@
//= 1.0 First version. [L0ne_W0lf]
//============================================================
-mjolnir_02,186,193,4 script Middle-Aged Man#magum1 57,{
+mjolnir_02,186,193,4 script Middle-Aged Man#magum1 1_M_LIBRARYMASTER,{
if (dmdswrd_Q > 30) {
if (dmdswrd_Q == 31) {
mes "[Middle-Aged Man]";
@@ -345,7 +345,7 @@ mjolnir_02,186,193,4 script Middle-Aged Man#magum1 57,{
}
}
-payon,248,159,1 script Old Man#magum1 120,{
+payon,248,159,1 script Old Man#magum1 2_M_PHARMACIST,{
if (dmdswrd_Q == 35) {
mes "[Old Man]";
mes "Wha--? Who are";
@@ -791,7 +791,7 @@ payon,248,159,1 script Old Man#magum1 120,{
}
}
-morocc,248,159,4 script Young Man#magum1 86,{
+morocc,248,159,4 script Young Man#magum1 4_M_04,{
if (dmdswrd_Q == 39) {
mes "[Huey]";
mes "Excuse me, but...";
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index 3daf992fb..135fc768b 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -23,7 +23,7 @@
//= 2.1 Updated RE/Pre-RE EXP. [Euphy]
//============================================================
-morocc_in,116,101,3 script Old Scholar Tyus#hellion 735,3,3,{
+morocc_in,116,101,3 script Old Scholar Tyus#hellion 4_M_JOB_WIZARD,3,3,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFHold it right there!";
mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -672,7 +672,7 @@ OnTouch:
end;
}
-prontera,269,326,3 script Clanux Heffron#hellion 50,{
+prontera,269,326,3 script Clanux Heffron#hellion 1_M_04,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFHold it right there!";
mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -1037,7 +1037,7 @@ prontera,269,326,3 script Clanux Heffron#hellion 50,{
close;
}
-prontera,223,82,0 script #prt_key-1 111,{
+prontera,223,82,0 script #prt_key-1 HIDDEN_NPC,{
if (HELLIONQ == 39) {
mes "^3355FFIt's a training dummy";
mes "with a gash in its body";
@@ -1072,7 +1072,7 @@ prontera,223,82,0 script #prt_key-1 111,{
close;
}
-prontera,45,67,0 script #prt_key-1-1 111,1,1,{
+prontera,45,67,0 script #prt_key-1-1 HIDDEN_NPC,1,1,{
OnTouch:
if (HELLIONQ == 40 || HELLIONQ == 41) {
mes "[" + strcharinfo(0) + "]";
@@ -1153,7 +1153,7 @@ OnTouch:
end;
}
-prt_in,128,79,0 script Unknown Machine#prt_key 111,{
+prt_in,128,79,0 script Unknown Machine#prt_key HIDDEN_NPC,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFHold it right there!";
mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -1284,7 +1284,7 @@ prt_in,128,79,0 script Unknown Machine#prt_key 111,{
close;
}
-payon,182,132,3 script Grout'he Tuccok#hellion 48,{
+payon,182,132,3 script Grout'he Tuccok#hellion 1_M_02,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFHold it right there!";
mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -1623,7 +1623,7 @@ OnTouch:
end;
}
-payon,82,109,3 script Pile of Stone#paypuzz2 111,{
+payon,82,109,3 script Pile of Stone#paypuzz2 HIDDEN_NPC,{
if (HELLIONQ == 49) {
mes "[" + strcharinfo(0) + "]";
mes "Well, this is the place";
@@ -1643,7 +1643,7 @@ payon,82,109,3 script Pile of Stone#paypuzz2 111,{
}
}
-payon,239,56,3 script Dried Fish#paypuzz3 111,{
+payon,239,56,3 script Dried Fish#paypuzz3 HIDDEN_NPC,{
if (HELLIONQ == 50) {
mes "[" + strcharinfo(0) + "]";
mes "So... Dried fish all";
@@ -1664,7 +1664,7 @@ payon,239,56,3 script Dried Fish#paypuzz3 111,{
}
}
-payon,240,160,3 script Vat#paypuzz4 111,{
+payon,240,160,3 script Vat#paypuzz4 HIDDEN_NPC,{
if (HELLIONQ == 51) {
mes "[" + strcharinfo(0) + "]";
mes "Alright, the last";
@@ -1690,7 +1690,7 @@ payon,240,160,3 script Vat#paypuzz4 111,{
}
}
-payon,159,129,3 script Wooden Floor#paypuzz5 111,{
+payon,159,129,3 script Wooden Floor#paypuzz5 HIDDEN_NPC,{
if (HELLIONQ == 53) {
mes "[" + strcharinfo(0) + "]";
mes "Hey, the floor around";
@@ -1790,7 +1790,7 @@ payon,159,129,3 script Wooden Floor#paypuzz5 111,{
}
}
-pay_arche,142,28,0 script Buddha Statue#paypuzz6 111,5,5,{
+pay_arche,142,28,0 script Buddha Statue#paypuzz6 HIDDEN_NPC,5,5,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFHold it right there!";
mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -1889,7 +1889,7 @@ OnTouch:
end;
}
-geffen,110,200,3 script Sage Welshyun#hellion 754,3,3,{
+geffen,110,200,3 script Sage Welshyun#hellion 4_M_SAGE_A,3,3,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFHold it right there!";
mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
@@ -2258,7 +2258,7 @@ OnTouch:
end;
}
-gef_tower,116,37,0 script Enoz#hellion 748,{
+gef_tower,116,37,0 script Enoz#hellion 4_M_ALCHE_A,{
if (HELLIONQ == 59 || HELLIONQ == 62) {
mes "[Enoz]";
mes "It's gone, it's gone!";
@@ -2368,7 +2368,7 @@ gef_tower,116,37,0 script Enoz#hellion 748,{
close;
}
-gef_fild09,296,59,0 script Hidden Cave#hellion 111,3,3,{
+gef_fild09,296,59,0 script Hidden Cave#hellion HIDDEN_NPC,3,3,{
if (HELLIONQ == 68) {
mes "^3355FFAmongst the wild bushes";
mes "and overgrown grass, you";
diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index 3f845faaf..fde13dbae 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -23,7 +23,7 @@
// Priest Praupin
//============================================================
-prt_church,179,15,1 script Priest Praupin 110,{
+prt_church,179,15,1 script Priest Praupin 4_M_MINISTER,{
mes "[Priest Praupin]";
if(BaseJob != Job_Acolyte){
if(tu_acolyte01 == 25){
@@ -174,7 +174,7 @@ prt_church,179,15,1 script Priest Praupin 110,{
// Asthe
//============================================================
-prt_monk,230,106,3 script Asthe#tu 79,{
+prt_monk,230,106,3 script Asthe#tu 1_F_PRIEST,{
mes "[Asthe]";
switch(tu_acolyte01){
case 1:
@@ -800,7 +800,7 @@ prt_monk,230,106,3 script Asthe#tu 79,{
// Priest Gardron
//============================================================
-monk_in,18,38,6 script Priest Gardron#tu 110,{
+monk_in,18,38,6 script Priest Gardron#tu 4_M_MINISTER,{
mes "[Priest Gardron]";
if(tu_acolyte01 == 7){
if(countitem(7148) >= 1){
@@ -952,7 +952,7 @@ monk_in,18,38,6 script Priest Gardron#tu 110,{
// Dog
//============================================================
-prt_monk,235,245,5 script Dog#tu 81,{
+prt_monk,235,245,5 script Dog#tu 4_DOG01,{
mes "[Dog]";
mes "^CDB79EBark bark!";
mes "Woof woof!^000000";
@@ -999,7 +999,7 @@ prt_monk,235,245,5 script Dog#tu 81,{
// Boy
//============================================================
-prt_monk,243,238,5 script Boy#boy_voi 139,5,5,{
+prt_monk,243,238,5 script Boy#boy_voi HIDDEN_WARP_NPC,5,5,{
OnTouch_:
if(tu_acolyte01 != 10)end;
mes "[??]";
@@ -1010,7 +1010,7 @@ OnTouch_:
// Ill Girl
//============================================================
-prt_monk,226,257,6 script Ill Girl#tu 93,{
+prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{
mes "[Angelic]";
if(tu_acolyte01 > 12){
mes "Thanks for helping me.";
@@ -1212,7 +1212,7 @@ prt_monk,226,257,6 script Ill Girl#tu 93,{
// Veiner
//============================================================
-prt_monk,197,228,3 script Veiner 89,{
+prt_monk,197,228,3 script Veiner 4_M_ORIENT02,{
mes "[Veiner]";
if(countitem(1081) && tu_acolyte01 == 18){
mes "So very exhausted...";
@@ -1256,7 +1256,7 @@ prt_monk,197,228,3 script Veiner 89,{
// Hedrick
//============================================================
-prt_monk,28,260,5 script Hedrick 50,{
+prt_monk,28,260,5 script Hedrick 1_M_04,{
mes "[Hedrick]";
mes "^333333*Whew!*^000000";
mes "Man I worked hard today!";
@@ -1292,7 +1292,7 @@ prt_monk,28,260,5 script Hedrick 50,{
// Weapon Merchant
//============================================================
-prt_monk,136,261,0 script Weapon Merchant#tu 139,9,9,{
+prt_monk,136,261,0 script Weapon Merchant#tu HIDDEN_WARP_NPC,9,9,{
OnTouch:
if(tu_acolyte01 != 20 || countitem(1081)==0) end;
mes "[Weapon Merchant]";
@@ -1310,7 +1310,7 @@ OnTouch:
// Karven
//============================================================
-monk_in,103,176,7 script Karven 60,{
+monk_in,103,176,7 script Karven 1_M_PASTOR,{
mes "[Karven]";
mes "May you rest";
if(tu_acolyte01 == 21 && countitem(7183)){
@@ -1344,7 +1344,7 @@ monk_in,103,176,7 script Karven 60,{
// Gloria
//============================================================
-prt_monk,219,164,3 script Gloria#tu 95,{
+prt_monk,219,164,3 script Gloria#tu 4_F_SISTER,{
mes "[Gloria]";
if(BaseJob != Job_Acolyte){
mes "Hi, hi~";
@@ -1417,7 +1417,7 @@ prt_monk,219,164,3 script Gloria#tu 95,{
// Cleope Verce
//============================================================
-prt_monk,153,210,3 script Cleope Verce 95,{
+prt_monk,153,210,3 script Cleope Verce 4_F_SISTER,{
mes "[Cleope Verce]";
if(BaseJob != Job_Acolyte){
if (JobLevel < 40) {
@@ -1591,7 +1591,7 @@ prt_monk,153,210,3 script Cleope Verce 95,{
}
// Range NPC
//============================================================
-prt_monk,217,123,0 script #tu_monk 139,10,10,{
+prt_monk,217,123,0 script #tu_monk HIDDEN_WARP_NPC,10,10,{
OnTouch_:
if(BaseJob == Job_Acolyte){
switch(tu_acolyte01){
@@ -1612,7 +1612,7 @@ OnTouch_:
// Eavesdrop
//============================================================
-prt_monk,223,123,3 script Eavesdrop#tu 111,{
+prt_monk,223,123,3 script Eavesdrop#tu HIDDEN_NPC,{
if(BaseJob != Job_Acolyte){
mes "^3355FFThere's nothing here.^000000";
close;
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index b965ae05d..247aa0329 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -26,7 +26,7 @@
// Bard Jet
//============================================================
-payon_in02,67,65,3 script Bard Jet#tu 51,{
+payon_in02,67,65,3 script Bard Jet#tu 1_M_BARD,{
mes "[Jet]";
mes "Every god never grows old";
mes "Because of beautiful";
@@ -162,7 +162,7 @@ payon_in02,67,65,3 script Bard Jet#tu 51,{
// Sign
//============================================================
-pay_arche,127,154,4 script Sign#arc 835,{
+pay_arche,127,154,4 script Sign#arc 2_BOARD1,{
mes " ";
mes " Archer Job Change Office ---> ";
mes " <--- Icarus ";
@@ -172,7 +172,7 @@ pay_arche,127,154,4 script Sign#arc 835,{
// Master Kavaruk
//============================================================
-payon_in02,54,13,3 script Master Kavaruk 55,{
+payon_in02,54,13,3 script Master Kavaruk 1_M_JOBTESTER,{
mes "[Master Kavaruk]";
mes "Hello, young one.";
mes "I am Master Kavaruk";
@@ -418,7 +418,7 @@ payon_in02,54,13,3 script Master Kavaruk 55,{
// Reidin Corse
//============================================================
-pay_arche,103,165,5 script Reidin Corse#tu 832,{
+pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{
mes "[Reidin Corse]";
if(MaxWeight - Weight < 2000){
mes "Hey, you're carrying an";
@@ -1187,7 +1187,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 832,{
// Seisner
//============================================================
-pay_arche,84,139,3 script Seisner 727,{
+pay_arche,84,139,3 script Seisner 4_F_JOB_HUNTER,{
specialeffect EF_HIT2,"#Target";
mes "[Seisner]";
mes "Aaaah!";
@@ -1393,7 +1393,7 @@ pay_arche,84,139,3 script Seisner 727,{
// Target
//============================================================
-pay_arche,76,135,3 script #Target 111,{ end; }
+pay_arche,76,135,3 script #Target HIDDEN_NPC,{ end; }
// Acolyte
//============================================================
@@ -1551,7 +1551,7 @@ pay_arche,76,135,3 script #Target 111,{ end; }
// Alchemist Guildmember
//============================================================
-pay_arche,130,113,3 script Alchemist Guildmember#tu 740,{
+pay_arche,130,113,3 script Alchemist Guildmember#tu 2_M_ALCHE,{
mes "[Alchemist Guildmember]";
if(tu_archer02 > 0){
if((countitem(1032) > 0) || (countitem(905) > 0 )){ // Blossom_Of_Maneater & Stem
@@ -1625,7 +1625,7 @@ pay_arche,130,113,3 script Alchemist Guildmember#tu 740,{
// Arthail
//============================================================
-prontera,126,335,5 script Arthail 51,{
+prontera,126,335,5 script Arthail 1_M_BARD,{
mes "[Arthail]";
if(tu_archer02 < 3){
mes "I am the Bard";
@@ -1806,7 +1806,7 @@ prontera,126,335,5 script Arthail 51,{
// New Guild Master
//============================================================
-prontera,167,281,3 script New Guild Master#tu 753,{
+prontera,167,281,3 script New Guild Master#tu 4_M_MONK,{
mes "[New Guild Master]";
mes "Hearken, all";
mes "of you who seek";
@@ -1829,7 +1829,7 @@ prontera,167,281,3 script New Guild Master#tu 753,{
// Mage
//============================================================
-prontera,144,301,5 script Mage#tu 123,{
+prontera,144,301,5 script Mage#tu 2_F_MAGICMASTER,{
mes "[Mage]";
mes "Did you see that";
mes "new guild master?";
@@ -1857,7 +1857,7 @@ prontera,144,301,5 script Mage#tu 123,{
// Minister
//============================================================
-prt_castle,76,165,6 script Minister#tu 55,{
+prt_castle,76,165,6 script Minister#tu 1_M_JOBTESTER,{
mes "[Minister]";
mes "The royal family";
mes "is extremely busy";
@@ -1917,7 +1917,7 @@ prt_castle,76,165,6 script Minister#tu 55,{
// Range NPC
//============================================================
-prt_castle,94,150,4 script #sound_tu 139,6,6,{
+prt_castle,94,150,4 script #sound_tu HIDDEN_WARP_NPC,6,6,{
OnTouch_:
if(tu_archer02 == 6) {
mes "[Minister]";
@@ -1932,7 +1932,7 @@ OnTouch_:
// Bishop Maugins
//============================================================
-monk_in,19,43,1 script Bishop Maugins 60,{
+monk_in,19,43,1 script Bishop Maugins 1_M_PASTOR,{
mes "[Bishop Maugins]";
if(tu_archer02 == 7){
mes "Greetings.";
diff --git a/npc/quests/first_class/tu_ma_th01.txt b/npc/quests/first_class/tu_ma_th01.txt
index 6bbe5c456..a80f424b0 100644
--- a/npc/quests/first_class/tu_ma_th01.txt
+++ b/npc/quests/first_class/tu_ma_th01.txt
@@ -16,7 +16,7 @@
// Battle Traces 1
//============================================================
-moc_fild12,166,369,0 script Trace of Battle#1 844,{
+moc_fild12,166,369,0 script Trace of Battle#1 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 5){
mes "^3355FFYou find traces of poison";
@@ -107,7 +107,7 @@ moc_fild12,166,369,0 script Trace of Battle#1 844,{
// Battle Traces 2
//============================================================
-moc_fild12,173,215,0 script Trace of Battle#2 844,{
+moc_fild12,173,215,0 script Trace of Battle#2 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 9){
mes "^3355FFThere are signs";
@@ -157,7 +157,7 @@ moc_fild12,173,215,0 script Trace of Battle#2 844,{
// Battle Traces 3
//============================================================
-moc_fild12,276,165,0 script Trace of Battle#3 844,{
+moc_fild12,276,165,0 script Trace of Battle#3 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 10){
mes "^3355FFThere are signs";
@@ -210,7 +210,7 @@ moc_fild12,276,165,0 script Trace of Battle#3 844,{
// Battle Traces 4
//============================================================
-moc_fild11,39,163,0 script Trace of Battle#4 844,{
+moc_fild11,39,163,0 script Trace of Battle#4 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 11){
mes "^3355FFThere are signs";
@@ -270,7 +270,7 @@ moc_fild11,39,163,0 script Trace of Battle#4 844,{
// Battle Traces 5
//============================================================
-moc_fild11,205,52,0 script Trace of Battle#5 844,{
+moc_fild11,205,52,0 script Trace of Battle#5 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 12){
mes "^3355FFThere are signs";
@@ -419,7 +419,7 @@ moc_fild11,205,52,0 script Trace of Battle#5 844,{
// Battle Traces 6
//============================================================
-moc_fild11,226,235,0 script Trace of Battle#6 844,{
+moc_fild11,226,235,0 script Trace of Battle#6 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 13){
mes "^3355FFThere are signs";
@@ -462,7 +462,7 @@ moc_fild11,226,235,0 script Trace of Battle#6 844,{
// Battle Traces 7
//============================================================
-moc_fild11,184,342,0 script Trace of Battle#7 844,{
+moc_fild11,184,342,0 script Trace of Battle#7 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 13){
mes "^3355FFThere are signs";
@@ -503,7 +503,7 @@ moc_fild11,184,342,0 script Trace of Battle#7 844,{
// Battle Traces 8
//============================================================
-moc_fild17,213,358,0 script Trace of Battle#8 844,{
+moc_fild17,213,358,0 script Trace of Battle#8 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 13){
mes "^3355FFThere are two";
@@ -564,7 +564,7 @@ moc_fild17,213,358,0 script Trace of Battle#8 844,{
// Battle Traces 9
//============================================================
-moc_fild17,228,274,0 script Trace of Battle#9 844,{
+moc_fild17,228,274,0 script Trace of Battle#9 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 14){
mes "^3355FFTraces of some";
@@ -659,7 +659,7 @@ moc_fild17,228,274,0 script Trace of Battle#9 844,{
// Battle Traces 10
//============================================================
-moc_fild17,34,292,0 script Trace of Battle#10 844,{
+moc_fild17,34,292,0 script Trace of Battle#10 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 16){
mes "^3355FFThere are signs";
@@ -712,7 +712,7 @@ moc_fild17,34,292,0 script Trace of Battle#10 844,{
// Battle Traces 11
//============================================================
-moc_fild18,346,296,0 script Trace of Battle#11 844,{
+moc_fild18,346,296,0 script Trace of Battle#11 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 17){
mes "^3355FFThere are signs";
@@ -769,7 +769,7 @@ moc_fild18,346,296,0 script Trace of Battle#11 844,{
// Battle Traces 12
//============================================================
-moc_fild18,309,257,0 script Trace of Battle#12 844,{
+moc_fild18,309,257,0 script Trace of Battle#12 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 18){
mes "^3355FFThere are signs";
@@ -822,7 +822,7 @@ moc_fild18,309,257,0 script Trace of Battle#12 844,{
// Battle Traces 13
//============================================================
-moc_fild18,177,333,0 script Trace of Battle#13 844,{
+moc_fild18,177,333,0 script Trace of Battle#13 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 19){
mes "^3355FFThere are signs";
@@ -876,7 +876,7 @@ moc_fild18,177,333,0 script Trace of Battle#13 844,{
// Battle Traces 14
//============================================================
-moc_fild18,111,303,0 script Trace of Battle#14 844,{
+moc_fild18,111,303,0 script Trace of Battle#14 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 20){
mes "^3355FFThere are signs";
@@ -929,7 +929,7 @@ moc_fild18,111,303,0 script Trace of Battle#14 844,{
// Battle Traces 15
//============================================================
-moc_fild18,109,197,0 script Trace of Battle#15 844,{
+moc_fild18,109,197,0 script Trace of Battle#15 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 21){
mes "^3355FFThere are signs";
@@ -1252,7 +1252,7 @@ moc_fild18,109,197,0 script Trace of Battle#15 844,{
// Battle Traces 16
//============================================================
-moc_fild18,156,96,0 script Trace of Battle#16 844,{
+moc_fild18,156,96,0 script Trace of Battle#16 CLEAR_NPC,{
if(BaseClass == Job_Thief){
if(tu_thief01 < 25){
mes "^3355FFThere are signs";
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index a616c2f0d..97ac69dcb 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -17,14 +17,14 @@
// Sign
//============================================================
-geffen,61,174,4 script Sign#M 111,{
+geffen,61,174,4 script Sign#M HIDDEN_NPC,{
mes "- Mage Job Change -";
close;
}
// New Mage Manager
//============================================================
-geffen,67,180,4 script New Mage Manager#M 102,{
+geffen,67,180,4 script New Mage Manager#M 8_F,{
mes "[Mana]";
if(Class == Job_Novice){
mes "[Mana]";
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index 2e838e4da..8636810bd 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -17,7 +17,7 @@
// Guarnien
//============================================================
-alberta_in,70,51,5 script Guarnien 98,{
+alberta_in,70,51,5 script Guarnien 4W_M_02,{
mes "[Guarnien]";
if(Class != Job_Merchant && Class != Job_Baby_Merchant){
mes "Hello stranger.";
@@ -676,7 +676,7 @@ alberta_in,70,51,5 script Guarnien 98,{
// Sagle
//============================================================
-prontera,66,111,3 script Sagle 82,{
+prontera,66,111,3 script Sagle 4_KID01,{
mes "[Sagle]";
if(tu_merchant == 8){
mes "Hello, hello~";
@@ -835,7 +835,7 @@ prontera,66,111,3 script Sagle 82,{
// Kellion
//============================================================
-prontera,93,330,3 script Kellion 97,{
+prontera,93,330,3 script Kellion 4W_M_01,{
mes "[Kellion]";
if(tu_merchant == 8){
mes "I'm selling sets of";
@@ -969,7 +969,7 @@ prontera,93,330,3 script Kellion 97,{
// Aigie
//============================================================
-prt_in,169,11,3 script Aigie 92,{
+prt_in,169,11,3 script Aigie 4_F_03,{
if(tu_merchant == 8){
mes "[Aigie]";
mes "Welcome to my shop.";
@@ -1115,7 +1115,7 @@ prt_in,169,11,3 script Aigie 92,{
// Jayon
//============================================================
-prontera,247,129,3 script Jayon 85,{
+prontera,247,129,3 script Jayon 4_M_03,{
if(tu_merchant == 8){
mes "[Jayon]";
mes "If you've checked out the market for Red Potions, you know that my price is the best. I'm offering 10 Red Potions for only 410 Zeny!";
@@ -1267,7 +1267,7 @@ prontera,247,129,3 script Jayon 85,{
// Maos
//============================================================
-prt_in,251,129,3 script Maos 709,{
+prt_in,251,129,3 script Maos 4_M_SEAMAN,{
if(tu_merchant == 8){
mes "[Maos]";
mes "Don't say anything.";
diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt
index 57e3fa447..66962d97f 100644
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -19,7 +19,7 @@
// Shurank
//============================================================
-izlude_in,82,163,3 script Shurank 733,{
+izlude_in,82,163,3 script Shurank 4_M_JOB_KNIGHT1,{
mes "[Shurank]";
if(Class == Job_Novice || Class == Job_Baby){
mes "Still wondering";
@@ -991,7 +991,7 @@ izlude_in,82,163,3 script Shurank 733,{
// Daqu'ee
//============================================================
-geffen,154,143,3 script Dequ'ee 734,{
+geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{
if(BaseJob == Job_Novice){
mes "[Dequ'ee]";
mes "Hey there.";
@@ -2255,7 +2255,7 @@ geffen,154,143,3 script Dequ'ee 734,{
// Geil
//============================================================
-morocc_in,51,101,3 script Geil 89,{
+morocc_in,51,101,3 script Geil 4_M_ORIENT02,{
mes "[Geil]";
if(tu_swordman == 15){
mes "Were you sent by the authorities? Quit giving me such a hard time! I'm not the murderer! I don't even know who was killed. I'm not the one you're looking for!";
@@ -2306,7 +2306,7 @@ morocc_in,51,101,3 script Geil 89,{
// Meutro
//============================================================
-morocc,82,292,5 script Muetro 84,{
+morocc,82,292,5 script Muetro 4_M_02,{
mes "[Muetro]";
if(tu_swordman == 15){
mes "You're just";
@@ -2347,7 +2347,7 @@ morocc,82,292,5 script Muetro 84,{
// Hans
//============================================================
-morocc,240,72,3 script Hans 86,{
+morocc,240,72,3 script Hans 4_M_04,{
mes "[Hans]";
if(tu_swordman == 15){
mes "Help me!";
@@ -2405,7 +2405,7 @@ morocc,240,72,3 script Hans 86,{
// Bankley
//============================================================
-morocc_in,12,156,3 script Bankley 97,{
+morocc_in,12,156,3 script Bankley 4W_M_01,{
if(tu_swordman > 19){
mes "^3355FFBankley had a pitiable";
mes "expression on his face.^000000";
diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt
index fc86e52c0..0c431951f 100644
--- a/npc/quests/first_class/tu_thief01.txt
+++ b/npc/quests/first_class/tu_thief01.txt
@@ -18,7 +18,7 @@
// Thief Trainer
//============================================================
-moc_ruins,66,164,4 script Thief Trainer#T 84,{
+moc_ruins,66,164,4 script Thief Trainer#T 4_M_02,{
mes "[Yierhan]";
if(Class == Job_Novice){
mes "Eh...?";
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 8c741719c..cafdade0e 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -18,7 +18,7 @@
// Floating NPCs to duplicate from.
//============================================================
-- script RelayDummy1::GuildRelay1 754,{
+- script RelayDummy1::GuildRelay1 4_M_SAGE_A,{
set .@name$,strnpcinfo(1);
if (.@name$ == "Buzz") {
set .@name2$,"Lenya";
@@ -1218,7 +1218,7 @@
}
}
-- script RelayDummy2::GuildRelay2 754,{
+- script RelayDummy2::GuildRelay2 4_M_SAGE_A,{
set .@name$,strnpcinfo(1);
getmapxy(.@m$,.@x,.@x,1);
set .@GID, GetCastleData(.@m$,1);
@@ -1727,7 +1727,7 @@
}
}
-- script RelayDummy3::GuildRelay3 754,{
+- script RelayDummy3::GuildRelay3 4_M_SAGE_A,{
set .@name$,strnpcinfo(1);
getmapxy(.@m$,.@x,.@x,1);
set .@GID, GetCastleData(.@m$,1);
@@ -2412,7 +2412,7 @@
close;
}
-- script GuildDummy4::GuildRelay4 754,{
+- script GuildDummy4::GuildRelay4 4_M_SAGE_A,{
set .@name$,strnpcinfo(1);
getmapxy(.@m$,.@x,.@x,1);
set .@GID, GetCastleData(.@m$,1);
@@ -3090,140 +3090,140 @@
// Luina 1
//============================================================
-aldeg_cas01,51,102,5 duplicate(GuildRelay1) Buzz#01 754,{
-aldeg_cas01,75,39,3 duplicate(GuildRelay2) Lenya#01 754,{
-aldeg_cas01,200,175,3 duplicate(GuildRelay3) Gealuve#01 754,{
-aldeg_cas01,59,224,3 duplicate(GuildRelay4) Pariz#01 754,{
+aldeg_cas01,51,102,5 duplicate(GuildRelay1) Buzz#01 4_M_SAGE_A,{
+aldeg_cas01,75,39,3 duplicate(GuildRelay2) Lenya#01 4_M_SAGE_A,{
+aldeg_cas01,200,175,3 duplicate(GuildRelay3) Gealuve#01 4_M_SAGE_A,{
+aldeg_cas01,59,224,3 duplicate(GuildRelay4) Pariz#01 4_M_SAGE_A,{
// Luina 2
//============================================================
-aldeg_cas02,120,51,5 duplicate(GuildRelay1) Buzz#02 754
-aldeg_cas02,180,184,3 duplicate(GuildRelay2) Lenya#02 754
-aldeg_cas02,62,65,3 duplicate(GuildRelay3) Gealuve#02 754
-aldeg_cas02,62,201,3 duplicate(GuildRelay4) Pariz#02 754
+aldeg_cas02,120,51,5 duplicate(GuildRelay1) Buzz#02 4_M_SAGE_A
+aldeg_cas02,180,184,3 duplicate(GuildRelay2) Lenya#02 4_M_SAGE_A
+aldeg_cas02,62,65,3 duplicate(GuildRelay3) Gealuve#02 4_M_SAGE_A
+aldeg_cas02,62,201,3 duplicate(GuildRelay4) Pariz#02 4_M_SAGE_A
// Luina 3
//============================================================
-aldeg_cas03,70,252,5 duplicate(GuildRelay1) Buzz#03 754
-aldeg_cas03,72,115,3 duplicate(GuildRelay2) Lenya#03 754
-aldeg_cas03,114,119,3 duplicate(GuildRelay3) Gealuve#03 754
-aldeg_cas03,188,181,3 duplicate(GuildRelay4) Pariz#03 754
+aldeg_cas03,70,252,5 duplicate(GuildRelay1) Buzz#03 4_M_SAGE_A
+aldeg_cas03,72,115,3 duplicate(GuildRelay2) Lenya#03 4_M_SAGE_A
+aldeg_cas03,114,119,3 duplicate(GuildRelay3) Gealuve#03 4_M_SAGE_A
+aldeg_cas03,188,181,3 duplicate(GuildRelay4) Pariz#03 4_M_SAGE_A
// Luina 4
//============================================================
-aldeg_cas04,31,116,5 duplicate(GuildRelay1) Buzz#04 754
-aldeg_cas04,66,117,3 duplicate(GuildRelay2) Lenya#04 754
-aldeg_cas04,24,80,3 duplicate(GuildRelay3) Gealuve#04 754
-aldeg_cas04,181,97,3 duplicate(GuildRelay4) Pariz#04 754
+aldeg_cas04,31,116,5 duplicate(GuildRelay1) Buzz#04 4_M_SAGE_A
+aldeg_cas04,66,117,3 duplicate(GuildRelay2) Lenya#04 4_M_SAGE_A
+aldeg_cas04,24,80,3 duplicate(GuildRelay3) Gealuve#04 4_M_SAGE_A
+aldeg_cas04,181,97,3 duplicate(GuildRelay4) Pariz#04 4_M_SAGE_A
// Luina 5
//============================================================
-aldeg_cas05,31,191,5 duplicate(GuildRelay1) Buzz#05 754
-aldeg_cas05,140,196,3 duplicate(GuildRelay2) Lenya#05 754
-aldeg_cas05,148,224,3 duplicate(GuildRelay3) Gealuve#05 754
-aldeg_cas05,165,51,3 duplicate(GuildRelay4) Pariz#05 754
+aldeg_cas05,31,191,5 duplicate(GuildRelay1) Buzz#05 4_M_SAGE_A
+aldeg_cas05,140,196,3 duplicate(GuildRelay2) Lenya#05 4_M_SAGE_A
+aldeg_cas05,148,224,3 duplicate(GuildRelay3) Gealuve#05 4_M_SAGE_A
+aldeg_cas05,165,51,3 duplicate(GuildRelay4) Pariz#05 4_M_SAGE_A
// Britoniah 1
//============================================================
-gefg_cas01,85,47,4 duplicate(GuildRelay1) Jody#01 754
-gefg_cas01,67,83,3 duplicate(GuildRelay2) Ron Haware#01 754
-gefg_cas01,184,40,3 duplicate(GuildRelay3) Vers#01 754
-gefg_cas01,35,34,6 duplicate(GuildRelay4) Gen Garish#01 754
+gefg_cas01,85,47,4 duplicate(GuildRelay1) Jody#01 4_M_SAGE_A
+gefg_cas01,67,83,3 duplicate(GuildRelay2) Ron Haware#01 4_M_SAGE_A
+gefg_cas01,184,40,3 duplicate(GuildRelay3) Vers#01 4_M_SAGE_A
+gefg_cas01,35,34,6 duplicate(GuildRelay4) Gen Garish#01 4_M_SAGE_A
// Britoniah 2
//============================================================
-gefg_cas02,15,69,4 duplicate(GuildRelay1) Jody#02 754
-gefg_cas02,23,22,3 duplicate(GuildRelay2) Ron Haware#02 754
-gefg_cas02,178,38,3 duplicate(GuildRelay3) Vers#02 754
-gefg_cas02,18,159,5 duplicate(GuildRelay4) Gen Garish#02 754
+gefg_cas02,15,69,4 duplicate(GuildRelay1) Jody#02 4_M_SAGE_A
+gefg_cas02,23,22,3 duplicate(GuildRelay2) Ron Haware#02 4_M_SAGE_A
+gefg_cas02,178,38,3 duplicate(GuildRelay3) Vers#02 4_M_SAGE_A
+gefg_cas02,18,159,5 duplicate(GuildRelay4) Gen Garish#02 4_M_SAGE_A
// Britoniah 3
//============================================================
-gefg_cas03,257,41,4 duplicate(GuildRelay1) Jody#03 754
-gefg_cas03,110,91,3 duplicate(GuildRelay2) Ron Haware#03 754
-gefg_cas03,158,57,3 duplicate(GuildRelay3) Vers#03 754
-gefg_cas03,124,24,3 duplicate(GuildRelay4) Gen Garish#03 754
+gefg_cas03,257,41,4 duplicate(GuildRelay1) Jody#03 4_M_SAGE_A
+gefg_cas03,110,91,3 duplicate(GuildRelay2) Ron Haware#03 4_M_SAGE_A
+gefg_cas03,158,57,3 duplicate(GuildRelay3) Vers#03 4_M_SAGE_A
+gefg_cas03,124,24,3 duplicate(GuildRelay4) Gen Garish#03 4_M_SAGE_A
// Britoniah 4
//============================================================
-gefg_cas04,26,73,4 duplicate(GuildRelay1) Jody#04 754
-gefg_cas04,34,16,1 duplicate(GuildRelay2) Ron Haware#04 754
-gefg_cas04,55,70,5 duplicate(GuildRelay3) Vers#04 754
-gefg_cas04,73,38,6 duplicate(GuildRelay4) Gen Garish#04 754
+gefg_cas04,26,73,4 duplicate(GuildRelay1) Jody#04 4_M_SAGE_A
+gefg_cas04,34,16,1 duplicate(GuildRelay2) Ron Haware#04 4_M_SAGE_A
+gefg_cas04,55,70,5 duplicate(GuildRelay3) Vers#04 4_M_SAGE_A
+gefg_cas04,73,38,6 duplicate(GuildRelay4) Gen Garish#04 4_M_SAGE_A
// Britoniah 5
//============================================================
-gefg_cas05,47,47,4 duplicate(GuildRelay1) Jody#05 754
-gefg_cas05,65,28,3 duplicate(GuildRelay2) Ron Haware#05 754
-gefg_cas05,87,31,3 duplicate(GuildRelay3) Vers#05 754
-gefg_cas05,46,28,3 duplicate(GuildRelay4) Gen Garish#05 754
+gefg_cas05,47,47,4 duplicate(GuildRelay1) Jody#05 4_M_SAGE_A
+gefg_cas05,65,28,3 duplicate(GuildRelay2) Ron Haware#05 4_M_SAGE_A
+gefg_cas05,87,31,3 duplicate(GuildRelay3) Vers#05 4_M_SAGE_A
+gefg_cas05,46,28,3 duplicate(GuildRelay4) Gen Garish#05 4_M_SAGE_A
// Greenwood Lake 1
//============================================================
-payg_cas01,87,35,3 duplicate(GuildRelay1) Chungye#01 106
-payg_cas01,129,29,3 duplicate(GuildRelay2) Dosuhlji#01 754
-payg_cas01,13,146,5 duplicate(GuildRelay3) Yayula#01 741
-payg_cas01,91,49,3 duplicate(GuildRelay4) Ashin#01 59
+payg_cas01,87,35,3 duplicate(GuildRelay1) Chungye#01 1_M_MOC_LORD
+payg_cas01,129,29,3 duplicate(GuildRelay2) Dosuhlji#01 4_M_SAGE_A
+payg_cas01,13,146,5 duplicate(GuildRelay3) Yayula#01 2_M_BARD_ORIENT
+payg_cas01,91,49,3 duplicate(GuildRelay4) Ashin#01 1_M_ORIENT01
// Greenwood Lake 2
//============================================================
-payg_cas02,34,253,3 duplicate(GuildRelay1) Chungye#02 106
-payg_cas02,77,229,3 duplicate(GuildRelay2) Dosuhlji#02 754
-payg_cas02,252,287,3 duplicate(GuildRelay3) Yayula#02 741
-payg_cas02,289,264,3 duplicate(GuildRelay4) Ashin#02 59
+payg_cas02,34,253,3 duplicate(GuildRelay1) Chungye#02 1_M_MOC_LORD
+payg_cas02,77,229,3 duplicate(GuildRelay2) Dosuhlji#02 4_M_SAGE_A
+payg_cas02,252,287,3 duplicate(GuildRelay3) Yayula#02 2_M_BARD_ORIENT
+payg_cas02,289,264,3 duplicate(GuildRelay4) Ashin#02 1_M_ORIENT01
// Greenwood Lake 3
//============================================================
-payg_cas03,48,265,3 duplicate(GuildRelay1) Chungye#03 106
-payg_cas03,7,265,5 duplicate(GuildRelay2) Dosuhlji#03 754
-payg_cas03,16,16,5 duplicate(GuildRelay3) Yayula#03 741
-payg_cas03,10,266,3 duplicate(GuildRelay4) Ashin#03 59
+payg_cas03,48,265,3 duplicate(GuildRelay1) Chungye#03 1_M_MOC_LORD
+payg_cas03,7,265,5 duplicate(GuildRelay2) Dosuhlji#03 4_M_SAGE_A
+payg_cas03,16,16,5 duplicate(GuildRelay3) Yayula#03 2_M_BARD_ORIENT
+payg_cas03,10,266,3 duplicate(GuildRelay4) Ashin#03 1_M_ORIENT01
// Greenwood Lake 4
//============================================================
-payg_cas04,24,285,3 duplicate(GuildRelay1) Chungye#04 106
-payg_cas04,21,16,3 duplicate(GuildRelay2) Dosuhlji#04 754
-payg_cas04,69,270,3 duplicate(GuildRelay3) Yayula#04 741
-payg_cas04,18,239,3 duplicate(GuildRelay4) Ashin#04 59
+payg_cas04,24,285,3 duplicate(GuildRelay1) Chungye#04 1_M_MOC_LORD
+payg_cas04,21,16,3 duplicate(GuildRelay2) Dosuhlji#04 4_M_SAGE_A
+payg_cas04,69,270,3 duplicate(GuildRelay3) Yayula#04 2_M_BARD_ORIENT
+payg_cas04,18,239,3 duplicate(GuildRelay4) Ashin#04 1_M_ORIENT01
// Greenwood Lake 5
//============================================================
-payg_cas05,277,271,3 duplicate(GuildRelay1) Chungye#05 106
-payg_cas05,273,15,3 duplicate(GuildRelay2) Dosuhlji#05 754
-payg_cas05,283,24,3 duplicate(GuildRelay3) Yayula#05 741
-payg_cas05,276,287,3 duplicate(GuildRelay4) Ashin#05 59
+payg_cas05,277,271,3 duplicate(GuildRelay1) Chungye#05 1_M_MOC_LORD
+payg_cas05,273,15,3 duplicate(GuildRelay2) Dosuhlji#05 4_M_SAGE_A
+payg_cas05,283,24,3 duplicate(GuildRelay3) Yayula#05 2_M_BARD_ORIENT
+payg_cas05,276,287,3 duplicate(GuildRelay4) Ashin#05 1_M_ORIENT01
// Valkyrie Realms 1
//============================================================
-prtg_cas01,96,205,5 duplicate(GuildRelay1) Hermod#01 754
-prtg_cas01,157,117,3 duplicate(GuildRelay2) Atila#01 728
-prtg_cas01,149,78,3 duplicate(GuildRelay3) Cecil#01 92
-prtg_cas01,125,191,3 duplicate(GuildRelay4) Diligo#01 754
+prtg_cas01,96,205,5 duplicate(GuildRelay1) Hermod#01 4_M_SAGE_A
+prtg_cas01,157,117,3 duplicate(GuildRelay2) Atila#01 4_F_JOB_KNIGHT
+prtg_cas01,149,78,3 duplicate(GuildRelay3) Cecil#01 4_F_03
+prtg_cas01,125,191,3 duplicate(GuildRelay4) Diligo#01 4_M_SAGE_A
// Valkyrie Realms 2
//============================================================
-prtg_cas02,73,35,5 duplicate(GuildRelay1) Hermod#02 754
-prtg_cas02,43,41,5 duplicate(GuildRelay2) Atila#02 728
-prtg_cas02,52,63,3 duplicate(GuildRelay3) Cecil#02 92
-prtg_cas02,100,62,3 duplicate(GuildRelay4) Diligo#02 754
+prtg_cas02,73,35,5 duplicate(GuildRelay1) Hermod#02 4_M_SAGE_A
+prtg_cas02,43,41,5 duplicate(GuildRelay2) Atila#02 4_F_JOB_KNIGHT
+prtg_cas02,52,63,3 duplicate(GuildRelay3) Cecil#02 4_F_03
+prtg_cas02,100,62,3 duplicate(GuildRelay4) Diligo#02 4_M_SAGE_A
// Valkyrie Realms 3
//============================================================
-prtg_cas03,5,68,5 duplicate(GuildRelay1) Hermod#03 754
-prtg_cas03,18,109,3 duplicate(GuildRelay2) Atila#03 728
-prtg_cas03,71,81,5 duplicate(GuildRelay3) Cecil#03 92
-prtg_cas03,183,215,3 duplicate(GuildRelay4) Diligo#03 754
+prtg_cas03,5,68,5 duplicate(GuildRelay1) Hermod#03 4_M_SAGE_A
+prtg_cas03,18,109,3 duplicate(GuildRelay2) Atila#03 4_F_JOB_KNIGHT
+prtg_cas03,71,81,5 duplicate(GuildRelay3) Cecil#03 4_F_03
+prtg_cas03,183,215,3 duplicate(GuildRelay4) Diligo#03 4_M_SAGE_A
// Valkyrie Realms 4
//============================================================
-prtg_cas04,39,263,3 duplicate(GuildRelay1) Hermod#04 754
-prtg_cas04,259,251,3 duplicate(GuildRelay2) Atila#04 728
-prtg_cas04,6,281,5 duplicate(GuildRelay3) Cecil#04 92
-prtg_cas04,59,282,5 duplicate(GuildRelay4) Diligo#04 754
+prtg_cas04,39,263,3 duplicate(GuildRelay1) Hermod#04 4_M_SAGE_A
+prtg_cas04,259,251,3 duplicate(GuildRelay2) Atila#04 4_F_JOB_KNIGHT
+prtg_cas04,6,281,5 duplicate(GuildRelay3) Cecil#04 4_F_03
+prtg_cas04,59,282,5 duplicate(GuildRelay4) Diligo#04 4_M_SAGE_A
// Valkyrie Realms 5
//============================================================
-prtg_cas05,52,70,5 duplicate(GuildRelay1) Hermod#05 754
-prtg_cas05,253,91,3 duplicate(GuildRelay2) Atila#05 728
-prtg_cas05,276,93,3 duplicate(GuildRelay3) Cecil#05 92
-prtg_cas05,211,36,3 duplicate(GuildRelay4) Diligo#05 754
+prtg_cas05,52,70,5 duplicate(GuildRelay1) Hermod#05 4_M_SAGE_A
+prtg_cas05,253,91,3 duplicate(GuildRelay2) Atila#05 4_F_JOB_KNIGHT
+prtg_cas05,276,93,3 duplicate(GuildRelay3) Cecil#05 4_F_03
+prtg_cas05,211,36,3 duplicate(GuildRelay4) Diligo#05 4_M_SAGE_A
diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt
index 8f57ea9f1..a37841f89 100644
--- a/npc/quests/gunslinger_quests.txt
+++ b/npc/quests/gunslinger_quests.txt
@@ -22,7 +22,7 @@
//= 1.7 Removed all 'menu' and 'goto'. [Euphy]
//============================================================
-que_ng,182,85,3 script Garrison 109,{
+que_ng,182,85,3 script Garrison 4_M_MANAGER,{
if(BaseJob != Job_Gunslinger)
{
@@ -424,7 +424,7 @@ lighthalzen,322,247,6 script Ravey 86,{
}
-que_ng,187,163,3 script Ingrid 744,{
+que_ng,187,163,3 script Ingrid 4_F_ALCHE,{
if(BaseJob != Job_Gunslinger)
{
@@ -597,7 +597,7 @@ SubInferno:
}
}
-que_ng,185,180,3 script Vanessa 726,{
+que_ng,185,180,3 script Vanessa 4_F_JOB_BLACKSMITH,{
if(BaseJob != Job_Gunslinger)
{
@@ -912,7 +912,7 @@ SubDestroyer_:
}
}
-que_ng,149,178,4 script Lab Director 744,{
+que_ng,149,178,4 script Lab Director 4_F_ALCHE,{
if(gun_na == 1){
if(countitem(1043) > 999 && countitem(932) > 999){
@@ -1381,7 +1381,7 @@ que_ng,149,178,4 script Lab Director 744,{
}
}
-lighthalzen,205,284,6 script F. Harrison 85,{
+lighthalzen,205,284,6 script F. Harrison 4_M_03,{
if (gun_na == 100){
if(checkweight(13102,1) == 0){
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index 058d3070a..3920de4b9 100644
--- a/npc/quests/juice_maker.txt
+++ b/npc/quests/juice_maker.txt
@@ -16,7 +16,7 @@
//= 2.1 Fixed dialog for if your missing the needed items (He always said the dialog for grape juice). [Kisuka]
//============================================================
-prt_in,49,172,3 script Marianne#juice 53,{
+prt_in,49,172,3 script Marianne#juice 1_M_INNKEEPER,{
if (MISC_QUEST&1 || morison_meat == 15) {
mes "[Housewife Marianne]";
mes "Whew...!";
@@ -77,7 +77,7 @@ prt_in,49,172,3 script Marianne#juice 53,{
close;
}
-prt_in,47,173,3 script Morrison#juice 97,{
+prt_in,47,173,3 script Morrison#juice 4W_M_01,{
if (MISC_QUEST&1 || morison_meat == 15) {
mes "[Little Morrison]";
mes "Bleh... Forget it.";
@@ -167,7 +167,7 @@ prt_in,47,173,3 script Morrison#juice 97,{
close;
}
-payon_in03,188,146,5 script Marx Hansen#juice 86,{
+payon_in03,188,146,5 script Marx Hansen#juice 4_M_04,{
if (checkweight(1201,1) == 0) {
mes "- Wait a moment! -";
mes "- Currently you're carrying -";
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index 32db582b8..ef15a7539 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -216,7 +216,7 @@
//----------------------------------------------------------------------------
// Juno Pub Master/Starting point.
//----------------------------------------------------------------------------
-yuno_in01,35,179,4 script Pub Master#kh 46,5,5,{
+yuno_in01,35,179,4 script Pub Master#kh 1_ETC_01,5,5,{
if (checkweight(7487,1) == 0) {
mes "[Vandt]";
mes "Just a second! You're";
@@ -453,7 +453,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Juno Toast Sales Girl.
//----------------------------------------------------------------------------
-yuno,217,114,6 script Little Kid#kh 96,{
+yuno,217,114,6 script Little Kid#kh 4W_KID,{
mes "[Cezu]";
if (KielHyreQuest < 6) {
mes "Fresh, crunchy toast!";
@@ -544,7 +544,7 @@ yuno,217,114,6 script Little Kid#kh 96,{
//----------------------------------------------------------------------------
// Lighthalzen WindMill Owner.
//----------------------------------------------------------------------------
-lighthalzen,366,299,4 script Windmill Owner#kh 46,{
+lighthalzen,366,299,4 script Windmill Owner#kh 1_ETC_01,{
if (checkweight(7488,1) == 0) {
mes "[Mills]";
mes "Hey, you've got too much";
@@ -616,7 +616,7 @@ lighthalzen,366,299,4 script Windmill Owner#kh 46,{
}
}
-lighthalzen,366,289,2 script Windmill Owner's Helper 97,{
+lighthalzen,366,289,2 script Windmill Owner's Helper 4W_M_01,{
if (KHToastGirlEnd < 1) {
mes "[Cutz]";
mes "Man, why are we";
@@ -652,7 +652,7 @@ lighthalzen,366,289,2 script Windmill Owner's Helper 97,{
//----------------------------------------------------------------------------
// Girl (Talks about the academy)
//----------------------------------------------------------------------------
-yuno_fild08,196,196,5 script Hanie#kh1 102,{
+yuno_fild08,196,196,5 script Hanie#kh1 8_F,{
mes "[Hanie]";
mes "Oh, I wish I could study";
mes "at the Kiel Hyre Academy...";
@@ -683,7 +683,7 @@ yuno_fild08,196,196,5 script Hanie#kh1 102,{
//----------------------------------------------------------------------------
// Academy Security Guards
//----------------------------------------------------------------------------
-yuno_fild08,158,194,6 script Security Guard#1::KHAGuard 852,{
+yuno_fild08,158,194,6 script Security Guard#1::KHAGuard 4_M_EIN_SOLDIER,{
if ((KielHyreQuest < 2) || (KielHyreQuest > 31)) {
mes "[Security Guard]";
mes "I'm sorry, but if you aren't";
@@ -793,12 +793,12 @@ yuno_fild08,158,194,6 script Security Guard#1::KHAGuard 852,{
}
}
-yuno_fild08,158,183,7 duplicate(KHAGuard) Security Guard#2 852
+yuno_fild08,158,183,7 duplicate(KHAGuard) Security Guard#2 4_M_EIN_SOLDIER
//----------------------------------------------------------------------------
// Gossiping Teenagers/Story NPCs
//----------------------------------------------------------------------------
-kh_school,57,142,6 script Student#kha 893,3,3,{
+kh_school,57,142,6 script Student#kha 4_F_HUWOMAN,3,3,{
mes "[Laci]";
mes "Oh, wow! We usually";
mes "don't get visitors on";
@@ -832,7 +832,7 @@ OnTouch:
close;
}
-kh_school,57,139,0 script Student#khb 893,{
+kh_school,57,139,0 script Student#khb 4_F_HUWOMAN,{
mes "[Gui Nesha]";
mes "Aren't we a little";
mes "old to be talking about";
@@ -847,7 +847,7 @@ kh_school,57,139,0 script Student#khb 893,{
//----------------------------------------------------------------------------
// Mrs. Lecollane
//----------------------------------------------------------------------------
-kh_school,176,60,4 script Lady#kh 101,{
+kh_school,176,60,4 script Lady#kh 4W_F_01,{
if (KielHyreQuest < 2) {
mes "[Mrs. Lecollane]";
mes "Is there a problem?";
@@ -928,7 +928,7 @@ kh_school,176,60,4 script Lady#kh 101,{
//----------------------------------------------------------------------------
// Elly (In school)
//----------------------------------------------------------------------------
-kh_school,179,39,0 script Cute Student#kh 895,{
+kh_school,179,39,0 script Cute Student#kh 4_F_KHELLY,{
if (checkweight(908,200) == 0) {
mes "[Elly]";
mes "I'm sorry, but would you";
@@ -1475,7 +1475,7 @@ kh_school,179,39,0 script Cute Student#kh 895,{
//----------------------------------------------------------------------------
// Elly's Window
//----------------------------------------------------------------------------
-yuno_fild08,69,185,0 script Window#kh 111,{
+yuno_fild08,69,185,0 script Window#kh HIDDEN_NPC,{
if (KielHyreQuest < 29) {
mes "^3355FFYou can see a curtain";
mes "decorated with a cute";
@@ -1541,7 +1541,7 @@ yuno_fild08,69,185,0 script Window#kh 111,{
//----------------------------------------------------------------------------
// Elly (In Dormitory)
//----------------------------------------------------------------------------
-kh_school,178,180,4 script Elly 895,{
+kh_school,178,180,4 script Elly 4_F_KHELLY,{
if (checkweight(908,200) == 0) {
mes "^3355FFJust a second...";
mes "You're carrying too";
@@ -1720,7 +1720,7 @@ kh_school,178,180,4 script Elly 895,{
//----------------------------------------------------------------------------
// Cookie Basket
//----------------------------------------------------------------------------
-kh_school,175,176,0 script Cookie Basket#kh 111,{
+kh_school,175,176,0 script Cookie Basket#kh HIDDEN_NPC,{
if (KielHyreQuest < 30) {
mes "^3355FFIt's a cookie";
mes "basket filled with";
@@ -1830,7 +1830,7 @@ kh_school,175,176,0 script Cookie Basket#kh 111,{
//----------------------------------------------------------------------------
// Elly's Window (In Dormitory)
//----------------------------------------------------------------------------
-kh_school,188,185,0 script Window#kh2 111,{
+kh_school,188,185,0 script Window#kh2 HIDDEN_NPC,{
warp "yuno_fild08",69,183;
end;
}
@@ -1838,7 +1838,7 @@ kh_school,188,185,0 script Window#kh2 111,{
//----------------------------------------------------------------------------
// Grave/Kiel Hyre dungeon entry
//----------------------------------------------------------------------------
-yuno_fild08,71,170,0 script Grave#kh 111,{
+yuno_fild08,71,170,0 script Grave#kh HIDDEN_NPC,{
if (KielHyreQuest < 36) {
mes "^3355FFIt's just a grave.";
mes "It might be important";
@@ -1964,7 +1964,7 @@ yuno_fild08,71,170,0 script Grave#kh 111,{
//----------------------------------------------------------------------------
// Cottage Keeper
//----------------------------------------------------------------------------
-yuno_fild02,93,210,4 script Cottage Keeper#kh 85,{
+yuno_fild02,93,210,4 script Cottage Keeper#kh 4_M_03,{
if ((KielHyreQuest < 12) || (KielHyreQuest > 12)) {
mes "[Cottage Keeper]";
mes "This is private property,";
@@ -2015,7 +2015,7 @@ yuno_fild02,93,210,4 script Cottage Keeper#kh 85,{
//----------------------------------------------------------------------------
// Cottage Door (left)
//----------------------------------------------------------------------------
-yuno_fild02,75,218,0 script Door#kh2 111,{
+yuno_fild02,75,218,0 script Door#kh2 HIDDEN_NPC,{
if (KielHyreQuest < 16) {
mes "^3355FFThis door is locked.";
mes "If someone inside won't";
@@ -2069,7 +2069,7 @@ yuno_fild02,75,218,0 script Door#kh2 111,{
//----------------------------------------------------------------------------
// Cottage Door (Right)
//----------------------------------------------------------------------------
-yuno_fild02,109,218,0 script Door#kh1 111,{
+yuno_fild02,109,218,0 script Door#kh1 HIDDEN_NPC,{
if (KielHyreQuest != 16) {
mes "^3355FFThis door is locked.";
mes "If someone inside won't";
@@ -2102,7 +2102,7 @@ yuno_fild02,109,218,0 script Door#kh1 111,{
//----------------------------------------------------------------------------
// Store room interior; Wall
//----------------------------------------------------------------------------
-kh_vila,191,14,0 script Wall#kh 139,1,1,{
+kh_vila,191,14,0 script Wall#kh HIDDEN_WARP_NPC,1,1,{
if (KielHyreQuest < 28) {
mes "^3355FFIt's just a wall.";
mes "It's not particularly";
@@ -2127,7 +2127,7 @@ kh_vila,191,14,0 script Wall#kh 139,1,1,{
//----------------------------------------------------------------------------
// Store room interior; books
//----------------------------------------------------------------------------
-kh_vila,184,20,0 script Book#kh1::BookKHQ1 111,{
+kh_vila,184,20,0 script Book#kh1::BookKHQ1 HIDDEN_NPC,{
if (KielHyreQuest != 26) {
mes "^3355FFThis bookshelf is^000000";
mes "^3355FFcrammed with many^000000";
@@ -2156,9 +2156,9 @@ kh_vila,184,20,0 script Book#kh1::BookKHQ1 111,{
}
}
-kh_vila,181,20,0 duplicate(BookKHQ1) Book#kh2 111
-kh_vila,178,20,0 duplicate(BookKHQ1) Book#kh3 111
-kh_vila,175,19,0 duplicate(BookKHQ1) Book#kh4 111
+kh_vila,181,20,0 duplicate(BookKHQ1) Book#kh2 HIDDEN_NPC
+kh_vila,178,20,0 duplicate(BookKHQ1) Book#kh3 HIDDEN_NPC
+kh_vila,175,19,0 duplicate(BookKHQ1) Book#kh4 HIDDEN_NPC
//----------------------------------------------------------------------------
// Store room interior; Letter to Elly on the floor.
@@ -2195,7 +2195,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Cottage interior, kitchen; Box (Pet Food vending machine)
//----------------------------------------------------------------------------
-kh_vila,16,175,0 script Box#khp1 111,{
+kh_vila,16,175,0 script Box#khp1 HIDDEN_NPC,{
mes "^FFFFFF##^000000*Tasty-Nutricious-Delicious*";
mes "*Cute Pet Doof Vending Machine*";
mes "The best food for your Cute Pets";
@@ -2241,7 +2241,7 @@ kh_vila,16,175,0 script Box#khp1 111,{
//----------------------------------------------------------------------------
// Cottage interior, kitchen; Apple Box (Useless?)
//----------------------------------------------------------------------------
-kh_vila,30,184,0 script Apple Box#khp1 111,{
+kh_vila,30,184,0 script Apple Box#khp1 HIDDEN_NPC,{
mes "^3355FFYou find a box filled with";
mes "ripe, delicious apples.^000000";
next;
@@ -2268,7 +2268,7 @@ kh_vila,30,184,0 script Apple Box#khp1 111,{
//----------------------------------------------------------------------------
// Cottage interior, dining room; Map
//----------------------------------------------------------------------------
-kh_vila,44,126,0 script Map#khp1 111,{
+kh_vila,44,126,0 script Map#khp1 HIDDEN_NPC,{
if ((KHCottagePoem1 < 2) && (KielHyreQuest < 30)) {
mes "^3355FFA magnificent world map,";
mes "detailing the Rune-Midgarts";
@@ -2382,7 +2382,7 @@ kh_vila,44,126,0 script Map#khp1 111,{
//----------------------------------------------------------------------------
// Cottage interior, kitchen; Pot
//----------------------------------------------------------------------------
-kh_vila,33,184,0 script Pot#khp1 111,{
+kh_vila,33,184,0 script Pot#khp1 HIDDEN_NPC,{
if (KHCottagePoem1 < 1) {
mes "^3355FFYou've found a pot";
mes "filled with boiling,";
@@ -2424,7 +2424,7 @@ kh_vila,33,184,0 script Pot#khp1 111,{
//----------------------------------------------------------------------------
// Cottage interior, fire place; Calabash
//----------------------------------------------------------------------------
-kh_vila,14,55,0 script Calabash#khp1 111,{
+kh_vila,14,55,0 script Calabash#khp1 HIDDEN_NPC,{
if ((countitem(7329) < 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 38)) {
if (checkweight(7329,1) == 0) {
mes "^3355FFThat's a nice looking";
@@ -2478,7 +2478,7 @@ kh_vila,14,55,0 script Calabash#khp1 111,{
//----------------------------------------------------------------------------
// Cottage interior, garden; Pool
//----------------------------------------------------------------------------
-kh_vila,39,41,0 script Pool#khp1 111,{
+kh_vila,39,41,0 script Pool#khp1 HIDDEN_NPC,{
if ((KHCottagePoem1 < 3) && (KielHyreQuest < 30)) {
mes "^3355FFYou find a fancy pool";
mes "filled with fresh water.^000000";
@@ -2560,7 +2560,7 @@ kh_vila,39,41,0 script Pool#khp1 111,{
//----------------------------------------------------------------------------
// Cottage interior, upstairs; Vicious Dog
//----------------------------------------------------------------------------
-kh_vila,181,178,4 script Vicious Dog#khp1 81,7,3,{
+kh_vila,181,178,4 script Vicious Dog#khp1 4_DOG01,7,3,{
//OnTouch2:
OnTouch:
mes "*Grrr~*";
@@ -2625,7 +2625,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Cottage interior, upstairs; Drawer, first room nightstand
//----------------------------------------------------------------------------
-kh_vila,115,186,0 script Drawer#khp1 111,{
+kh_vila,115,186,0 script Drawer#khp1 HIDDEN_NPC,{
if (checkweight(7492,1) == 0) {
mes "^3355FFThere's something inside";
mes "this drawer, but you can't";
@@ -2669,7 +2669,7 @@ kh_vila,115,186,0 script Drawer#khp1 111,{
//----------------------------------------------------------------------------
// Cottage interior, upstairs; Box
//----------------------------------------------------------------------------
-kh_vila,107,126,0 script Box#khp2 111,{
+kh_vila,107,126,0 script Box#khp2 HIDDEN_NPC,{
if ((countitem(7329) < 1) && (countitem(7516) < 1) && (countitem(7491) < 1) && (KielHyreQuest < 38)) {
mes "^3355FFA solid box is laid";
mes "on the floor in which";
@@ -2716,7 +2716,7 @@ kh_vila,107,126,0 script Box#khp2 111,{
//----------------------------------------------------------------------------
// Cottage interior, upstairs; Bookshelf.
//----------------------------------------------------------------------------
-kh_vila,181,138,0 script Bookshelf#khp1 111,{
+kh_vila,181,138,0 script Bookshelf#khp1 HIDDEN_NPC,{
if ((countitem(7491) < 1) && (countitem(7329) >= 1) || (countitem(7516) >= 1)) {
mes "^3355FFOne of the books on";
mes "this crammed bookshelf";
@@ -2826,7 +2826,7 @@ kh_vila,181,138,0 script Bookshelf#khp1 111,{
//----------------------------------------------------------------------------
// Cottage interior, upstairs; Desk
//----------------------------------------------------------------------------
-kh_vila,118,144,0 script Desk#khp1 111,{
+kh_vila,118,144,0 script Desk#khp1 HIDDEN_NPC,{
if (KHCottagePoem2 < 1) {
mes "^3355FFThere are piles of papers";
mes "and books stacked on top";
@@ -2861,7 +2861,7 @@ kh_vila,118,144,0 script Desk#khp1 111,{
//----------------------------------------------------------------------------
// Cottage interior, upstairs; Medicine Chest
//----------------------------------------------------------------------------
-kh_vila,123,170,0 script Medicine Chest#khp1 111,{
+kh_vila,123,170,0 script Medicine Chest#khp1 HIDDEN_NPC,{
if ((KHCottagePoem2 < 1) && (KielHyreQuest < 30)) {
mes "^3355FFThis medicine cabinet";
mes "is filled with bottles of";
@@ -3007,7 +3007,7 @@ kh_vila,123,170,0 script Medicine Chest#khp1 111,{
//----------------------------------------------------------------------------
// Cottage interior, stair case; Sword hilt
//----------------------------------------------------------------------------
-kh_vila,136,68,0 script Sword Hilt#kh 111,{
+kh_vila,136,68,0 script Sword Hilt#kh HIDDEN_NPC,{
if ((KHCottagePoem1 < 3) || (KHCottagePoem2 < 2) && (KielHyreQuest < 30)) {
mes "^3355FFThere are four elaborately";
mes "designed swords positioned";
@@ -3148,7 +3148,7 @@ kh_vila,136,68,0 script Sword Hilt#kh 111,{
//----------------------------------------------------------------------------
// Cottage interior, Secret Room; left test tube
//----------------------------------------------------------------------------
-kh_vila,179,68,0 script Test Tube#khp2 111,{
+kh_vila,179,68,0 script Test Tube#khp2 HIDDEN_NPC,{
mes "^3355FFThis test tube contains";
mes "a young man dressed in";
mes "a Kiel Hyre Academy";
@@ -3162,7 +3162,7 @@ kh_vila,179,68,0 script Test Tube#khp2 111,{
//----------------------------------------------------------------------------
// Cottage interior, Secret Room; Right test tube
//----------------------------------------------------------------------------
-kh_vila,185,68,0 script Test Tube::TestTubeKHQ2 111,{
+kh_vila,185,68,0 script Test Tube::TestTubeKHQ2 HIDDEN_NPC,{
if (KielHyreQuest > 28) {
mes "^3355FFA strange looking,";
mes "wizened old man is";
@@ -3250,7 +3250,7 @@ kh_vila,185,68,0 script Test Tube::TestTubeKHQ2 111,{
//----------------------------------------------------------------------------
// Robotic's Factory; Heavy Door
//----------------------------------------------------------------------------
-kh_dun01,235,48,0 script Heavy Door#kh1::HeavyDoorKHQ1 111,{
+kh_dun01,235,48,0 script Heavy Door#kh1::HeavyDoorKHQ1 HIDDEN_NPC,{
if (KielHyreQuest < 38) {
mes "^3355FFThere is a large, heavy";
mes "door infront of you.^000000";
@@ -3312,7 +3312,7 @@ kh_dun01,235,48,0 script Heavy Door#kh1::HeavyDoorKHQ1 111,{
//----------------------------------------------------------------------------
// Robotic's Factory; Heavy Door (These doors don't seem to serve any purpose)
//----------------------------------------------------------------------------
-kh_dun01,76,233,0 script Heavy Door::HeavyDoorKHQ2 111,{
+kh_dun01,76,233,0 script Heavy Door::HeavyDoorKHQ2 HIDDEN_NPC,{
if ((KielHyreQuest >= 38) && (KielHyreQuest < 46)) {
mes "^3355FFThere is a large, heavy";
mes "door infront of you.^000000";
@@ -3340,20 +3340,20 @@ kh_dun01,76,233,0 script Heavy Door::HeavyDoorKHQ2 111,{
}
}
-kh_dun01,106,233,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh3 111
-kh_dun01,6,164,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh4 111
-kh_dun01,6,133,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh5 111
-kh_dun01,6,60,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh6 111
-kh_dun01,6,30,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh7 111
-kh_dun01,6,18,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh8 111
-kh_dun01,235,70,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh9 111
-kh_dun01,235,92,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh10 111
-kh_dun01,235,114,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh11 111
+kh_dun01,106,233,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh3 HIDDEN_NPC
+kh_dun01,6,164,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh4 HIDDEN_NPC
+kh_dun01,6,133,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh5 HIDDEN_NPC
+kh_dun01,6,60,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh6 HIDDEN_NPC
+kh_dun01,6,30,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh7 HIDDEN_NPC
+kh_dun01,6,18,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh8 HIDDEN_NPC
+kh_dun01,235,70,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh9 HIDDEN_NPC
+kh_dun01,235,92,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh10 HIDDEN_NPC
+kh_dun01,235,114,0 duplicate(HeavyDoorKHQ2) Heavy Door#kh11 HIDDEN_NPC
//----------------------------------------------------------------------------
// Beautiful Lady and Beautiful Lady copies.
//----------------------------------------------------------------------------
-kh_school,119,149,4 script Beautiful Lady#kh1::BeatifulLadyKHQ1 894,{
+kh_school,119,149,4 script Beautiful Lady#kh1::BeatifulLadyKHQ1 4_F_KHELLISIA,{
cutin "kh_ellisia",2;
if (KielHyreQuest < 40) {
mes "[Allysia]";
@@ -3432,17 +3432,17 @@ kh_school,119,149,4 script Beautiful Lady#kh1::BeatifulLadyKHQ1 894,{
}
-kh_school,117,149,4 script Beautiful lady#kh2::BeatifulLadyKHQ2 894,{
+kh_school,117,149,4 script Beautiful lady#kh2::BeatifulLadyKHQ2 4_F_KHELLISIA,{
end;
}
-kh_school,118,149,4 duplicate(BeatifulLadyKHQ2) Beautiful lady#kh3 894
-kh_school,120,149,4 duplicate(BeatifulLadyKHQ2) Beautiful lady#kh4 894
-kh_school,121,149,4 duplicate(BeatifulLadyKHQ1) Beautiful lady#kh5 894
+kh_school,118,149,4 duplicate(BeatifulLadyKHQ2) Beautiful lady#kh3 4_F_KHELLISIA
+kh_school,120,149,4 duplicate(BeatifulLadyKHQ2) Beautiful lady#kh4 4_F_KHELLISIA
+kh_school,121,149,4 duplicate(BeatifulLadyKHQ1) Beautiful lady#kh5 4_F_KHELLISIA
//----------------------------------------------------------------------------
// Beautiful Lady "Allysia"
//----------------------------------------------------------------------------
-kh_school,122,186,4 script Beautiful Lady#kh6 894,{
+kh_school,122,186,4 script Beautiful Lady#kh6 4_F_KHELLISIA,{
if (checkweight(7496,1) == 0) {
mes "^3355FFJust a second...";
mes "You're carrying too";
@@ -3618,7 +3618,7 @@ kh_school,122,186,4 script Beautiful Lady#kh6 894,{
//----------------------------------------------------------------------------
// Signboard (another useless NPC?)
//----------------------------------------------------------------------------
-kh_dun01,163,223,4 script Signboard#kh 857,{
+kh_dun01,163,223,4 script Signboard#kh 4_BOARD3,{
mes "[Notice]";
mes "Cute Pets are prohibited";
mes "in this area. (Cute Pets that";
@@ -3631,7 +3631,7 @@ kh_dun01,163,223,4 script Signboard#kh 857,{
//----------------------------------------------------------------------------
// Mechanical Devices for accessing restricted area
//----------------------------------------------------------------------------
-kh_dun01,166,223,0 script Mechanical Device#kh::KHKeyardReader 111,{
+kh_dun01,166,223,0 script Mechanical Device#kh::KHKeyardReader HIDDEN_NPC,{
if ((KielHyreQuest <= 38) || (KielHyreQuest >= 44)) {
mes "^3355FFYou encounter";
mes "a mechanical device.";
@@ -3662,7 +3662,7 @@ kh_dun01,166,223,0 script Mechanical Device#kh::KHKeyardReader 111,{
}
}
-kh_dun01,162,206,0 duplicate(KHKeyardReader) Mechanical Device 111
+kh_dun01,162,206,0 duplicate(KHKeyardReader) Mechanical Device HIDDEN_NPC
//----------------------------------------------------------------------------
// Keep monsters out of the quest area.
@@ -3754,7 +3754,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Robot Factory Second Floor Entrances
//----------------------------------------------------------------------------
-kh_dun01,44,203,0 script Entrance Device#khd2::KHAccess 111,{
+kh_dun01,44,203,0 script Entrance Device#khd2::KHAccess HIDDEN_NPC,{
if (countitem(7509) < 1) {
mes "^3355FFYou encounter";
mes "a mechanical device.";
@@ -3801,7 +3801,7 @@ kh_dun01,44,203,0 script Entrance Device#khd2::KHAccess 111,{
}
}
-kh_dun01,36,195,0 duplicate(KHAccess) Entrance Device#khd1 111
+kh_dun01,36,195,0 duplicate(KHAccess) Entrance Device#khd1 HIDDEN_NPC
//============================================================================
// Kiel Hyre Mansion NPCs, and Kiehl's Room NPCs
@@ -3810,7 +3810,7 @@ kh_dun01,36,195,0 duplicate(KHAccess) Entrance Device#khd1 111
//----------------------------------------------------------------------------
// Kiel's Steward
//----------------------------------------------------------------------------
-kh_mansion,78,55,5 script Steward#kh 109,{
+kh_mansion,78,55,5 script Steward#kh 4_M_MANAGER,{
if (KielHyreQuest < 46) {
mes "[Steward]";
mes "This is a private residence,";
@@ -3912,7 +3912,7 @@ kh_mansion,78,55,5 script Steward#kh 109,{
//----------------------------------------------------------------------------
// Kiel Hyre
//----------------------------------------------------------------------------
-kh_mansion,22,28,4 script Kiel Hyre#kh 903,{
+kh_mansion,22,28,4 script Kiel Hyre#kh 4_M_KHKYEL,{
if (checkweight(908,200) == 0) {
mes "^3355FFJust a second...";
mes "You're carrying too";
@@ -4684,7 +4684,7 @@ kh_mansion,22,28,4 script Kiel Hyre#kh 903,{
//----------------------------------------------------------------------------
// Allysia
//----------------------------------------------------------------------------
-kh_mansion,18,30,4 script Allysia 894,{
+kh_mansion,18,30,4 script Allysia 4_F_KHELLISIA,{
if (KielHyreQuest < 46) {
mes "[Allysia]";
mes "Who are you?";
@@ -4870,7 +4870,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Mysterious Woman "Mitchell Layla"
//----------------------------------------------------------------------------
-kh_mansion,25,79,4 script Mysterious Woman#kh 727,3,3,{
+kh_mansion,25,79,4 script Mysterious Woman#kh 4_F_JOB_HUNTER,3,3,{
//OnTouch2:
OnTouch:
@@ -5156,7 +5156,7 @@ OnTouch:
// - Anyone can enter
// - After 30-40 seonds this NPC should be disabled.
//----------------------------------------------------------------------------
-kh_mansion,29,27,0 script Kiehl_Room_Warp 45,2,2,{
+kh_mansion,29,27,0 script Kiehl_Room_Warp WARPNPC,2,2,{
OnTouch:
warp "kh_kiehl01",10,31;
end;
@@ -5184,7 +5184,7 @@ OnInit:
//----------------------------------------------------------------------------
// Odd Grandma
//----------------------------------------------------------------------------
-yuno,257,140,4 script Odd Grandma 846,{
+yuno,257,140,4 script Odd Grandma 4_F_EINOLD,{
if (KielHyreQuest < 54) {
mes "[Grandma]";
mes "Where did you go,";
@@ -5274,7 +5274,7 @@ yuno,257,140,4 script Odd Grandma 846,{
//----------------------------------------------------------------------------
// Old Lady; gives you the key to the Rosimier Mansion
//----------------------------------------------------------------------------
-yuno,250,132,0 script Old Lady#kh 711,{
+yuno,250,132,0 script Old Lady#kh 4_F_05,{
if (KielHyreQuest < 56) {
mes "[Old Lady]";
mes "Oooh, my legs and back";
@@ -5442,7 +5442,7 @@ yuno,250,132,0 script Old Lady#kh 711,{
//----------------------------------------------------------------------------
// Warp portal into Rosimier Mansion
//----------------------------------------------------------------------------
-yuno,273,141,0 script Rosimmir_Entrance 45,2,2,{
+yuno,273,141,0 script Rosimmir_Entrance WARPNPC,2,2,{
OnTouch:
if (countitem(7498) < 1) {
mes "That mansion seems to have";
@@ -5461,7 +5461,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Rosimier Mansion, first floor; Table
//----------------------------------------------------------------------------
-kh_rossi,23,23,0 script Table#khr2 111,{
+kh_rossi,23,23,0 script Table#khr2 HIDDEN_NPC,{
if (checkweight(7499,1) == 0) {
mes "^3355FFJust a second...";
mes "You're carrying too";
@@ -5504,7 +5504,7 @@ kh_rossi,23,23,0 script Table#khr2 111,{
//----------------------------------------------------------------------------
// Rosimier Mansion, first floor; Shelf
//----------------------------------------------------------------------------
-kh_rossi,92,40,0 script Shelf#khr 111,{
+kh_rossi,92,40,0 script Shelf#khr HIDDEN_NPC,{
if (checkweight(7500,1) == 0) {
mes "^3355FFJust a second...";
mes "You're carrying too";
@@ -5577,7 +5577,7 @@ kh_rossi,92,40,0 script Shelf#khr 111,{
//----------------------------------------------------------------------------
// Rosimier Mansion, top floor; Desk
//----------------------------------------------------------------------------
-kh_rossi,144,286,0 script Desk#khr3 111,{
+kh_rossi,144,286,0 script Desk#khr3 HIDDEN_NPC,{
if (checkweight(7501,1) == 0) {
mes "^3355FFJust a second...";
mes "You're carrying too";
@@ -5642,7 +5642,7 @@ kh_rossi,144,286,0 script Desk#khr3 111,{
//----------------------------------------------------------------------------
// Rosimier Mansion, top floor; Bookshelf
//----------------------------------------------------------------------------
-kh_rossi,148,288,0 script Bookshelf#khr 111,{
+kh_rossi,148,288,0 script Bookshelf#khr HIDDEN_NPC,{
if (checkweight(7502,1) == 0) {
mes "^3355FFJust a second...";
mes "You're carrying too";
@@ -5686,7 +5686,7 @@ kh_rossi,148,288,0 script Bookshelf#khr 111,{
//----------------------------------------------------------------------------
// Rosimier Mansion, top floor; Bed
//----------------------------------------------------------------------------
-kh_rossi,154,286,0 script Bed#khr 111,{
+kh_rossi,154,286,0 script Bed#khr HIDDEN_NPC,{
if (KielHyreQuest < 58) {
mes "^3355FFYou found a well made";
mes "bed that has collected";
@@ -5725,7 +5725,7 @@ kh_rossi,154,286,0 script Bed#khr 111,{
//----------------------------------------------------------------------------
// Fisherman
//----------------------------------------------------------------------------
-yuno_fild12,232,222,0 script Old Fisherman 709,{
+yuno_fild12,232,222,0 script Old Fisherman 4_M_SEAMAN,{
if (KielHyreQuest < 60) {
mes "[Fisherman]";
mes "These days, it's much";
@@ -5833,7 +5833,7 @@ yuno_fild12,232,222,0 script Old Fisherman 709,{
//----------------------------------------------------------------------------
// Kiel Hyre's hut; Wooden Board
//----------------------------------------------------------------------------
-yuno_fild09,158,217,0 script Wooden Board#kh 111,{
+yuno_fild09,158,217,0 script Wooden Board#kh HIDDEN_NPC,{
if (checkweight(7503,1) == 0) {
mes "^3355FFJust a second...";
mes "You're carrying too";
@@ -5888,7 +5888,7 @@ yuno_fild09,158,217,0 script Wooden Board#kh 111,{
//----------------------------------------------------------------------------
// Kiehl's Room; Receiver (Gives black keycards upon killing mobs)
//----------------------------------------------------------------------------
-kh_kiehl01,17,39,0 script Receiver#kh 111,{
+kh_kiehl01,17,39,0 script Receiver#kh HIDDEN_NPC,{
if (mobcount("kh_kiehl01","Receiver#kh::OnMyMobDead") < 1) {
mes "^333333*BBBZZZ*^000000";
if (KielHyreQuest == 74) {
@@ -5922,7 +5922,7 @@ OnMyMobDead:
//----------------------------------------------------------------------------
// Kiehl's Room; Flower Vase (Gives...password...for Box)
//----------------------------------------------------------------------------
-kh_kiehl01,13,40,0 script Flower Vase#kh1 111,{
+kh_kiehl01,13,40,0 script Flower Vase#kh1 HIDDEN_NPC,{
if (KielHyreQuest < 74) {
mes "^3355FFYou found";
mes "a flower vase.^000000";
@@ -5975,7 +5975,7 @@ kh_kiehl01,13,40,0 script Flower Vase#kh1 111,{
//----------------------------------------------------------------------------
// Kiehl's Room; Box
//----------------------------------------------------------------------------
-kh_kiehl01,19,25,0 script Box#kh1 111,{
+kh_kiehl01,19,25,0 script Box#kh1 HIDDEN_NPC,{
if (checkweight(7505,1) == 0) {
mes "^3355FFJust a second...";
mes "You're carrying too";
@@ -6035,7 +6035,7 @@ kh_kiehl01,19,25,0 script Box#kh1 111,{
// - Consume one Black KeyCard when opened.
// - Only one person actually needs to open it.
//----------------------------------------------------------------------------
-kh_kiehl01,44,33,0 script Big Door#BigDoorKHQ1 111,{
+kh_kiehl01,44,33,0 script Big Door#BigDoorKHQ1 HIDDEN_NPC,{
if (.KHDoor1Opened == 0) {
mes "^3355FFThe door is locked,";
mes "but there is a narrow";
@@ -6069,7 +6069,7 @@ kh_kiehl01,44,33,0 script Big Door#BigDoorKHQ1 111,{
}
}
-kh_kiehl01,43,33,0 script Big_Door_1_Warp 45,1,1,{
+kh_kiehl01,43,33,0 script Big_Door_1_Warp WARPNPC,1,1,{
OnEnable:
initnpctimer;
specialeffect EF_SUMMONSLAVE;
@@ -6096,7 +6096,7 @@ OnTouch:
// - Consume Toy Key when opened.
// - Only one person actually needs to open it.
//----------------------------------------------------------------------------
-kh_kiehl01,174,40,0 script Big Door#BigDoorKHQ2 111,{
+kh_kiehl01,174,40,0 script Big Door#BigDoorKHQ2 HIDDEN_NPC,{
if (.KHDoor2Opened == 0) {
mes "^3355FFThe door is locked,";
mes "but there is a small";
@@ -6129,7 +6129,7 @@ kh_kiehl01,174,40,0 script Big Door#BigDoorKHQ2 111,{
}
}
-kh_kiehl01,174,39,0 script Big_Door_2_Warp 45,1,1,{
+kh_kiehl01,174,39,0 script Big_Door_2_Warp WARPNPC,1,1,{
OnEnable:
initnpctimer;
specialeffect EF_SUMMONSLAVE;
@@ -6156,7 +6156,7 @@ OnTouch:
// - Consume one Black KeyCard when opened.
// - Only one person actually needs to open it.
//----------------------------------------------------------------------------
-kh_kiehl01,77,108,0 script Big Door#BigDoorKHQ3 111,{
+kh_kiehl01,77,108,0 script Big Door#BigDoorKHQ3 HIDDEN_NPC,{
if (.KHDoor3Opened == 0) {
mes "^3355FFThe door is locked,";
mes "but there is a narrow";
@@ -6189,7 +6189,7 @@ kh_kiehl01,77,108,0 script Big Door#BigDoorKHQ3 111,{
}
}
-kh_kiehl01,78,108,0 script Big_Door_3_Warp 45,1,1,{
+kh_kiehl01,78,108,0 script Big_Door_3_Warp WARPNPC,1,1,{
OnEnable:
initnpctimer;
specialeffect EF_SUMMONSLAVE;
@@ -6216,7 +6216,7 @@ OnTouch:
// - Consume TWO Black KeyCard when opened.
// - Only one person actually needs to open it.
//----------------------------------------------------------------------------
-kh_kiehl01,42,177,0 script Big Door#BigDoorKHQ4 111,{
+kh_kiehl01,42,177,0 script Big Door#BigDoorKHQ4 HIDDEN_NPC,{
if (.KHDoor4Opened == 0) {
mes "^3355FFThe door is locked,";
mes "but there is a narrow";
@@ -6249,7 +6249,7 @@ kh_kiehl01,42,177,0 script Big Door#BigDoorKHQ4 111,{
}
}
-kh_kiehl01,41,177,0 script Big_Door_4_Warp 45,1,1,{
+kh_kiehl01,41,177,0 script Big_Door_4_Warp WARPNPC,1,1,{
OnEnable:
initnpctimer;
specialeffect EF_SUMMONSLAVE;
@@ -6274,7 +6274,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Kiehl's Room; Robots
//----------------------------------------------------------------------------
-kh_kiehl01,15,179,0 script Robots#kh1 111,{
+kh_kiehl01,15,179,0 script Robots#kh1 HIDDEN_NPC,{
if (mobcount("kh_kiehl01","Robots#kh1::OnMyMobDead") < 1) {
mes "^3355FFAs soon as you";
mes "touch the test tube,";
@@ -6301,22 +6301,22 @@ OnMyMobDead:
//----------------------------------------------------------------------------
// Kiehl's Room; Dummy Robots
//----------------------------------------------------------------------------
-kh_kiehl01,15,177,0 script Robots#kh2::RobotsKHQ 111,{
+kh_kiehl01,15,177,0 script Robots#kh2::RobotsKHQ HIDDEN_NPC,{
end;
}
-kh_kiehl01,15,180,0 duplicate(RobotsKHQ) Robots#kh3 111
-kh_kiehl01,15,182,0 duplicate(RobotsKHQ) Robots#kh4 111
-kh_kiehl01,35,187,0 duplicate(RobotsKHQ) Robots#kh5 111
-kh_kiehl01,37,187,0 duplicate(RobotsKHQ) Robots#kh6 111
-kh_kiehl01,39,187,0 duplicate(RobotsKHQ) Robots#kh7 111
-kh_kiehl01,41,187,0 duplicate(RobotsKHQ) Robots#kh8 111
+kh_kiehl01,15,180,0 duplicate(RobotsKHQ) Robots#kh3 HIDDEN_NPC
+kh_kiehl01,15,182,0 duplicate(RobotsKHQ) Robots#kh4 HIDDEN_NPC
+kh_kiehl01,35,187,0 duplicate(RobotsKHQ) Robots#kh5 HIDDEN_NPC
+kh_kiehl01,37,187,0 duplicate(RobotsKHQ) Robots#kh6 HIDDEN_NPC
+kh_kiehl01,39,187,0 duplicate(RobotsKHQ) Robots#kh7 HIDDEN_NPC
+kh_kiehl01,41,187,0 duplicate(RobotsKHQ) Robots#kh8 HIDDEN_NPC
//----------------------------------------------------------------------------
// Kiehl's Room; Big Door, (Fifth, and final)
// - Anyone can pass through this door
// - Consumes 4 Solid Iron Pieces
//----------------------------------------------------------------------------
-kh_kiehl01,166,187,0 script Big Door#BigDoorKHQ5 111,{
+kh_kiehl01,166,187,0 script Big Door#BigDoorKHQ5 HIDDEN_NPC,{
if (($@KHQuestBusy == 0) && (KielHyreQuest >= 74) && (KielHyreQuest <= 106)) {
if (KielHyreQuest < 86) {
mes "^3355FFThis large door..";
@@ -6458,7 +6458,7 @@ kh_kiehl01,166,187,0 script Big Door#BigDoorKHQ5 111,{
}
}
-kh_kiehl01,166,186,0 script Big_Door_5_Warp 45,1,1,{
+kh_kiehl01,166,186,0 script Big_Door_5_Warp WARPNPC,1,1,{
end;
OnEnable:
@@ -6528,7 +6528,7 @@ OnGlobalTimerOff:
// Kiehl's Room; Kiehl
// - Timer will drop to 3 minutes once Kiehl is defeated.
//----------------------------------------------------------------------------
-kh_kiehl02,50,52,4 script Kiehl#Original 902,{
+kh_kiehl02,50,52,4 script Kiehl#Original 4_M_KHKIEL,{
if (checkweight(908,200) == 0) {
mes "^3355FFJust a second...";
mes "You're carrying too";
@@ -7068,21 +7068,21 @@ OnReset:
//----------------------------------------------------------------------------
// Kiehl's Room; Mitchell and Agents.
//----------------------------------------------------------------------------
-kh_kiehl02,49,55,6 script Mitchell#KiehlRoom 727,{
+kh_kiehl02,49,55,6 script Mitchell#KiehlRoom 4_F_JOB_HUNTER,{
end;
OnInit:
hideonnpc strnpcinfo(0);
end;
}
-kh_kiehl02,53,52,4 duplicate(Mitchell#KiehlRoom) Agent#KHAgent1 880
-kh_kiehl02,51,49,1 duplicate(Mitchell#KiehlRoom) Agent#KHAgent2 880
-kh_kiehl02,47,50,0 duplicate(Mitchell#KiehlRoom) Agent#KHAgent3 880
-kh_kiehl02,46,53,6 duplicate(Mitchell#KiehlRoom) Agent#KHAgent4 880
+kh_kiehl02,53,52,4 duplicate(Mitchell#KiehlRoom) Agent#KHAgent1 4_M_MASKMAN
+kh_kiehl02,51,49,1 duplicate(Mitchell#KiehlRoom) Agent#KHAgent2 4_M_MASKMAN
+kh_kiehl02,47,50,0 duplicate(Mitchell#KiehlRoom) Agent#KHAgent3 4_M_MASKMAN
+kh_kiehl02,46,53,6 duplicate(Mitchell#KiehlRoom) Agent#KHAgent4 4_M_MASKMAN
//----------------------------------------------------------------------------
// Kiehl's Room; Copy of Kiehl.
//----------------------------------------------------------------------------
-kh_kiehl02,48,53,6 script Kiehl#Copy 902,{
+kh_kiehl02,48,53,6 script Kiehl#Copy 4_M_KHKIEL,{
end;
OnInit:
@@ -7093,7 +7093,7 @@ OnInit:
//----------------------------------------------------------------------------
// Kiehl's Room; Kiehl_Room_Exit
//----------------------------------------------------------------------------
-kh_kiehl02,50,59,0 script Kiehl_Room_Exit 45,1,1,{
+kh_kiehl02,50,59,0 script Kiehl_Room_Exit WARPNPC,1,1,{
OnTouch:
if (getmapusers("kh_kiehl02") < 1)
donpcevent "KiehlRoom::OnReset";
diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt
index d08c251e9..7736c28f4 100644
--- a/npc/quests/lvl4_weapon_quest.txt
+++ b/npc/quests/lvl4_weapon_quest.txt
@@ -20,7 +20,7 @@
//= 1.6 Was using the wrong IDs for the ores needed. [L0ne_W0lf]
//============================================================
-umbala,117,285,3 script Bazo#lv4 85,{
+umbala,117,285,3 script Bazo#lv4 4_M_03,{
if (checkweight(908,300) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
@@ -461,7 +461,7 @@ umbala,117,285,3 script Bazo#lv4 85,{
}
}
-umbala,163,257,3 script Hibilaithan#lv4 785,{
+umbala,163,257,3 script Hibilaithan#lv4 4_M_UMDANCEKID2,{
if (checkweight(908,300) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
@@ -919,7 +919,7 @@ umbala,163,257,3 script Hibilaithan#lv4 785,{
}
}
-um_in,156,77,5 script Tabezthan#lv4 788,{
+um_in,156,77,5 script Tabezthan#lv4 4_M_UMOLDMAN,{
if (checkweight(908,300) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
@@ -1344,7 +1344,7 @@ um_in,156,77,5 script Tabezthan#lv4 788,{
}
}
-aldebaran,178,239,3 script Bill Thayer#lv4 712,{
+aldebaran,178,239,3 script Bill Thayer#lv4 4_M_05,{
if (lv4_weapon == 55) {
mes "[Bill Thayer]";
mes "Hmm...";
@@ -1659,7 +1659,7 @@ aldebaran,178,239,3 script Bill Thayer#lv4 712,{
close;
}
-geffen,203,146,5 script Citizen#lv4-1 97,{
+geffen,203,146,5 script Citizen#lv4-1 4W_M_01,{
mes "[Citizen]";
mes "There was a skillful";
mes "weaponsmith in Al De Baran";
@@ -1677,7 +1677,7 @@ geffen,203,146,5 script Citizen#lv4-1 97,{
close;
}
-morocc,289,230,3 script Citizen#lv4-2 92,{
+morocc,289,230,3 script Citizen#lv4-2 4_F_03,{
mes "[Citizen]";
mes "Meeting a person in the realm of the dead is impossible. But I've heard that if you were able to meet a dead person, you'd find that he wouldn't have all of his memories.";
next;
@@ -1690,7 +1690,7 @@ morocc,289,230,3 script Citizen#lv4-2 92,{
close;
}
-niflheim,240,193,3 script Kayron#lv4 794,{
+niflheim,240,193,3 script Kayron#lv4 4_M_NFDEADMAN2,{
if (checkweight(908,300) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
@@ -2136,7 +2136,7 @@ niflheim,240,193,3 script Kayron#lv4 794,{
}
}
-niflheim,99,268,5 script Reyghema#lv4 794,{
+niflheim,99,268,5 script Reyghema#lv4 4_M_NFDEADMAN2,{
if (MaxWeight - Weight < 3000) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
@@ -2617,7 +2617,7 @@ niflheim,99,268,5 script Reyghema#lv4 794,{
}
}
-niflheim,187,280,3 script Hein#lv4 795,{
+niflheim,187,280,3 script Hein#lv4 4_M_NFDEADMAN,{
if (checkweight(908,300) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
@@ -3059,7 +3059,7 @@ niflheim,187,280,3 script Hein#lv4 795,{
}
}
-niflheim,331,72,3 script Waltboughst#lv4 795,{
+niflheim,331,72,3 script Waltboughst#lv4 4_M_NFDEADMAN,{
if (checkweight(908,300) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
diff --git a/npc/quests/mage_solution.txt b/npc/quests/mage_solution.txt
index 401372a67..8513ae8bf 100644
--- a/npc/quests/mage_solution.txt
+++ b/npc/quests/mage_solution.txt
@@ -12,7 +12,7 @@
//= 1.0 Split from Pre-Renewal Mage job quest. [Zopokx]
//============================================================
-pay_arche,122,100,0 script Dollshoi 88,{
+pay_arche,122,100,0 script Dollshoi 4_M_ORIENT01,{
mes "[Mage Guildsman]";
mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube.";
next;
@@ -33,7 +33,7 @@ pay_arche,122,100,0 script Dollshoi 88,{
close;
}
-moc_ruins,91,150,0 script Ponka-Hontas 93,{
+moc_ruins,91,150,0 script Ponka-Hontas 4_F_04,{
mes "[Mage Guildsman]";
mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Test Tube.";
next;
diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt
index b48953301..10f02435e 100644
--- a/npc/quests/monstertamers.txt
+++ b/npc/quests/monstertamers.txt
@@ -17,7 +17,7 @@
//= 1.5 Moved Izlude NPC to pre-re/re paths.
//============================================================
-alberta_in,173,76,4 script Monster Tamer#alb 125,{
+alberta_in,173,76,4 script Monster Tamer#alb 4_M_TELEPORTER,{
mes "[Iwado]";
mes "This is the height of the era of Monster Taming! Don't you feel the need to gather monster items to be able to connect and to communicate with the Cute Monsters!?";
next;
@@ -185,7 +185,7 @@ alberta_in,173,76,4 script Monster Tamer#alb 125,{
}
-aldeba_in,168,175,4 script Monster Tamer#alde 125,{
+aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{
mes "[YuU]";
mes "You must be looking for monster items! In making monster items, there is no monster tamer in Rune Midgard that's better than me.";
next;
@@ -619,7 +619,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 125,{
}
}
-comodo,112,182,0 script Munak's Grandma 103,{
+comodo,112,182,0 script Munak's Grandma 8_F_GRANDMOTHER,{
if (countitem(1558) > 0) {
mes "[Munak's grandma]";
mes "Oh my...";
diff --git a/npc/quests/mrsmile.txt b/npc/quests/mrsmile.txt
index 4baf22093..065dc5f89 100644
--- a/npc/quests/mrsmile.txt
+++ b/npc/quests/mrsmile.txt
@@ -12,7 +12,7 @@
//= 1.4a Fixed a little Typo error in duplicates. (bugreport:749) [Samuray22]
//============================================================
-- script Smile Assistance::SmileHelper 92,{
+- script Smile Assistance::SmileHelper 4_F_03,{
mes "[Smile Girl]";
mes "Hi ~ Hi ~";
mes "This is Smile Assistance.";
@@ -93,12 +93,12 @@
}
// Additional Smile Assistance staff
-alberta,113,53,4 duplicate(SmileHelper) Smile Assistance#alb 92
-aldebaran,136,135,4 duplicate(SmileHelper) Smile Assistance#alde 92
-geffen,119,107,4 duplicate(SmileHelper) Smile Assistance#gef 92
-moc_ruins,59,154,3 duplicate(SmileHelper) Smile Assistance#moc 92
-payon,186,104,5 duplicate(SmileHelper) Smile Assistance#pay 92
-prontera,157,187,4 duplicate(SmileHelper) Smile Assistance#prt 92
+alberta,113,53,4 duplicate(SmileHelper) Smile Assistance#alb 4_F_03
+aldebaran,136,135,4 duplicate(SmileHelper) Smile Assistance#alde 4_F_03
+geffen,119,107,4 duplicate(SmileHelper) Smile Assistance#gef 4_F_03
+moc_ruins,59,154,3 duplicate(SmileHelper) Smile Assistance#moc 4_F_03
+payon,186,104,5 duplicate(SmileHelper) Smile Assistance#pay 4_F_03
+prontera,157,187,4 duplicate(SmileHelper) Smile Assistance#prt 4_F_03
//============================================================
// Old changelog
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 2516a189c..1cfa2bc03 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -37,7 +37,7 @@
// Black Cat Ears
//============================================================
-payon,115,131,3 script Neko Neko#1 725,{
+payon,115,131,3 script Neko Neko#1 4_F_JOB_ASSASSIN,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
@@ -105,7 +105,7 @@ payon,115,131,3 script Neko Neko#1 725,{
// X Hairpin, Band Aid, Flower Hairpin
//============================================================
-geffen,129,148,3 script Argen#1 779,{
+geffen,129,148,3 script Argen#1 4_M_YOYOROGUE,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "[Argen]";
@@ -295,7 +295,7 @@ geffen,129,148,3 script Argen#1 779,{
// Hot-blooded Headband
//============================================================
-yuno,300,188,5 script Zhenbolt#1 753,{
+yuno,300,188,5 script Zhenbolt#1 4_M_MONK,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
@@ -391,7 +391,7 @@ yuno,300,188,5 script Zhenbolt#1 753,{
// Red Ribbon
//============================================================
-prontera,165,232,3 script Nephia#1 744,{
+prontera,165,232,3 script Nephia#1 4_F_ALCHE,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
@@ -506,7 +506,7 @@ prontera,165,232,3 script Nephia#1 744,{
// Indian Headband
//============================================================
-comodo,237,217,5 script Meruntei#1 732,{
+comodo,237,217,5 script Meruntei#1 4_M_JOB_HUNTER,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
mes "- Currently you're carrying -";
@@ -560,7 +560,7 @@ comodo,237,217,5 script Meruntei#1 732,{
// Mushroom Band
//============================================================
-geffen,67,87,3 script Ipore#1 700,{
+geffen,67,87,3 script Ipore#1 8_F_GIRL,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
mes "- Currently you're carrying -";
@@ -640,7 +640,7 @@ geffen,67,87,3 script Ipore#1 700,{
// Angel Wing Ears, Devil Wing Ears
//============================================================
-yuno,241,52,3 script Old Blacksmith#hgear 813,{
+yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
@@ -961,7 +961,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 813,{
// Sea-Otter Hat
//============================================================
-xmas,183,267,3 script Pretty Lindsay#1 793,{
+xmas,183,267,3 script Pretty Lindsay#1 4_F_NFLOSTGIRL,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
@@ -1076,7 +1076,7 @@ xmas,183,267,3 script Pretty Lindsay#1 793,{
// Teddybear Hat
//============================================================
-xmas,175,156,3 script Fuzzy Fuzz#1 712,{
+xmas,175,156,3 script Fuzzy Fuzz#1 4_M_05,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
@@ -1164,7 +1164,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 712,{
// Model Training Hat
//============================================================
-payon_in03,8,193,4 script Nanhyang#1 77,{
+payon_in03,8,193,4 script Nanhyang#1 1_F_ORIENT_03,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
@@ -1325,7 +1325,7 @@ payon_in03,8,193,4 script Nanhyang#1 77,{
// Tulip Hairpin
//============================================================
-geffen,83,189,5 script Seth#1 716,{
+geffen,83,189,5 script Seth#1 4_M_KID2,{
disable_items;
if (checkweight(1201,1) == 0) {
mes " [Seth]";
@@ -1444,7 +1444,7 @@ geffen,83,189,5 script Seth#1 716,{
// Party Hat, Straw Hat, Cowboy Hat, Sombrero, Beanie
//============================================================
-xmas_in,35,30,3 script Hat Merchant#zero 797,{
+xmas_in,35,30,3 script Hat Merchant#zero 4_M_NFLOSTMAN,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
@@ -1735,7 +1735,7 @@ xmas_in,35,30,3 script Hat Merchant#zero 797,{
// Decorative Golden Bell, Crown of Ancient Queen, Crown of Mistress
//============================================================
-yuno_in03,20,18,6 script Nehris#1 726,{
+yuno_in03,20,18,6 script Nehris#1 4_F_JOB_BLACKSMITH,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
@@ -1900,7 +1900,7 @@ yuno_in03,20,18,6 script Nehris#1 726,{
// Alarm Mask
//============================================================
-alde_alche,88,180,0 script Muscle Man#Alarm Mask 748,{
+alde_alche,88,180,0 script Muscle Man#Alarm Mask 4_M_ALCHE_A,{
if (checkweight(1201,1) == 0) {
mes "[Muscle Man]";
mes "Hmmm...";
@@ -2073,7 +2073,7 @@ OnInit:
// Drooping Cat, Smokie Leaf, Lazy Smokie, Blue Fish
//============================================================
-morocc,273,79,4 script Educated Traveller 99,{
+morocc,273,79,4 script Educated Traveller 4W_M_03,{
disable_items;
if ((MaxWeight-Weight) < 5000 || checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
@@ -2510,7 +2510,7 @@ OnTouch:
end;
}
-pay_dun03,48,84,4 script Nine Tails#Kitsune Man 762,{
+pay_dun03,48,84,4 script Nine Tails#Kitsune Man 4_M_JPN2,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "- Wait a moment! -";
diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt
index 003019be9..a6af90a9e 100644
--- a/npc/quests/newgears/2005_headgears.txt
+++ b/npc/quests/newgears/2005_headgears.txt
@@ -16,7 +16,7 @@
//= 1.3a Added 'disable_items' command. [Euphy]
//============================================================
-yuno,222,116,3 script Kasis#LhzHat 851,{
+yuno,222,116,3 script Kasis#LhzHat 4_M_REPAIR,{
if(countitem(519) > 49 && countitem(7031) > 49 && countitem(548) > 49 && countitem(539) > 49)
{
mes "[Kasis]";
@@ -225,7 +225,7 @@ yuno,222,116,3 script Kasis#LhzHat 851,{
}
}
-lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{
+lighthalzen,143,68,0 script Strange Guy#LhzHat 1_M_01,{
disable_items;
if(DTHATQ == 0)
{
@@ -746,7 +746,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{
}
}
-lighthalzen,360,313,3 script Kid#LhzHat 706,{
+lighthalzen,360,313,3 script Kid#LhzHat 4_M_KID1,{
mes "[Kid]";
if(Sex)
mes "Hello, mister!";
@@ -871,7 +871,7 @@ lighthalzen,360,313,3 script Kid#LhzHat 706,{
}
}
-einbech,70,222,5 script Metelle#LhzHat 91,{
+einbech,70,222,5 script Metelle#LhzHat 4_F_02,{
if(countitem(983) && countitem(7267) > 998 && countitem(749) && Zeny > 49999)
{
mes "[Metelle]";
@@ -981,7 +981,7 @@ einbech,70,222,5 script Metelle#LhzHat 91,{
}
-lhz_in02,91,38,5 script Margaret Mary#LhzHat 90,{
+lhz_in02,91,38,5 script Margaret Mary#LhzHat 4_F_01,{
mes "[Margaret Mary]";
mes "The white rose, in its";
@@ -1084,7 +1084,7 @@ lhz_in02,91,38,5 script Margaret Mary#LhzHat 90,{
}
-lighthalzen,182,89,0 script Relaxed-Looking Lady 91,{
+lighthalzen,182,89,0 script Relaxed-Looking Lady 4_F_02,{
disable_items;
if(LHZBTQ == 0)
{
@@ -2107,7 +2107,7 @@ gl_prison1,100,48,5 script Rybio#LhzHat 1201,{
}
}
-airport,148,41,3 script Freight Manager#toast 852,{
+airport,148,41,3 script Freight Manager#toast 4_M_EIN_SOLDIER,{
mes "[Kirishu]";
mes "Oh man...";
mes "It's almost lunchtime,";
diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt
index ef754e122..8a63503c2 100644
--- a/npc/quests/newgears/2006_headgears.txt
+++ b/npc/quests/newgears/2006_headgears.txt
@@ -24,7 +24,7 @@
// Censor Bar
//============================================================
-rachel,91,273,8 script ? 930,{
+rachel,91,273,8 script ? 4_M_RACHMAN2,{
if (countitem(983) > 0 && countitem(7111) > 99 && countitem(938) > 98 && Zeny > 99999) {
mes "[?]";
mes "Giggle giggle...isn't it my partner, eh?";
@@ -92,7 +92,7 @@ rachel,91,273,8 script ? 930,{
// Feather Beret
//============================================================
-rachel,152,131,3 script Sakjul 928,{
+rachel,152,131,3 script Sakjul 4_M_MIDDLE1,{
if (countitem(5172) > 0 && countitem(7063) > 99 && countitem(982) > 0) {
mes "[Sakjul]";
mes "Great, you have brought everything";
@@ -208,7 +208,7 @@ rachel,152,131,3 script Sakjul 928,{
// Valkyrie Helm
//============================================================
-hugel,147,103,3 script Ghenirhemin 897,{
+hugel,147,103,3 script Ghenirhemin 4_M_HUGRANFA,{
if (moza_valkylie == 5) {
set .@val2,rand(1,10);
if (.@val2 == 3) {
@@ -565,7 +565,7 @@ hugel,147,103,3 script Ghenirhemin 897,{
}
// Hahoe Mask / Mythical Lion Mask / Bride Mask
//============================================================
-payon,135,320,3 script Chungwolmang 97,{
+payon,135,320,3 script Chungwolmang 4W_M_01,{
if (moza_tal == 2) {
if (countitem(7015) > 19 && countitem(952) > 99 && countitem(1028) > 99) {
//Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boar's_Mane
@@ -808,7 +808,7 @@ S_MakeMask:
// Magistrate Hat / Ayam
//============================================================
-payon_in03,139,124,3 script Han Garam 88,{
+payon_in03,139,124,3 script Han Garam 4_M_ORIENT01,{
if (moza_korea == 2 && countitem(954) > 299 && countitem(733) > 4 && countitem(975) > 0 && countitem(7166) > 49) {
mes "[Han Garam]";
mes "You came back faster than I expected.";
diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt
index 5de069de8..87d1a4693 100644
--- a/npc/quests/newgears/2008_headgears.txt
+++ b/npc/quests/newgears/2008_headgears.txt
@@ -12,7 +12,7 @@
//= 1.0 First Version. [Masao]
//============================================================
-gef_fild05,80,149,3 script Myu#08_hat 877,{
+gef_fild05,80,149,3 script Myu#08_hat 4_F_YUNYANG,{
mes "[Myu]";
mes "Meow...";
emotion e_omg;
@@ -197,7 +197,7 @@ gef_fild05,80,149,3 script Myu#08_hat 877,{
close;
}
-morocc_in,137,102,5 script Trainee#2008hat01 82,{
+morocc_in,137,102,5 script Trainee#2008hat01 4_KID01,{
mes "[Trainee Elgo]";
mes "Welcome.";
mes "Please talk to our teacher if you are here to make a dyes.";
diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt
index 4a2971eea..10757a60e 100644
--- a/npc/quests/ninja_quests.txt
+++ b/npc/quests/ninja_quests.txt
@@ -13,7 +13,7 @@
//= 1.2a Kagerou/Oboro support (BaseJob -> BaseClass) [Euphy]
//============================================================
-que_ng,28,50,3 script Boshuu 709,{
+que_ng,28,50,3 script Boshuu 4_M_SEAMAN,{
if (BaseClass != Job_Ninja){
mes "[Boshuu]";
@@ -360,7 +360,7 @@ que_ng,28,50,3 script Boshuu 709,{
}
}
-que_ng,28,45,3 script Basshu 86,{
+que_ng,28,45,3 script Basshu 4_M_04,{
if(BaseClass != Job_Ninja){
mes "[Basshu]";
@@ -711,7 +711,7 @@ que_ng,28,45,3 script Basshu 86,{
}
}
-que_ng,27,18,3 script Toshu 709,{
+que_ng,27,18,3 script Toshu 4_M_SEAMAN,{
if(BaseClass != Job_Ninja){
mes "[Toshu]";
@@ -843,7 +843,7 @@ que_ng,27,18,3 script Toshu 709,{
}
}
-que_ng,72,34,3 script Craftsman Kaibara 847,{
+que_ng,72,34,3 script Craftsman Kaibara 4_M_EINOLD,{
if (BaseClass != Job_Ninja){
mes "[Kaibara]";
@@ -1122,7 +1122,7 @@ que_ng,72,34,3 script Craftsman Kaibara 847,{
}
}
-que_ng,22,62,3 script Tetsu 709,{
+que_ng,22,62,3 script Tetsu 4_M_SEAMAN,{
mes "[Tetsu]";
if(BaseClass != Job_Ninja){
diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt
index 5796bd8f6..927bcd8ba 100644
--- a/npc/quests/obb_quest.txt
+++ b/npc/quests/obb_quest.txt
@@ -20,7 +20,7 @@
//= 2.0 Removed unused "name" variable. [L0ne_W0lf]
//============================================================
-alberta,43,244,0 script Tourist#thai 99,{
+alberta,43,244,0 script Tourist#thai 4W_M_03,{
if (checkweight(1201,1) == 0) {
mes "- Wait a moment! -";
mes "- Currently you're carrying -";
@@ -613,7 +613,7 @@ alberta,43,244,0 script Tourist#thai 99,{
}
}
-moc_ruins,105,62,4 script Jacob#thai 50,{
+moc_ruins,105,62,4 script Jacob#thai 1_M_04,{
if (thai_head >= 6 && thai_head <= 11) {
switch (thai_head) {
case 6:
@@ -1060,7 +1060,7 @@ moc_ruins,105,62,4 script Jacob#thai 50,{
}
}
-comodo,68,195,0 script Old Man#thai 120,{
+comodo,68,195,0 script Old Man#thai 2_M_PHARMACIST,{
if (checkweight(1201,1) == 0) {
mes "- Wait a moment! -";
mes "- Currently you're carrying -";
@@ -1841,7 +1841,7 @@ comodo,68,195,0 script Old Man#thai 120,{
}
}
-moc_ruins,107,62,0 script Tommy#thai 716,{
+moc_ruins,107,62,0 script Tommy#thai 4_M_KID2,{
if (thai_head >= 6 && thai_head <= 11) {
switch(thai_head) {
case 6:
diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt
index f5821d3dd..2c93ccc9f 100644
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -144,16 +144,16 @@ OnInit:
end;
}
-arug_cas01,161,371,3 duplicate(Guide#gq_main) Guide#gq_aru01 899
-arug_cas02,349,347,3 duplicate(Guide#gq_main) Guide#gq_aru02 899
-arug_cas03,324,161,3 duplicate(Guide#gq_main) Guide#gq_aru03 899
-arug_cas04,324,161,3 duplicate(Guide#gq_main) Guide#gq_aru04 899
-arug_cas05,324,161,3 duplicate(Guide#gq_main) Guide#gq_aru05 899
-schg_cas01,376,307,3 duplicate(Guide#gq_main) Guide#gq_sch01 899
-schg_cas02,181,335,3 duplicate(Guide#gq_main) Guide#gq_sch02 899
-schg_cas03,84,101,3 duplicate(Guide#gq_main) Guide#gq_sch03 899
-schg_cas04,376,307,3 duplicate(Guide#gq_main) Guide#gq_sch04 899
-schg_cas05,376,307,3 duplicate(Guide#gq_main) Guide#gq_sch05 899
+arug_cas01,161,371,3 duplicate(Guide#gq_main) Guide#gq_aru01 4_M_HUMAN_02
+arug_cas02,349,347,3 duplicate(Guide#gq_main) Guide#gq_aru02 4_M_HUMAN_02
+arug_cas03,324,161,3 duplicate(Guide#gq_main) Guide#gq_aru03 4_M_HUMAN_02
+arug_cas04,324,161,3 duplicate(Guide#gq_main) Guide#gq_aru04 4_M_HUMAN_02
+arug_cas05,324,161,3 duplicate(Guide#gq_main) Guide#gq_aru05 4_M_HUMAN_02
+schg_cas01,376,307,3 duplicate(Guide#gq_main) Guide#gq_sch01 4_M_HUMAN_02
+schg_cas02,181,335,3 duplicate(Guide#gq_main) Guide#gq_sch02 4_M_HUMAN_02
+schg_cas03,84,101,3 duplicate(Guide#gq_main) Guide#gq_sch03 4_M_HUMAN_02
+schg_cas04,376,307,3 duplicate(Guide#gq_main) Guide#gq_sch04 4_M_HUMAN_02
+schg_cas05,376,307,3 duplicate(Guide#gq_main) Guide#gq_sch05 4_M_HUMAN_02
que_qaru01,345,23,0 warp Gate02#gq_aru01 1,1,arug_cas01,157,369
que_qaru02,345,23,0 warp Gate02#gq_aru02 1,1,arug_cas02,349,355
@@ -353,16 +353,16 @@ OnInit:
end;
}
-que_qaru01,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_aru01 403
-que_qaru02,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_aru02 403
-que_qaru03,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_aru03 403
-que_qaru04,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_aru04 403
-que_qaru05,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_aru05 403
-que_qsch01,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_sch01 403
-que_qsch02,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_sch02 403
-que_qsch03,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_sch03 403
-que_qsch04,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_sch04 403
-que_qsch05,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_sch05 403
+que_qaru01,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_aru01 4_F_VALKYRIE2
+que_qaru02,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_aru02 4_F_VALKYRIE2
+que_qaru03,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_aru03 4_F_VALKYRIE2
+que_qaru04,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_aru04 4_F_VALKYRIE2
+que_qaru05,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_aru05 4_F_VALKYRIE2
+que_qsch01,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_sch01 4_F_VALKYRIE2
+que_qsch02,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_sch02 4_F_VALKYRIE2
+que_qsch03,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_sch03 4_F_VALKYRIE2
+que_qsch04,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_sch04 4_F_VALKYRIE2
+que_qsch05,345,82,3 duplicate(Wish Maiden#gq_main) Wish Maiden#gq_sch05 4_F_VALKYRIE2
- script Gate01#gq_main -1,{
function SMonster;
@@ -450,16 +450,16 @@ OnInit:
end;
}
-que_qaru01,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_aru01 45,1,1
-que_qaru02,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_aru02 45,1,1
-que_qaru03,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_aru03 45,1,1
-que_qaru04,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_aru04 45,1,1
-que_qaru05,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_aru05 45,1,1
-que_qsch01,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_sch01 45,1,1
-que_qsch02,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_sch02 45,1,1
-que_qsch03,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_sch03 45,1,1
-que_qsch04,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_sch04 45,1,1
-que_qsch05,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_sch05 45,1,1
+que_qaru01,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_aru01 WARPNPC,1,1
+que_qaru02,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_aru02 WARPNPC,1,1
+que_qaru03,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_aru03 WARPNPC,1,1
+que_qaru04,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_aru04 WARPNPC,1,1
+que_qaru05,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_aru05 WARPNPC,1,1
+que_qsch01,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_sch01 WARPNPC,1,1
+que_qsch02,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_sch02 WARPNPC,1,1
+que_qsch03,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_sch03 WARPNPC,1,1
+que_qsch04,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_sch04 WARPNPC,1,1
+que_qsch05,346,81,0 duplicate(Gate01#gq_main) Gate01#gq_sch05 WARPNPC,1,1
- script #Gate_manager_main -1,{
end;
@@ -473,16 +473,16 @@ OnMyMobDead:
}
end;
}
-que_qaru01,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_aru01 844
-que_qaru02,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_aru02 844
-que_qaru03,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_aru03 844
-que_qaru04,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_aru04 844
-que_qaru05,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_aru05 844
-que_qsch01,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_sch01 844
-que_qsch02,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_sch02 844
-que_qsch03,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_sch03 844
-que_qsch04,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_sch04 844
-que_qsch05,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_sch05 844
+que_qaru01,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_aru01 CLEAR_NPC
+que_qaru02,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_aru02 CLEAR_NPC
+que_qaru03,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_aru03 CLEAR_NPC
+que_qaru04,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_aru04 CLEAR_NPC
+que_qaru05,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_aru05 CLEAR_NPC
+que_qsch01,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_sch01 CLEAR_NPC
+que_qsch02,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_sch02 CLEAR_NPC
+que_qsch03,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_sch03 CLEAR_NPC
+que_qsch04,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_sch04 CLEAR_NPC
+que_qsch05,1,4,0 duplicate(#Gate_manager_main) #Gate_manager_sch05 CLEAR_NPC
- script #gq_miromob2_main -1,{
end;
@@ -527,16 +527,16 @@ OnMyMobDead:
}
end;
}
-que_qaru01,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_aru01 844
-que_qaru02,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_aru02 844
-que_qaru03,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_aru03 844
-que_qaru04,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_aru04 844
-que_qaru05,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_aru05 844
-que_qsch01,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_sch01 844
-que_qsch02,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_sch02 844
-que_qsch03,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_sch03 844
-que_qsch04,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_sch04 844
-que_qsch05,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_sch05 844
+que_qaru01,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_aru01 CLEAR_NPC
+que_qaru02,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_aru02 CLEAR_NPC
+que_qaru03,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_aru03 CLEAR_NPC
+que_qaru04,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_aru04 CLEAR_NPC
+que_qaru05,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_aru05 CLEAR_NPC
+que_qsch01,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_sch01 CLEAR_NPC
+que_qsch02,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_sch02 CLEAR_NPC
+que_qsch03,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_sch03 CLEAR_NPC
+que_qsch04,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_sch04 CLEAR_NPC
+que_qsch05,1,4,0 duplicate(#gq_miromob2_main) #gq_miromob2_sch05 CLEAR_NPC
- script #okolnir_main -1,{
end;
@@ -724,16 +724,16 @@ OnTimer3611000:
stopnpctimer;
end;
}
-que_qaru01,1,1,0 duplicate(#okolnir_main) #okolnir_aru01 844
-que_qaru02,1,1,0 duplicate(#okolnir_main) #okolnir_aru02 844
-que_qaru03,1,1,0 duplicate(#okolnir_main) #okolnir_aru03 844
-que_qaru04,1,1,0 duplicate(#okolnir_main) #okolnir_aru04 844
-que_qaru05,1,1,0 duplicate(#okolnir_main) #okolnir_aru05 844
-que_qsch01,1,1,0 duplicate(#okolnir_main) #okolnir_sch01 844
-que_qsch02,1,1,0 duplicate(#okolnir_main) #okolnir_sch02 844
-que_qsch03,1,1,0 duplicate(#okolnir_main) #okolnir_sch03 844
-que_qsch04,1,1,0 duplicate(#okolnir_main) #okolnir_sch04 844
-que_qsch05,1,1,0 duplicate(#okolnir_main) #okolnir_sch05 844
+que_qaru01,1,1,0 duplicate(#okolnir_main) #okolnir_aru01 CLEAR_NPC
+que_qaru02,1,1,0 duplicate(#okolnir_main) #okolnir_aru02 CLEAR_NPC
+que_qaru03,1,1,0 duplicate(#okolnir_main) #okolnir_aru03 CLEAR_NPC
+que_qaru04,1,1,0 duplicate(#okolnir_main) #okolnir_aru04 CLEAR_NPC
+que_qaru05,1,1,0 duplicate(#okolnir_main) #okolnir_aru05 CLEAR_NPC
+que_qsch01,1,1,0 duplicate(#okolnir_main) #okolnir_sch01 CLEAR_NPC
+que_qsch02,1,1,0 duplicate(#okolnir_main) #okolnir_sch02 CLEAR_NPC
+que_qsch03,1,1,0 duplicate(#okolnir_main) #okolnir_sch03 CLEAR_NPC
+que_qsch04,1,1,0 duplicate(#okolnir_main) #okolnir_sch04 CLEAR_NPC
+que_qsch05,1,1,0 duplicate(#okolnir_main) #okolnir_sch05 CLEAR_NPC
- script #Maze_Manager_main -1,{
end;
@@ -808,16 +808,16 @@ OnInit:
donpcevent "#miro_yf_"+.@sub$+"::OnDisable";
end;
}
-que_qaru01,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_aru01 844
-que_qaru02,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_aru02 844
-que_qaru03,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_aru03 844
-que_qaru04,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_aru04 844
-que_qaru05,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_aru05 844
-que_qsch01,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_sch01 844
-que_qsch02,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_sch02 844
-que_qsch03,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_sch03 844
-que_qsch04,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_sch04 844
-que_qsch05,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_sch05 844
+que_qaru01,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_aru01 CLEAR_NPC
+que_qaru02,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_aru02 CLEAR_NPC
+que_qaru03,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_aru03 CLEAR_NPC
+que_qaru04,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_aru04 CLEAR_NPC
+que_qaru05,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_aru05 CLEAR_NPC
+que_qsch01,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_sch01 CLEAR_NPC
+que_qsch02,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_sch02 CLEAR_NPC
+que_qsch03,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_sch03 CLEAR_NPC
+que_qsch04,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_sch04 CLEAR_NPC
+que_qsch05,1,2,0 duplicate(#Maze_Manager_main) #Maze_Manager_sch05 CLEAR_NPC
- script #miro_bf_main -1,{
function Cell;
@@ -845,16 +845,16 @@ OnDisable:
OnMyMobDead:
end;
}
-que_qaru01,2,1,0 duplicate(#miro_bf_main) #miro_bf_aru01 844
-que_qaru02,2,1,0 duplicate(#miro_bf_main) #miro_bf_aru02 844
-que_qaru03,2,1,0 duplicate(#miro_bf_main) #miro_bf_aru03 844
-que_qaru04,2,1,0 duplicate(#miro_bf_main) #miro_bf_aru04 844
-que_qaru05,2,1,0 duplicate(#miro_bf_main) #miro_bf_aru05 844
-que_qsch01,2,1,0 duplicate(#miro_bf_main) #miro_bf_sch01 844
-que_qsch02,2,1,0 duplicate(#miro_bf_main) #miro_bf_sch02 844
-que_qsch03,2,1,0 duplicate(#miro_bf_main) #miro_bf_sch03 844
-que_qsch04,2,1,0 duplicate(#miro_bf_main) #miro_bf_sch04 844
-que_qsch05,2,1,0 duplicate(#miro_bf_main) #miro_bf_sch05 844
+que_qaru01,2,1,0 duplicate(#miro_bf_main) #miro_bf_aru01 CLEAR_NPC
+que_qaru02,2,1,0 duplicate(#miro_bf_main) #miro_bf_aru02 CLEAR_NPC
+que_qaru03,2,1,0 duplicate(#miro_bf_main) #miro_bf_aru03 CLEAR_NPC
+que_qaru04,2,1,0 duplicate(#miro_bf_main) #miro_bf_aru04 CLEAR_NPC
+que_qaru05,2,1,0 duplicate(#miro_bf_main) #miro_bf_aru05 CLEAR_NPC
+que_qsch01,2,1,0 duplicate(#miro_bf_main) #miro_bf_sch01 CLEAR_NPC
+que_qsch02,2,1,0 duplicate(#miro_bf_main) #miro_bf_sch02 CLEAR_NPC
+que_qsch03,2,1,0 duplicate(#miro_bf_main) #miro_bf_sch03 CLEAR_NPC
+que_qsch04,2,1,0 duplicate(#miro_bf_main) #miro_bf_sch04 CLEAR_NPC
+que_qsch05,2,1,0 duplicate(#miro_bf_main) #miro_bf_sch05 CLEAR_NPC
- script #miro_rf_main -1,{
function Cell;
@@ -883,16 +883,16 @@ OnMyMobDead:
}
}
}
-que_qaru01,2,2,0 duplicate(#miro_rf_main) #miro_rf_aru01 844
-que_qaru02,2,2,0 duplicate(#miro_rf_main) #miro_rf_aru02 844
-que_qaru03,2,2,0 duplicate(#miro_rf_main) #miro_rf_aru03 844
-que_qaru04,2,2,0 duplicate(#miro_rf_main) #miro_rf_aru04 844
-que_qaru05,2,2,0 duplicate(#miro_rf_main) #miro_rf_aru05 844
-que_qsch01,2,2,0 duplicate(#miro_rf_main) #miro_rf_sch01 844
-que_qsch02,2,2,0 duplicate(#miro_rf_main) #miro_rf_sch02 844
-que_qsch03,2,2,0 duplicate(#miro_rf_main) #miro_rf_sch03 844
-que_qsch04,2,2,0 duplicate(#miro_rf_main) #miro_rf_sch04 844
-que_qsch05,2,2,0 duplicate(#miro_rf_main) #miro_rf_sch05 844
+que_qaru01,2,2,0 duplicate(#miro_rf_main) #miro_rf_aru01 CLEAR_NPC
+que_qaru02,2,2,0 duplicate(#miro_rf_main) #miro_rf_aru02 CLEAR_NPC
+que_qaru03,2,2,0 duplicate(#miro_rf_main) #miro_rf_aru03 CLEAR_NPC
+que_qaru04,2,2,0 duplicate(#miro_rf_main) #miro_rf_aru04 CLEAR_NPC
+que_qaru05,2,2,0 duplicate(#miro_rf_main) #miro_rf_aru05 CLEAR_NPC
+que_qsch01,2,2,0 duplicate(#miro_rf_main) #miro_rf_sch01 CLEAR_NPC
+que_qsch02,2,2,0 duplicate(#miro_rf_main) #miro_rf_sch02 CLEAR_NPC
+que_qsch03,2,2,0 duplicate(#miro_rf_main) #miro_rf_sch03 CLEAR_NPC
+que_qsch04,2,2,0 duplicate(#miro_rf_main) #miro_rf_sch04 CLEAR_NPC
+que_qsch05,2,2,0 duplicate(#miro_rf_main) #miro_rf_sch05 CLEAR_NPC
- script #miro_yf_main -1,{
function Cell;
@@ -921,16 +921,16 @@ OnMyMobDead:
}
}
}
-que_qaru01,2,3,0 duplicate(#miro_yf_main) #miro_yf_aru01 844
-que_qaru02,2,3,0 duplicate(#miro_yf_main) #miro_yf_aru02 844
-que_qaru03,2,3,0 duplicate(#miro_yf_main) #miro_yf_aru03 844
-que_qaru04,2,3,0 duplicate(#miro_yf_main) #miro_yf_aru04 844
-que_qaru05,2,3,0 duplicate(#miro_yf_main) #miro_yf_aru05 844
-que_qsch01,2,3,0 duplicate(#miro_yf_main) #miro_yf_sch01 844
-que_qsch02,2,3,0 duplicate(#miro_yf_main) #miro_yf_sch02 844
-que_qsch03,2,3,0 duplicate(#miro_yf_main) #miro_yf_sch03 844
-que_qsch04,2,3,0 duplicate(#miro_yf_main) #miro_yf_sch04 844
-que_qsch05,2,3,0 duplicate(#miro_yf_main) #miro_yf_sch05 844
+que_qaru01,2,3,0 duplicate(#miro_yf_main) #miro_yf_aru01 CLEAR_NPC
+que_qaru02,2,3,0 duplicate(#miro_yf_main) #miro_yf_aru02 CLEAR_NPC
+que_qaru03,2,3,0 duplicate(#miro_yf_main) #miro_yf_aru03 CLEAR_NPC
+que_qaru04,2,3,0 duplicate(#miro_yf_main) #miro_yf_aru04 CLEAR_NPC
+que_qaru05,2,3,0 duplicate(#miro_yf_main) #miro_yf_aru05 CLEAR_NPC
+que_qsch01,2,3,0 duplicate(#miro_yf_main) #miro_yf_sch01 CLEAR_NPC
+que_qsch02,2,3,0 duplicate(#miro_yf_main) #miro_yf_sch02 CLEAR_NPC
+que_qsch03,2,3,0 duplicate(#miro_yf_main) #miro_yf_sch03 CLEAR_NPC
+que_qsch04,2,3,0 duplicate(#miro_yf_main) #miro_yf_sch04 CLEAR_NPC
+que_qsch05,2,3,0 duplicate(#miro_yf_main) #miro_yf_sch05 CLEAR_NPC
- script windpath01_main -1,{
end;
@@ -947,16 +947,16 @@ OnTouch:
mes "You need the Crystal Key to activate the Warp Gate.";
close;
}
-que_qaru01,132,172,0 duplicate(windpath01_main) windpath01_aru01 45,1,1
-que_qaru02,132,172,0 duplicate(windpath01_main) windpath01_aru02 45,1,1
-que_qaru03,132,172,0 duplicate(windpath01_main) windpath01_aru03 45,1,1
-que_qaru04,132,172,0 duplicate(windpath01_main) windpath01_aru04 45,1,1
-que_qaru05,132,172,0 duplicate(windpath01_main) windpath01_aru05 45,1,1
-que_qsch01,132,172,0 duplicate(windpath01_main) windpath01_sch01 45,1,1
-que_qsch02,132,172,0 duplicate(windpath01_main) windpath01_sch02 45,1,1
-que_qsch03,132,172,0 duplicate(windpath01_main) windpath01_sch03 45,1,1
-que_qsch04,132,172,0 duplicate(windpath01_main) windpath01_sch04 45,1,1
-que_qsch05,132,172,0 duplicate(windpath01_main) windpath01_sch05 45,1,1
+que_qaru01,132,172,0 duplicate(windpath01_main) windpath01_aru01 WARPNPC,1,1
+que_qaru02,132,172,0 duplicate(windpath01_main) windpath01_aru02 WARPNPC,1,1
+que_qaru03,132,172,0 duplicate(windpath01_main) windpath01_aru03 WARPNPC,1,1
+que_qaru04,132,172,0 duplicate(windpath01_main) windpath01_aru04 WARPNPC,1,1
+que_qaru05,132,172,0 duplicate(windpath01_main) windpath01_aru05 WARPNPC,1,1
+que_qsch01,132,172,0 duplicate(windpath01_main) windpath01_sch01 WARPNPC,1,1
+que_qsch02,132,172,0 duplicate(windpath01_main) windpath01_sch02 WARPNPC,1,1
+que_qsch03,132,172,0 duplicate(windpath01_main) windpath01_sch03 WARPNPC,1,1
+que_qsch04,132,172,0 duplicate(windpath01_main) windpath01_sch04 WARPNPC,1,1
+que_qsch05,132,172,0 duplicate(windpath01_main) windpath01_sch05 WARPNPC,1,1
que_qaru01,113,165,0 warp windpath02_aru01 1,1,que_qaru01,139,172
que_qaru02,113,165,0 warp windpath02_aru02 1,1,que_qaru02,139,172
@@ -1130,16 +1130,16 @@ OnTimer80000:
donpcevent "#gdtimer01_"+.@sub$+"::OnEnable";
end;
}
-que_qaru01,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_aru01 844
-que_qaru02,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_aru02 844
-que_qaru03,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_aru03 844
-que_qaru04,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_aru04 844
-que_qaru05,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_aru05 844
-que_qsch01,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_sch01 844
-que_qsch02,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_sch02 844
-que_qsch03,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_sch03 844
-que_qsch04,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_sch04 844
-que_qsch05,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_sch05 844
+que_qaru01,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_aru01 CLEAR_NPC
+que_qaru02,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_aru02 CLEAR_NPC
+que_qaru03,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_aru03 CLEAR_NPC
+que_qaru04,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_aru04 CLEAR_NPC
+que_qaru05,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_aru05 CLEAR_NPC
+que_qsch01,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_sch01 CLEAR_NPC
+que_qsch02,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_sch02 CLEAR_NPC
+que_qsch03,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_sch03 CLEAR_NPC
+que_qsch04,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_sch04 CLEAR_NPC
+que_qsch05,2,2,0 duplicate(#gdtimer01_main) #gdtimer01_sch05 CLEAR_NPC
- script #gdtimer02_main -1,{
end;
@@ -1204,16 +1204,16 @@ OnMyMobDead:
}
end;
}
-que_qaru01,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_aru01 844
-que_qaru02,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_aru02 844
-que_qaru03,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_aru03 844
-que_qaru04,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_aru04 844
-que_qaru05,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_aru05 844
-que_qsch01,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_sch01 844
-que_qsch02,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_sch02 844
-que_qsch03,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_sch03 844
-que_qsch04,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_sch04 844
-que_qsch05,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_sch05 844
+que_qaru01,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_aru01 CLEAR_NPC
+que_qaru02,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_aru02 CLEAR_NPC
+que_qaru03,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_aru03 CLEAR_NPC
+que_qaru04,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_aru04 CLEAR_NPC
+que_qaru05,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_aru05 CLEAR_NPC
+que_qsch01,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_sch01 CLEAR_NPC
+que_qsch02,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_sch02 CLEAR_NPC
+que_qsch03,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_sch03 CLEAR_NPC
+que_qsch04,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_sch04 CLEAR_NPC
+que_qsch05,2,3,0 duplicate(#gdtimer02_main) #gdtimer02_sch05 CLEAR_NPC
- script #piamette_main -1,{
OnEnable:
@@ -1247,16 +1247,16 @@ OnMyMobDead:
donpcevent "#nm_switch_"+.@sub$+"::OnEnable";
end;
}
-que_qaru01,1,4,0 duplicate(#piamette_main) #piamette_aru01 844
-que_qaru02,1,4,0 duplicate(#piamette_main) #piamette_aru02 844
-que_qaru03,1,4,0 duplicate(#piamette_main) #piamette_aru03 844
-que_qaru04,1,4,0 duplicate(#piamette_main) #piamette_aru04 844
-que_qaru05,1,4,0 duplicate(#piamette_main) #piamette_aru05 844
-que_qsch01,1,4,0 duplicate(#piamette_main) #piamette_sch01 844
-que_qsch02,1,4,0 duplicate(#piamette_main) #piamette_sch02 844
-que_qsch03,1,4,0 duplicate(#piamette_main) #piamette_sch03 844
-que_qsch04,1,4,0 duplicate(#piamette_main) #piamette_sch04 844
-que_qsch05,1,4,0 duplicate(#piamette_main) #piamette_sch05 844
+que_qaru01,1,4,0 duplicate(#piamette_main) #piamette_aru01 CLEAR_NPC
+que_qaru02,1,4,0 duplicate(#piamette_main) #piamette_aru02 CLEAR_NPC
+que_qaru03,1,4,0 duplicate(#piamette_main) #piamette_aru03 CLEAR_NPC
+que_qaru04,1,4,0 duplicate(#piamette_main) #piamette_aru04 CLEAR_NPC
+que_qaru05,1,4,0 duplicate(#piamette_main) #piamette_aru05 CLEAR_NPC
+que_qsch01,1,4,0 duplicate(#piamette_main) #piamette_sch01 CLEAR_NPC
+que_qsch02,1,4,0 duplicate(#piamette_main) #piamette_sch02 CLEAR_NPC
+que_qsch03,1,4,0 duplicate(#piamette_main) #piamette_sch03 CLEAR_NPC
+que_qsch04,1,4,0 duplicate(#piamette_main) #piamette_sch04 CLEAR_NPC
+que_qsch05,1,4,0 duplicate(#piamette_main) #piamette_sch05 CLEAR_NPC
- script #getspells_main -1,{
end;
@@ -1462,7 +1462,7 @@ que_qsch03,150,159,0 duplicate(#main_cages) #sch03_cage06 -1,1,1
que_qsch04,150,159,0 duplicate(#main_cages) #sch04_cage06 -1,1,1
que_qsch05,150,159,0 duplicate(#main_cages) #sch05_cage06 -1,1,1
-que_qaru01,1,8,0 script #gd_main_mobctrl 844,{
+que_qaru01,1,8,0 script #gd_main_mobctrl CLEAR_NPC,{
end;
OnEnable:
@@ -1497,16 +1497,16 @@ OnMyMobDead:
}
end;
}
-que_qaru01,1,8,0 duplicate(#gd_main_mobctrl) #gd_aru01_mobctrl 844
-que_qaru02,1,8,0 duplicate(#gd_main_mobctrl) #gd_aru02_mobctrl 844
-que_qaru03,1,8,0 duplicate(#gd_main_mobctrl) #gd_aru03_mobctrl 844
-que_qaru04,1,8,0 duplicate(#gd_main_mobctrl) #gd_aru04_mobctrl 844
-que_qaru05,1,8,0 duplicate(#gd_main_mobctrl) #gd_aru05_mobctrl 844
-que_qsch01,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch01_mobctrl 844
-que_qsch02,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch02_mobctrl 844
-que_qsch03,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch03_mobctrl 844
-que_qsch04,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch04_mobctrl 844
-que_qsch05,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch05_mobctrl 844
+que_qaru01,1,8,0 duplicate(#gd_main_mobctrl) #gd_aru01_mobctrl CLEAR_NPC
+que_qaru02,1,8,0 duplicate(#gd_main_mobctrl) #gd_aru02_mobctrl CLEAR_NPC
+que_qaru03,1,8,0 duplicate(#gd_main_mobctrl) #gd_aru03_mobctrl CLEAR_NPC
+que_qaru04,1,8,0 duplicate(#gd_main_mobctrl) #gd_aru04_mobctrl CLEAR_NPC
+que_qaru05,1,8,0 duplicate(#gd_main_mobctrl) #gd_aru05_mobctrl CLEAR_NPC
+que_qsch01,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch01_mobctrl CLEAR_NPC
+que_qsch02,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch02_mobctrl CLEAR_NPC
+que_qsch03,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch03_mobctrl CLEAR_NPC
+que_qsch04,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch04_mobctrl CLEAR_NPC
+que_qsch05,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch05_mobctrl CLEAR_NPC
- script windpaths_main -1,{
end;
@@ -1526,27 +1526,27 @@ OnInit:
disablenpc "windpath04_"+.@sub$;
end;
}
-que_qaru01,149,105,0 duplicate(windpaths_main) windpath03_aru01 45,1,1
-que_qaru02,149,105,0 duplicate(windpaths_main) windpath03_aru02 45,1,1
-que_qaru03,149,105,0 duplicate(windpaths_main) windpath03_aru03 45,1,1
-que_qaru04,149,105,0 duplicate(windpaths_main) windpath03_aru04 45,1,1
-que_qaru05,149,105,0 duplicate(windpaths_main) windpath03_aru05 45,1,1
-que_qsch01,149,105,0 duplicate(windpaths_main) windpath03_sch01 45,1,1
-que_qsch02,149,105,0 duplicate(windpaths_main) windpath03_sch02 45,1,1
-que_qsch03,149,105,0 duplicate(windpaths_main) windpath03_sch03 45,1,1
-que_qsch04,149,105,0 duplicate(windpaths_main) windpath03_sch04 45,1,1
-que_qsch05,149,105,0 duplicate(windpaths_main) windpath03_sch05 45,1,1
-
-que_qaru01,128,104,0 duplicate(windpaths_main) windpath04_aru01 45,1,1
-que_qaru02,128,104,0 duplicate(windpaths_main) windpath04_aru02 45,1,1
-que_qaru03,128,104,0 duplicate(windpaths_main) windpath04_aru03 45,1,1
-que_qaru04,128,104,0 duplicate(windpaths_main) windpath04_aru04 45,1,1
-que_qaru05,128,104,0 duplicate(windpaths_main) windpath04_aru05 45,1,1
-que_qsch01,128,104,0 duplicate(windpaths_main) windpath04_sch01 45,1,1
-que_qsch02,128,104,0 duplicate(windpaths_main) windpath04_sch02 45,1,1
-que_qsch03,128,104,0 duplicate(windpaths_main) windpath04_sch03 45,1,1
-que_qsch04,128,104,0 duplicate(windpaths_main) windpath04_sch04 45,1,1
-que_qsch05,128,104,0 duplicate(windpaths_main) windpath04_sch05 45,1,1
+que_qaru01,149,105,0 duplicate(windpaths_main) windpath03_aru01 WARPNPC,1,1
+que_qaru02,149,105,0 duplicate(windpaths_main) windpath03_aru02 WARPNPC,1,1
+que_qaru03,149,105,0 duplicate(windpaths_main) windpath03_aru03 WARPNPC,1,1
+que_qaru04,149,105,0 duplicate(windpaths_main) windpath03_aru04 WARPNPC,1,1
+que_qaru05,149,105,0 duplicate(windpaths_main) windpath03_aru05 WARPNPC,1,1
+que_qsch01,149,105,0 duplicate(windpaths_main) windpath03_sch01 WARPNPC,1,1
+que_qsch02,149,105,0 duplicate(windpaths_main) windpath03_sch02 WARPNPC,1,1
+que_qsch03,149,105,0 duplicate(windpaths_main) windpath03_sch03 WARPNPC,1,1
+que_qsch04,149,105,0 duplicate(windpaths_main) windpath03_sch04 WARPNPC,1,1
+que_qsch05,149,105,0 duplicate(windpaths_main) windpath03_sch05 WARPNPC,1,1
+
+que_qaru01,128,104,0 duplicate(windpaths_main) windpath04_aru01 WARPNPC,1,1
+que_qaru02,128,104,0 duplicate(windpaths_main) windpath04_aru02 WARPNPC,1,1
+que_qaru03,128,104,0 duplicate(windpaths_main) windpath04_aru03 WARPNPC,1,1
+que_qaru04,128,104,0 duplicate(windpaths_main) windpath04_aru04 WARPNPC,1,1
+que_qaru05,128,104,0 duplicate(windpaths_main) windpath04_aru05 WARPNPC,1,1
+que_qsch01,128,104,0 duplicate(windpaths_main) windpath04_sch01 WARPNPC,1,1
+que_qsch02,128,104,0 duplicate(windpaths_main) windpath04_sch02 WARPNPC,1,1
+que_qsch03,128,104,0 duplicate(windpaths_main) windpath04_sch03 WARPNPC,1,1
+que_qsch04,128,104,0 duplicate(windpaths_main) windpath04_sch04 WARPNPC,1,1
+que_qsch05,128,104,0 duplicate(windpaths_main) windpath04_sch05 WARPNPC,1,1
- script #nm_switch_main -1,{
end;
@@ -1693,16 +1693,16 @@ OnMyMobDead:
}
end;
}
-que_qaru01,2,8,0 duplicate(#main_stone01) #aru01_stone01 844
-que_qaru02,2,8,0 duplicate(#main_stone01) #aru02_stone01 844
-que_qaru03,2,8,0 duplicate(#main_stone01) #aru03_stone01 844
-que_qaru04,2,8,0 duplicate(#main_stone01) #aru04_stone01 844
-que_qaru05,2,8,0 duplicate(#main_stone01) #aru05_stone01 844
-que_qsch01,2,8,0 duplicate(#main_stone01) #sch01_stone01 844
-que_qsch02,2,8,0 duplicate(#main_stone01) #sch02_stone01 844
-que_qsch03,2,8,0 duplicate(#main_stone01) #sch03_stone01 844
-que_qsch04,2,8,0 duplicate(#main_stone01) #sch04_stone01 844
-que_qsch05,2,8,0 duplicate(#main_stone01) #sch05_stone01 844
+que_qaru01,2,8,0 duplicate(#main_stone01) #aru01_stone01 CLEAR_NPC
+que_qaru02,2,8,0 duplicate(#main_stone01) #aru02_stone01 CLEAR_NPC
+que_qaru03,2,8,0 duplicate(#main_stone01) #aru03_stone01 CLEAR_NPC
+que_qaru04,2,8,0 duplicate(#main_stone01) #aru04_stone01 CLEAR_NPC
+que_qaru05,2,8,0 duplicate(#main_stone01) #aru05_stone01 CLEAR_NPC
+que_qsch01,2,8,0 duplicate(#main_stone01) #sch01_stone01 CLEAR_NPC
+que_qsch02,2,8,0 duplicate(#main_stone01) #sch02_stone01 CLEAR_NPC
+que_qsch03,2,8,0 duplicate(#main_stone01) #sch03_stone01 CLEAR_NPC
+que_qsch04,2,8,0 duplicate(#main_stone01) #sch04_stone01 CLEAR_NPC
+que_qsch05,2,8,0 duplicate(#main_stone01) #sch05_stone01 CLEAR_NPC
- script #nmsommain_jin02 -1,{
OnEnable:
@@ -1777,16 +1777,16 @@ OnMyMobDead:
}
end;
}
-que_qaru01,2,9,0 duplicate(#main_stone02) #aru01_stone02 844
-que_qaru02,2,9,0 duplicate(#main_stone02) #aru02_stone02 844
-que_qaru03,2,9,0 duplicate(#main_stone02) #aru03_stone02 844
-que_qaru04,2,9,0 duplicate(#main_stone02) #aru04_stone02 844
-que_qaru05,2,9,0 duplicate(#main_stone02) #aru05_stone02 844
-que_qsch01,2,9,0 duplicate(#main_stone02) #sch01_stone02 844
-que_qsch02,2,9,0 duplicate(#main_stone02) #sch02_stone02 844
-que_qsch03,2,9,0 duplicate(#main_stone02) #sch03_stone02 844
-que_qsch04,2,9,0 duplicate(#main_stone02) #sch04_stone02 844
-que_qsch05,2,9,0 duplicate(#main_stone02) #sch05_stone02 844
+que_qaru01,2,9,0 duplicate(#main_stone02) #aru01_stone02 CLEAR_NPC
+que_qaru02,2,9,0 duplicate(#main_stone02) #aru02_stone02 CLEAR_NPC
+que_qaru03,2,9,0 duplicate(#main_stone02) #aru03_stone02 CLEAR_NPC
+que_qaru04,2,9,0 duplicate(#main_stone02) #aru04_stone02 CLEAR_NPC
+que_qaru05,2,9,0 duplicate(#main_stone02) #aru05_stone02 CLEAR_NPC
+que_qsch01,2,9,0 duplicate(#main_stone02) #sch01_stone02 CLEAR_NPC
+que_qsch02,2,9,0 duplicate(#main_stone02) #sch02_stone02 CLEAR_NPC
+que_qsch03,2,9,0 duplicate(#main_stone02) #sch03_stone02 CLEAR_NPC
+que_qsch04,2,9,0 duplicate(#main_stone02) #sch04_stone02 CLEAR_NPC
+que_qsch05,2,9,0 duplicate(#main_stone02) #sch05_stone02 CLEAR_NPC
- script #nmsommain_jin03 -1,{
OnEnable:
@@ -1870,16 +1870,16 @@ OnMyMobDead:
}
end;
}
-que_qaru01,2,10,0 duplicate(#main_stone03) #aru01_stone03 844
-que_qaru02,2,10,0 duplicate(#main_stone03) #aru02_stone03 844
-que_qaru03,2,10,0 duplicate(#main_stone03) #aru03_stone03 844
-que_qaru04,2,10,0 duplicate(#main_stone03) #aru04_stone03 844
-que_qaru05,2,10,0 duplicate(#main_stone03) #aru05_stone03 844
-que_qsch01,2,10,0 duplicate(#main_stone03) #sch01_stone03 844
-que_qsch02,2,10,0 duplicate(#main_stone03) #sch02_stone03 844
-que_qsch03,2,10,0 duplicate(#main_stone03) #sch03_stone03 844
-que_qsch04,2,10,0 duplicate(#main_stone03) #sch04_stone03 844
-que_qsch05,2,10,0 duplicate(#main_stone03) #sch05_stone03 844
+que_qaru01,2,10,0 duplicate(#main_stone03) #aru01_stone03 CLEAR_NPC
+que_qaru02,2,10,0 duplicate(#main_stone03) #aru02_stone03 CLEAR_NPC
+que_qaru03,2,10,0 duplicate(#main_stone03) #aru03_stone03 CLEAR_NPC
+que_qaru04,2,10,0 duplicate(#main_stone03) #aru04_stone03 CLEAR_NPC
+que_qaru05,2,10,0 duplicate(#main_stone03) #aru05_stone03 CLEAR_NPC
+que_qsch01,2,10,0 duplicate(#main_stone03) #sch01_stone03 CLEAR_NPC
+que_qsch02,2,10,0 duplicate(#main_stone03) #sch02_stone03 CLEAR_NPC
+que_qsch03,2,10,0 duplicate(#main_stone03) #sch03_stone03 CLEAR_NPC
+que_qsch04,2,10,0 duplicate(#main_stone03) #sch04_stone03 CLEAR_NPC
+que_qsch05,2,10,0 duplicate(#main_stone03) #sch05_stone03 CLEAR_NPC
- script Guard of Shadow#main_all -1,{
end;
@@ -2257,16 +2257,16 @@ OnInit:
disablenpc "Wish Maiden#"+.@sub$+"_gift";
end;
}
-que_qaru01,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#aru01_gift 403
-que_qaru02,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#aru02_gift 403
-que_qaru03,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#aru03_gift 403
-que_qaru04,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#aru04_gift 403
-que_qaru05,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#aru05_gift 403
-que_qsch01,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch01_gift 403
-que_qsch02,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch02_gift 403
-que_qsch03,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch03_gift 403
-que_qsch04,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch04_gift 403
-que_qsch05,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch05_gift 403
+que_qaru01,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#aru01_gift 4_F_VALKYRIE2
+que_qaru02,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#aru02_gift 4_F_VALKYRIE2
+que_qaru03,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#aru03_gift 4_F_VALKYRIE2
+que_qaru04,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#aru04_gift 4_F_VALKYRIE2
+que_qaru05,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#aru05_gift 4_F_VALKYRIE2
+que_qsch01,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch01_gift 4_F_VALKYRIE2
+que_qsch02,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch02_gift 4_F_VALKYRIE2
+que_qsch03,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch03_gift 4_F_VALKYRIE2
+que_qsch04,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch04_gift 4_F_VALKYRIE2
+que_qsch05,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch05_gift 4_F_VALKYRIE2
- script #to_agit_main_gate -1,{
end;
@@ -2281,16 +2281,16 @@ OnInit:
disablenpc "#to_agit_"+.@sub$+"_gate";
end;
}
-que_qaru01,252,339,0 duplicate(#to_agit_main_gate) #to_agit_aru01_gate 45,1,1
-que_qaru02,252,339,0 duplicate(#to_agit_main_gate) #to_agit_aru02_gate 45,1,1
-que_qaru03,252,339,0 duplicate(#to_agit_main_gate) #to_agit_aru03_gate 45,1,1
-que_qaru04,252,339,0 duplicate(#to_agit_main_gate) #to_agit_aru04_gate 45,1,1
-que_qaru05,252,339,0 duplicate(#to_agit_main_gate) #to_agit_aru05_gate 45,1,1
-que_qsch01,252,339,0 duplicate(#to_agit_main_gate) #to_agit_sch01_gate 45,1,1
-que_qsch02,252,339,0 duplicate(#to_agit_main_gate) #to_agit_sch02_gate 45,1,1
-que_qsch03,252,339,0 duplicate(#to_agit_main_gate) #to_agit_sch03_gate 45,1,1
-que_qsch04,252,339,0 duplicate(#to_agit_main_gate) #to_agit_sch04_gate 45,1,1
-que_qsch05,252,339,0 duplicate(#to_agit_main_gate) #to_agit_sch05_gate 45,1,1
+que_qaru01,252,339,0 duplicate(#to_agit_main_gate) #to_agit_aru01_gate WARPNPC,1,1
+que_qaru02,252,339,0 duplicate(#to_agit_main_gate) #to_agit_aru02_gate WARPNPC,1,1
+que_qaru03,252,339,0 duplicate(#to_agit_main_gate) #to_agit_aru03_gate WARPNPC,1,1
+que_qaru04,252,339,0 duplicate(#to_agit_main_gate) #to_agit_aru04_gate WARPNPC,1,1
+que_qaru05,252,339,0 duplicate(#to_agit_main_gate) #to_agit_aru05_gate WARPNPC,1,1
+que_qsch01,252,339,0 duplicate(#to_agit_main_gate) #to_agit_sch01_gate WARPNPC,1,1
+que_qsch02,252,339,0 duplicate(#to_agit_main_gate) #to_agit_sch02_gate WARPNPC,1,1
+que_qsch03,252,339,0 duplicate(#to_agit_main_gate) #to_agit_sch03_gate WARPNPC,1,1
+que_qsch04,252,339,0 duplicate(#to_agit_main_gate) #to_agit_sch04_gate WARPNPC,1,1
+que_qsch05,252,339,0 duplicate(#to_agit_main_gate) #to_agit_sch05_gate WARPNPC,1,1
- script #okolnir_main_time01 -1,{
end;
@@ -2329,16 +2329,16 @@ OnInit:
if (getd("$siz_"+.@sub$+"_on") == 2) initnpctimer;
end;
}
-que_qaru01,1,6,0 duplicate(#okolnir_main_time01) #okolnir_aru01_time01 844
-que_qaru02,1,6,0 duplicate(#okolnir_main_time01) #okolnir_aru02_time01 844
-que_qaru03,1,6,0 duplicate(#okolnir_main_time01) #okolnir_aru03_time01 844
-que_qaru04,1,6,0 duplicate(#okolnir_main_time01) #okolnir_aru04_time01 844
-que_qaru05,1,6,0 duplicate(#okolnir_main_time01) #okolnir_aru05_time01 844
-que_qsch01,1,6,0 duplicate(#okolnir_main_time01) #okolnir_sch01_time01 844
-que_qsch02,1,6,0 duplicate(#okolnir_main_time01) #okolnir_sch02_time01 844
-que_qsch03,1,6,0 duplicate(#okolnir_main_time01) #okolnir_sch03_time01 844
-que_qsch04,1,6,0 duplicate(#okolnir_main_time01) #okolnir_sch04_time01 844
-que_qsch05,1,6,0 duplicate(#okolnir_main_time01) #okolnir_sch05_time01 844
+que_qaru01,1,6,0 duplicate(#okolnir_main_time01) #okolnir_aru01_time01 CLEAR_NPC
+que_qaru02,1,6,0 duplicate(#okolnir_main_time01) #okolnir_aru02_time01 CLEAR_NPC
+que_qaru03,1,6,0 duplicate(#okolnir_main_time01) #okolnir_aru03_time01 CLEAR_NPC
+que_qaru04,1,6,0 duplicate(#okolnir_main_time01) #okolnir_aru04_time01 CLEAR_NPC
+que_qaru05,1,6,0 duplicate(#okolnir_main_time01) #okolnir_aru05_time01 CLEAR_NPC
+que_qsch01,1,6,0 duplicate(#okolnir_main_time01) #okolnir_sch01_time01 CLEAR_NPC
+que_qsch02,1,6,0 duplicate(#okolnir_main_time01) #okolnir_sch02_time01 CLEAR_NPC
+que_qsch03,1,6,0 duplicate(#okolnir_main_time01) #okolnir_sch03_time01 CLEAR_NPC
+que_qsch04,1,6,0 duplicate(#okolnir_main_time01) #okolnir_sch04_time01 CLEAR_NPC
+que_qsch05,1,6,0 duplicate(#okolnir_main_time01) #okolnir_sch05_time01 CLEAR_NPC
que_qaru01,116,313,0,0 monster Garden Keeper 1932,1,180000,0,0
que_qaru01,120,285,0,0 monster Garden Keeper 1932,1,180000,0,0
diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt
index 91c43db0c..876fb735d 100644
--- a/npc/quests/partyrelay.txt
+++ b/npc/quests/partyrelay.txt
@@ -13,7 +13,7 @@
//= 1.2 Updated RE/Pre-RE EXP. [Euphy]
//============================================================
-payon,103,113,3 script Ledrion#payon::RelayLedrion 109,{
+payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{
getpartymember(getcharid(1));
set .@partymembercount,$@partymembercount;
set .@partyleader,getpartyleader(getcharid(1),2);
@@ -381,7 +381,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 109,{
}
}
-payon,83,327,3 script Gatan#payon::RelayGatan 86,{
+payon,83,327,3 script Gatan#payon::RelayGatan 4_M_04,{
getpartymember(getcharid(1));
set .@partymembercount,$@partymembercount;
set .@partyleader,getpartyleader(getcharid(1),2);
@@ -1816,7 +1816,7 @@ payon,83,327,3 script Gatan#payon::RelayGatan 86,{
close;
}
-payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{
+payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
getpartymember(getcharid(1));
set .@partymembercount,$@partymembercount;
set .@partyleader,getpartyleader(getcharid(1),2);
@@ -2449,7 +2449,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{
close;
}
-payon,168,314,3 script Lospii#payon::RelayLospii 706,{
+payon,168,314,3 script Lospii#payon::RelayLospii 4_M_KID1,{
getpartymember(getcharid(1));
set .@partymembercount,$@partymembercount;
set .@partyleader,getpartyleader(getcharid(1),2);
@@ -3098,31 +3098,31 @@ function script F_PartyRelay_Exp {
}
// Comodo Relay
-comodo,71,137,3 duplicate(RelayLedrion) Ledrion#comodo 109
-comodo,236,197,3 duplicate(RelayGatan) Gatan#comodo 86
-comodo,152,184,3 duplicate(RelayBafhail) Bafhail#comodo 731
-comodo,64,219,3 duplicate(RelayLospii) Lospii#comodo 706
+comodo,71,137,3 duplicate(RelayLedrion) Ledrion#comodo 4_M_MANAGER
+comodo,236,197,3 duplicate(RelayGatan) Gatan#comodo 4_M_04
+comodo,152,184,3 duplicate(RelayBafhail) Bafhail#comodo 4_M_JOB_BLACKSMITH
+comodo,64,219,3 duplicate(RelayLospii) Lospii#comodo 4_M_KID1
// Einbroch Relay
-einbroch,107,93,3 duplicate(RelayLedrion) Ledrion#einbroch 109
-einbroch,260,128,3 duplicate(RelayGatan) Gatan#einbroch 86
-einbroch,251,178,3 duplicate(RelayBafhail) Bafhail#einbroch 731
-einbroch,173,72,3 duplicate(RelayLospii) Lospii#einbroch 706
+einbroch,107,93,3 duplicate(RelayLedrion) Ledrion#einbroch 4_M_MANAGER
+einbroch,260,128,3 duplicate(RelayGatan) Gatan#einbroch 4_M_04
+einbroch,251,178,3 duplicate(RelayBafhail) Bafhail#einbroch 4_M_JOB_BLACKSMITH
+einbroch,173,72,3 duplicate(RelayLospii) Lospii#einbroch 4_M_KID1
// Relay Hugel
-hugel,102,130,3 duplicate(RelayLedrion) Ledrion#hugel 109
-hugel,169,139,3 duplicate(RelayGatan) Gatan#hugel 86
-hugel,55,200,3 duplicate(RelayBafhail) Bafhail#hugel 731
-hugel,144,201,3 duplicate(RelayLospii) Lospii#hugel 706
+hugel,102,130,3 duplicate(RelayLedrion) Ledrion#hugel 4_M_MANAGER
+hugel,169,139,3 duplicate(RelayGatan) Gatan#hugel 4_M_04
+hugel,55,200,3 duplicate(RelayBafhail) Bafhail#hugel 4_M_JOB_BLACKSMITH
+hugel,144,201,3 duplicate(RelayLospii) Lospii#hugel 4_M_KID1
// Relay Rachel
-rachel,215,71,3 duplicate(RelayLedrion) Ledrion#rachel 109
-rachel,45,163,3 duplicate(RelayGatan) Gatan#rachel 86
-rachel,245,132,3 duplicate(RelayBafhail) Bafhail#rachel 731
-rachel,158,215,3 duplicate(RelayLospii) Lospii#rachel 706
+rachel,215,71,3 duplicate(RelayLedrion) Ledrion#rachel 4_M_MANAGER
+rachel,45,163,3 duplicate(RelayGatan) Gatan#rachel 4_M_04
+rachel,245,132,3 duplicate(RelayBafhail) Bafhail#rachel 4_M_JOB_BLACKSMITH
+rachel,158,215,3 duplicate(RelayLospii) Lospii#rachel 4_M_KID1
// Relay Veins
-veins,274,188,5 duplicate(RelayLedrion) Ledrion#veins 109
-veins,138,207,3 duplicate(RelayGatan) Gatan#veins 86
-veins,202,235,3 duplicate(RelayBafhail) Bafhail#veins 731
-veins,97,245,5 duplicate(RelayLospii) Lospii#veins 706
+veins,274,188,5 duplicate(RelayLedrion) Ledrion#veins 4_M_MANAGER
+veins,138,207,3 duplicate(RelayGatan) Gatan#veins 4_M_04
+veins,202,235,3 duplicate(RelayBafhail) Bafhail#veins 4_M_JOB_BLACKSMITH
+veins,97,245,5 duplicate(RelayLospii) Lospii#veins 4_M_KID1
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 5b4b43f94..4516ce917 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -79,12 +79,12 @@ function script Promotional_Staff {
}
}
-prontera,163,53,3 script Promotional Staff#prt 100,{
+prontera,163,53,3 script Promotional Staff#prt 4W_SAILOR,{
callfunc "Promotional_Staff";
end;
}
-prt_castle,121,51,3 script Alliance Manager#prt 752,{
+prt_castle,121,51,3 script Alliance Manager#prt 4_M_CRU_OLD,{
if (ep13_ryu == 13) {
mes "[Alliance Manager]";
mes "If we'd had the initiative over Schwartzvald, we could take advantage over them! But we lost the opportunity.";
@@ -170,7 +170,7 @@ prt_castle,121,51,3 script Alliance Manager#prt 752,{
close;
}
-prt_castle,117,51,5 script Member of Alliance#prt 754,{
+prt_castle,117,51,5 script Member of Alliance#prt 4_M_SAGE_A,{
if ((ep13_ryu == 12) || (ep13_ryu == 13)) {
mes "[Member of Alliance]";
mes "If we have absolute power, we wouldn't have to get along with Schwartzvald and Arunafeltz.";
@@ -192,7 +192,7 @@ prt_castle,117,51,5 script Member of Alliance#prt 754,{
close;
}
-prt_castle,83,67,5 script Recruiter for the Brave 109,{
+prt_castle,83,67,5 script Recruiter for the Brave 4_M_MANAGER,{
if (ep13_ryu == 12) {
mes "[Recruiter]";
mes "Why have you come again?";
@@ -350,7 +350,7 @@ prt_castle,83,67,5 script Recruiter for the Brave 109,{
}
}
-aldebaran,127,138,3 script Promotional Staff#alde 100,{
+aldebaran,127,138,3 script Promotional Staff#alde 4W_SAILOR,{
if (ep13_ryu > 3) {
mes "[Promotional Staff]";
mes "Did you try out for the test, or are you already enjoying your adventures?";
@@ -450,7 +450,7 @@ aldebaran,127,138,3 script Promotional Staff#alde 100,{
end;
}
-geffen,90,67,3 script Promotional Staff#gef 100,{
+geffen,90,67,3 script Promotional Staff#gef 4W_SAILOR,{
if (ep13_ryu > 6) {
mes "[Promotional Staff]";
mes "Did you take the test?";
@@ -699,7 +699,7 @@ geffen,90,67,3 script Promotional Staff#gef 100,{
end;
}
-lighthalzen,220,292,3 script Guide#ep13_1 899,{
+lighthalzen,220,292,3 script Guide#ep13_1 4_M_HUMAN_02,{
if (ep13_ryu > 8) {
mes "[Guide]";
mes "Welcome! You've arrived at Lighthalzen, which is the base of three kingdoms.";
@@ -716,7 +716,7 @@ lighthalzen,220,292,3 script Guide#ep13_1 899,{
close;
}
-lhz_in01,136,260,5 script Munkenro#1 967,{
+lhz_in01,136,260,5 script Munkenro#1 4_M_RUSMAN1,{
if (ep13_ryu == 20) {
mes "-At this spot, it's possible to overhear something. Listen carefully through the wall...-";
next;
@@ -787,7 +787,7 @@ lhz_in01,136,260,5 script Munkenro#1 967,{
close;
}
-lhz_in01,132,259,5 script Sikaiz#1 868,{
+lhz_in01,132,259,5 script Sikaiz#1 4_M_LGTGUARD,{
if ((ep13_ryu == 18) || (ep13_ryu == 19)) {
mes "[Sikaiz]";
mes "Please come to me ASAP.";
@@ -1128,35 +1128,35 @@ function script Guard_13_1 {
end;
}
-lhz_in01,115,250,3 script Guard#ep13_1-1 899,2,2,{
+lhz_in01,115,250,3 script Guard#ep13_1-1 4_M_HUMAN_02,2,2,{
callfunc "Guard_13_1",0,108,252;
OnTouch:
callfunc "Guard_13_1",1,108,252;
}
-lhz_in01,115,252,3 duplicate(Guard#ep13_1-1) Guard#ep13_1-2 899,2,2
+lhz_in01,115,252,3 duplicate(Guard#ep13_1-1) Guard#ep13_1-2 4_M_HUMAN_02,2,2
-lhz_in01,147,252,7 script Guard#ep13_1-3 899,2,2,{
+lhz_in01,147,252,7 script Guard#ep13_1-3 4_M_HUMAN_02,2,2,{
callfunc "Guard_13_1",0,152,252;
OnTouch:
callfunc "Guard_13_1",1,152,252;
}
-lhz_in01,147,250,7 duplicate(Guard#ep13_1-3) Guard#ep13_1-4 899,2,2
+lhz_in01,147,250,7 duplicate(Guard#ep13_1-3) Guard#ep13_1-4 4_M_HUMAN_02,2,2
-lhz_in01,124,234,5 script Guard#ep13_1-5 899,2,2,{
+lhz_in01,124,234,5 script Guard#ep13_1-5 4_M_HUMAN_02,2,2,{
callfunc "Guard_13_1",0,123,229;
OnTouch:
callfunc "Guard_13_1",1,123,229;
}
-lhz_in01,121,234,5 duplicate(Guard#ep13_1-5) Guard#ep13_1-6 899,2,2
+lhz_in01,121,234,5 duplicate(Guard#ep13_1-5) Guard#ep13_1-6 4_M_HUMAN_02,2,2
-lhz_in01,137,234,5 script Guard#ep13_1-7 899,2,2,{
+lhz_in01,137,234,5 script Guard#ep13_1-7 4_M_HUMAN_02,2,2,{
callfunc "Guard_13_1",0,139,228;
OnTouch:
callfunc "Guard_13_1",1,139,228;
}
-lhz_in01,140,234,5 duplicate(Guard#ep13_1-7) Guard#ep13_1-8 899,2,2
+lhz_in01,140,234,5 duplicate(Guard#ep13_1-7) Guard#ep13_1-8 4_M_HUMAN_02,2,2
-lhz_in01,130,232,5 script Guard#ep13_1-9 899,{
+lhz_in01,130,232,5 script Guard#ep13_1-9 4_M_HUMAN_02,{
if (ep13_ryu > 19) {
mes "[Guard]";
mes "You're not allowed to enter.";
@@ -1206,7 +1206,7 @@ lhz_in01,130,232,5 script Guard#ep13_1-9 899,{
}
}
-lhz_in01,128,249,1 script Member of Alliance#1 904,{
+lhz_in01,128,249,1 script Member of Alliance#1 4_M_KHMAN,{
if (ep13_ryu > 19) {
mes "-Munkenro and Sakaiz don't seem to be getting along very well anymore.-";
close;
@@ -1217,7 +1217,7 @@ lhz_in01,128,249,1 script Member of Alliance#1 904,{
close;
}
-lhz_in01,136,245,1 script Member of Alliance#2 869,{
+lhz_in01,136,245,1 script Member of Alliance#2 4_M_LGTMAN,{
if (ep13_ryu > 19) {
mes "-You should probably head over to the dimensional rift next to Morroc and find the Guard there-";
close;
@@ -1234,7 +1234,7 @@ lhz_in01,136,245,1 script Member of Alliance#2 869,{
close;
}
-lhz_in01,140,245,1 script Member of Alliance#3 85,{
+lhz_in01,140,245,1 script Member of Alliance#3 4_M_03,{
if (ep13_ryu > 19) {
mes "-You're still here? You're a member of the alliance now so you should head to the dimensional rift next to Morroc and find the Guard there-";
close;
@@ -1251,7 +1251,7 @@ lhz_in01,140,245,1 script Member of Alliance#3 85,{
close;
}
-lhz_in01,136,249,1 script Member of Alliance#4 865,{
+lhz_in01,136,249,1 script Member of Alliance#4 4_LGTSCIENCE,{
if (ep13_ryu > 19) {
mes "-I'm sure they'll settle their little dispute somehow. You should be heading to the dimensional rift next to Morroc and find the Guard there-";
close;
@@ -1271,7 +1271,7 @@ lhz_in01,136,249,1 script Member of Alliance#4 865,{
close;
}
-lhz_in01,124,245,1 script Member of Alliance#5 932,{
+lhz_in01,124,245,1 script Member of Alliance#5 4_M_RACHOLD1,{
if (ep13_ryu > 19) {
mes "-Maybe Munk is a better leader instead of Sakaiz. Anyways you should be heading to the dimensional rift next to Morroc and find the Guard there-";
close;
@@ -1288,7 +1288,7 @@ lhz_in01,124,245,1 script Member of Alliance#5 932,{
close;
}
-lhz_in01,136,241,3 script Member of Alliance#6 849,{
+lhz_in01,136,241,3 script Member of Alliance#6 4_M_DIEMAN,{
if (ep13_ryu > 19) {
mes "-I'm so bored!!! You should be heading to the dimensional rift next to Morroc and find the Guard there. It's probably less boring there than it is here-";
close;
@@ -1304,7 +1304,7 @@ lhz_in01,136,241,3 script Member of Alliance#6 849,{
close;
}
-lhz_in01,126,249,1 script Member of Alliance#7 930,{
+lhz_in01,126,249,1 script Member of Alliance#7 4_M_RACHMAN2,{
if (ep13_ryu > 19) {
mes "-We haven't even started and we're already bickering. Just ignore the politics and head to the dimensional rift next to Morroc and find the Guard there-";
close;
@@ -1315,7 +1315,7 @@ lhz_in01,126,249,1 script Member of Alliance#7 930,{
close;
}
-lhz_in01,122,245,1 script Member of Alliance#8 882,{
+lhz_in01,122,245,1 script Member of Alliance#8 4_F_SITDOWN,{
if (ep13_ryu > 19) {
mes "-You shouldn't stay around here and listen to all the complaining. You should be heading to the dimensional rift next to Morroc and find the Guard there-";
close;
@@ -1331,7 +1331,7 @@ lhz_in01,122,245,1 script Member of Alliance#8 882,{
close;
}
-ra_temple,119,113,3 script Alliance Manager#ra 935,{
+ra_temple,119,113,3 script Alliance Manager#ra 4_M_TRAINEE,{
if (ep13_ryu == 16) {
mes "[Manager]";
mes "With blessings from the Goddess Freya! We three kingdoms will know success! It's all we want. ...Khkhkhkh...";
@@ -1371,7 +1371,7 @@ ra_temple,119,113,3 script Alliance Manager#ra 935,{
close;
}
-lhz_in01,32,22,3 script Officer A 109,{
+lhz_in01,32,22,3 script Officer A 4_M_MANAGER,{
if (ep13_ryu == 20) {
mes "[Officer]";
mes "Why don't you go back there?";
@@ -1480,7 +1480,7 @@ lhz_in01,32,22,3 script Officer A 109,{
close;
}
-lhz_in01,30,24,5 script Officer B 109,{
+lhz_in01,30,24,5 script Officer B 4_M_MANAGER,{
if (ep13_ryu == 20) {
mes "[Officer]";
mes "Why don't you go back there?";
@@ -1588,7 +1588,7 @@ lhz_in01,30,24,5 script Officer B 109,{
close;
}
-moc_fild20,349,179,3 script Rift Guard#1 707,{
+moc_fild20,349,179,3 script Rift Guard#1 4_M_MOC_SOLDIER,{
if (ep13_ryu > 19) {
mes "[Guard]";
mes "Ah, you are a member of the alliance that discovered the dimensional rift? Welcome. Everything is prepared. Just enter and find the camp when you pass through the rift.";
@@ -1619,7 +1619,7 @@ moc_fild20,349,179,3 script Rift Guard#1 707,{
close;
}
-moc_fild22b,37,196,5 script Rift Guard#2 707,{
+moc_fild22b,37,196,5 script Rift Guard#2 4_M_MOC_SOLDIER,{
mes "[Guard]";
mes "Are you the new adventurer?";
mes "If you're going to the other side of the rift, the head of the alliance will guide you there.";
@@ -1645,7 +1645,7 @@ moc_fild22b,37,196,5 script Rift Guard#2 707,{
}
}
-moc_fild22b,330,154,3 script Rift Guard#3 707,{
+moc_fild22b,330,154,3 script Rift Guard#3 4_M_MOC_SOLDIER,{
mes "[Guard]";
mes "Are you new here?";
mes "You look like you need to find the head of the alliance. You can find him near the center of the dimensional rift.";
@@ -1657,7 +1657,7 @@ moc_fild22b,330,154,3 script Rift Guard#3 707,{
close;
}
-moc_fild22b,230,197,5 script Munkenro#2 967,{
+moc_fild22b,230,197,5 script Munkenro#2 4_M_RUSMAN1,{
if (ep13_ryu == 100) {
mes "[Munkenro]";
mes "Are you ready to discover Ash-Vacuum?";
@@ -1833,7 +1833,7 @@ OnTimer900000:
end;
}
-mid_camp,213,286,3 script Rift Guard#4 707,{
+mid_camp,213,286,3 script Rift Guard#4 4_M_MOC_SOLDIER,{
mes "[Guard]";
mes "Are you the new adventurer?";
mes "If you're going to the other side of the rift, the head of the alliance will guide you there.";
@@ -1859,7 +1859,7 @@ mid_camp,213,286,3 script Rift Guard#4 707,{
}
}
-moc_ruins,137,89,5 script Time-Space Gap Guard 707,{
+moc_ruins,137,89,5 script Time-Space Gap Guard 4_M_MOC_SOLDIER,{
if (ep13_ryu == 100) {
mes "[Guard]";
mes "- Trembling in fear. -";
@@ -1920,7 +1920,7 @@ moc_ruins,137,89,5 script Time-Space Gap Guard 707,{
close;
}
-moc_fild22b,370,370,3 script Allied Manager#gm 100,{
+moc_fild22b,370,370,3 script Allied Manager#gm 4W_SAILOR,{
callfunc "F_GM_NPC";
mes "[Manager]";
mes "Please enter the password.";
@@ -1959,7 +1959,7 @@ moc_fild22b,370,370,3 script Allied Manager#gm 100,{
// New Surroundings :: ep13_newbs
//============================================================
-mid_camp,222,283,4 script Marian#ep13bs 727,{
+mid_camp,222,283,4 script Marian#ep13bs 4_F_JOB_HUNTER,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "[Marian]";
mes "You have too many items~";
@@ -2110,7 +2110,7 @@ mid_camp,222,283,4 script Marian#ep13bs 727,{
}
}
-mid_camp,261,284,4 script Instructor#ep13bs 405,{
+mid_camp,261,284,4 script Instructor#ep13bs 4_M_YOUNGKNIGHT,{
if (checkweight(1201,1) == 0) {
mes "[Instructor Lugen]";
mes "You are carrying too much weight.";
@@ -2709,7 +2709,7 @@ mid_camp,261,284,4 script Instructor#ep13bs 405,{
}
}
-mid_camp,123,290,4 script Otto#ep13bs 967,{
+mid_camp,123,290,4 script Otto#ep13bs 4_M_RUSMAN1,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -2821,7 +2821,7 @@ mid_camp,123,290,4 script Otto#ep13bs 967,{
}
}
-mid_campin,106,122,4 script Receptionist Brink#ep13b 89,{
+mid_campin,106,122,4 script Receptionist Brink#ep13b 4_M_ORIENT02,{
if (ep13_newbs < 3) {
mes "[Brink]";
mes "Hmm... Hey...";
@@ -2917,7 +2917,7 @@ mid_campin,106,122,4 script Receptionist Brink#ep13b 89,{
}
}
-mid_camp,264,263,4 script Diego#ep13bs 931,{
+mid_camp,264,263,4 script Diego#ep13bs 4_M_RACHMAN1,{
if (ep13_newbs < 5) {
mes "[Diego]";
mes "I'm busy right now!";
@@ -3088,7 +3088,7 @@ mid_camp,264,263,4 script Diego#ep13bs 931,{
}
}
-mid_campin,291,128,1 script #ep13bs 111,1,1,{
+mid_campin,291,128,1 script #ep13bs HIDDEN_NPC,1,1,{
end;
OnTouch:
@@ -3121,7 +3121,7 @@ OnTouch:
}
}
-mid_campin,295,128,4 script Lucas#ep13bs 884,{
+mid_campin,295,128,4 script Lucas#ep13bs 4_M_ACROSS,{
if (ep13_newbs < 11) {
mes "[Lucas]";
mes "......";
@@ -3180,7 +3180,7 @@ mid_campin,295,128,4 script Lucas#ep13bs 884,{
}
}
-mid_campin,292,120,4 script Davi#ep13bs 849,{
+mid_campin,292,120,4 script Davi#ep13bs 4_M_DIEMAN,{
mes "[Davi]";
mes "Ahhh, my body...";
mes "I walked too much...";
@@ -3189,7 +3189,7 @@ mid_campin,292,120,4 script Davi#ep13bs 849,{
close;
}
-mid_camp,160,298,4 script Jan#ep13bs 865,{
+mid_camp,160,298,4 script Jan#ep13bs 4_LGTSCIENCE,{
if (ep13_newbs == 15) {
if (countitem(6045) > 0) {
mes "[Jan]";
@@ -3254,7 +3254,7 @@ mid_camp,160,298,4 script Jan#ep13bs 865,{
}
}
-mid_camp,30,168,4 script Gerard#ep13bs 939,{
+mid_camp,30,168,4 script Gerard#ep13bs 4_DST_SOLDIER,{
if (ep13_newbs == 17) {
if (countitem(6045) > 0) {
mes "["+ strcharinfo(0) +"]";
@@ -3330,7 +3330,7 @@ mid_camp,30,168,4 script Gerard#ep13bs 939,{
}
}
-man_fild01,80,248,4 script Alberto#ep13bs 934,{
+man_fild01,80,248,4 script Alberto#ep13bs 4_M_RASWORD,{
if (ep13_newbs == 19) {
if (countitem(6045) > 0) {
mes "[Alberto]";
@@ -3405,7 +3405,7 @@ man_fild01,80,248,4 script Alberto#ep13bs 934,{
}
}
-mid_camp,159,282,4 script Cooking Soldier#ep13bs 886,{
+mid_camp,159,282,4 script Cooking Soldier#ep13bs 4_COOK,{
mes "[Alix]";
mes "Huu, I made this and";
mes "this is really great.";
@@ -3420,7 +3420,7 @@ mid_camp,159,282,4 script Cooking Soldier#ep13bs 886,{
close;
}
-mid_camp,166,248,4 script Sorcerer#ep13bs 937,{
+mid_camp,166,248,4 script Sorcerer#ep13bs 4_M_ARUNA_NFM1,{
mes "[Biolay]";
mes "Sob...";
mes "Where is she?";
@@ -3437,7 +3437,7 @@ mid_camp,166,248,4 script Sorcerer#ep13bs 937,{
close;
}
-spl_fild02,348,76,0 script Tree#ep13bs1::ep13tree 111,{
+spl_fild02,348,76,0 script Tree#ep13bs1::ep13tree HIDDEN_NPC,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -3478,12 +3478,12 @@ spl_fild02,348,76,0 script Tree#ep13bs1::ep13tree 111,{
end;
}
-spl_fild02,232,145,0 duplicate(ep13tree) Tree#ep13bs2 111
-spl_fild02,380,197,0 duplicate(ep13tree) Tree#ep13bs3 111
-spl_fild02,304,151,0 duplicate(ep13tree) Tree#ep13bs4 111
-spl_fild02,183,235,0 duplicate(ep13tree) Tree#ep13bs5 111
+spl_fild02,232,145,0 duplicate(ep13tree) Tree#ep13bs2 HIDDEN_NPC
+spl_fild02,380,197,0 duplicate(ep13tree) Tree#ep13bs3 HIDDEN_NPC
+spl_fild02,304,151,0 duplicate(ep13tree) Tree#ep13bs4 HIDDEN_NPC
+spl_fild02,183,235,0 duplicate(ep13tree) Tree#ep13bs5 HIDDEN_NPC
-mid_camp,267,263,0 script Post#ep13bs1 111,{
+mid_camp,267,263,0 script Post#ep13bs1 HIDDEN_NPC,{
if (ep13_newbs < 6) {
mes "- The posts of the -";
mes "- barracks are broken. -";
@@ -3567,7 +3567,7 @@ mid_camp,267,263,0 script Post#ep13bs1 111,{
}
}
-mid_camp,267,258,0 script Post#ep13bs2 111,{
+mid_camp,267,258,0 script Post#ep13bs2 HIDDEN_NPC,{
if (ep13_newbs < 6) {
mes "- The posts of the -";
mes "- barracks are broken. -";
@@ -3646,7 +3646,7 @@ mid_camp,267,258,0 script Post#ep13bs2 111,{
// Attitude to the New :: ep13_ecology
//============================================================
-mid_camp,188,254,3 script Monster Scholar#ep13 883,{
+mid_camp,188,254,3 script Monster Scholar#ep13 4_M_ALCHE_D,{
if (ep13_ryu < 100 && ep13_start < 100) {
mes "[Monster Scholar]";
mes "Who... Who are you?";
@@ -4327,7 +4327,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 883,{
}
}
-mid_camp,240,270,3 script Botanist#ep13 750,{
+mid_camp,240,270,3 script Botanist#ep13 4_M_ALCHE_C,{
if (ep13_ryu < 100 && ep13_start < 100) {
mes "[Botanist]";
mes "This new land!";
@@ -4608,7 +4608,7 @@ mid_camp,240,270,3 script Botanist#ep13 750,{
}
}
-mid_camp,336,171,1 script Camp Guard#man1 852,{
+mid_camp,336,171,1 script Camp Guard#man1 4_M_EIN_SOLDIER,{
mes "[Camp Guard]";
mes "Stop!";
mes "You're about to enter an area that has not been fully explored.";
@@ -4642,8 +4642,8 @@ mid_camp,336,171,1 script Camp Guard#man1 852,{
close;
}
}
-mid_camp,13,143,5 duplicate(Camp Guard#man1) Camp Guard#man2 852
-mid_camp,9,215,5 duplicate(Camp Guard#man1) Camp Guard#man3 852
+mid_camp,13,143,5 duplicate(Camp Guard#man1) Camp Guard#man2 4_M_EIN_SOLDIER
+mid_camp,9,215,5 duplicate(Camp Guard#man1) Camp Guard#man3 4_M_EIN_SOLDIER
mid_camp,49,154,0 script #env_clear -1,3,3,{
OnTouch:
@@ -4673,7 +4673,7 @@ OnTouch:
end;
}
-mid_camp,45,148,7 script Botanist#ep13_1 750,{
+mid_camp,45,148,7 script Botanist#ep13_1 4_M_ALCHE_C,{
if (ep13_animal == 8) {
mes "[Botanist]";
mes "Please try to plant the rotting stem in the ground.";
@@ -4713,7 +4713,7 @@ OnInit:
end;
}
-mid_camp,52,148,1 script Dirt#ep13 844,{
+mid_camp,52,148,1 script Dirt#ep13 CLEAR_NPC,{
if (ep13_animal == 8) {
mes "- You dug a hole into the ground, planted the rotting stem, and then watered it. -";
next;
@@ -4747,7 +4747,7 @@ OnTouch:
end;
}
-man_fild01,92,230,3 script Frozen Tree#evt_lumis 111,1,1,{
+man_fild01,92,230,3 script Frozen Tree#evt_lumis HIDDEN_NPC,1,1,{
if (ep13_animal == 11) {
mes "["+strcharinfo(0)+"]";
mes "Knock, knock. Are you here?";
@@ -4841,7 +4841,7 @@ man_fild01,92,230,3 script Frozen Tree#evt_lumis 111,1,1,{
// Finding a Fairy & Finding a Giant Tree
//============================================================
-spl_fild02,34,223,5 script Small Fairy#spl 442,{
+spl_fild02,34,223,5 script Small Fairy#spl 4_M_FAIRYKID,{
if (BaseLevel > 69) {
if (checkquest(2158) == -1) {
mes "You find a little creature flying in the bushes.";
@@ -4879,7 +4879,7 @@ spl_fild02,34,223,5 script Small Fairy#spl 442,{
}
}
-man_fild03,236,105,3 script Tree Giant#man 454,{
+man_fild03,236,105,3 script Tree Giant#man 4_MAN_PIOM,{
if (BaseLevel > 69) {
if (checkquest(2159) == -1) {
mes "You have found something moving between dry branches.";
@@ -4916,7 +4916,7 @@ man_fild03,236,105,3 script Tree Giant#man 454,{
}
}
-mid_camp,212,237,5 script Camp Guard Captain#man1 852,{
+mid_camp,212,237,5 script Camp Guard Captain#man1 4_M_EIN_SOLDIER,{
mes "[Captain]";
mes "Good day. I'm here to protect the";
mes "peace and safety of explorers";
@@ -4977,7 +4977,7 @@ mid_camp,212,237,5 script Camp Guard Captain#man1 852,{
// The Tripartite Union's Feud :: ep13_1_rhea
//============================================================
-mid_campin,376,120,0 script Research Official#ep131 754,3,3,{
+mid_campin,376,120,0 script Research Official#ep131 4_M_SAGE_A,3,3,{
OnTouch:
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
mes "[United Research Official]";
@@ -5481,7 +5481,7 @@ OnTimer300000:
end;
}
-mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{
+mid_camp,165,245,0 script Ryosen#ep131_rhea01 4_M_ALCHE_A,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
mes "[Ryosen]";
mes "How come you've got so much to carry?";
@@ -6027,7 +6027,7 @@ mid_camp,165,245,0 script Ryosen#ep131_rhea01 748,{
}
}
-mid_camp,247,255,1 script Hue#ep131_rhea02 868,{
+mid_camp,247,255,1 script Hue#ep131_rhea02 4_M_LGTGUARD,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
mes "[Hue]";
mes "How come you've got so much to carry?";
@@ -6420,7 +6420,7 @@ mid_camp,247,255,1 script Hue#ep131_rhea02 868,{
}
}
-mid_camp,222,218,3 script Hansenne#ep131_rhea03 931,{
+mid_camp,222,218,3 script Hansenne#ep131_rhea03 4_M_RACHMAN1,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
mes "[Hansenne]";
mes "How come you've got so much to carry?";
@@ -6889,7 +6889,7 @@ mid_camp,222,218,3 script Hansenne#ep131_rhea03 931,{
}
}
-mid_campin,379,123,5 script Ryosen#ep131_rhea05 748,{
+mid_campin,379,123,5 script Ryosen#ep131_rhea05 4_M_ALCHE_A,{
end;
OnEnable:
initnpctimer;
@@ -6907,7 +6907,7 @@ OnTimer300000:
end;
}
-mid_campin,372,123,5 script Hue#ep131_rhea06 868,{
+mid_campin,372,123,5 script Hue#ep131_rhea06 4_M_LGTGUARD,{
end;
OnEnable:
initnpctimer;
@@ -6925,7 +6925,7 @@ OnTimer300000:
end;
}
-mid_campin,375,129,5 script Hansenne#ep131_rhea07 931,{
+mid_campin,375,129,5 script Hansenne#ep131_rhea07 4_M_RACHMAN1,{
end;
OnEnable:
initnpctimer;
@@ -6945,7 +6945,7 @@ OnTimer300000:
// Part Time Work :: ep13_alba
//============================================================
-mid_camp,1,1,0 script #timer_alba01 844,{
+mid_camp,1,1,0 script #timer_alba01 CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "Please enter the password";
next;
@@ -7017,7 +7017,7 @@ OnTimer7800000:
end;
}
-mid_camp,143,306,5 script Breeder Taab#ep13_alba 946,{
+mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{
if (ep13_ryu > 99 || ep13_start > 99) {
if (ep13_alba < 1) {
mes "[Taab]";
@@ -7503,7 +7503,7 @@ OnTouch:
close;
}
-mid_camp,1,2,0 script #monster_master 844,{
+mid_camp,1,2,0 script #monster_master CLEAR_NPC,{
OnEnable:
if (rand(1,3) > 1) initnpctimer;
end;
@@ -7553,7 +7553,7 @@ OnMyMobDead:
// Cat Hand Trading Post :: cat_yong
//============================================================
-mid_camp,62,125,4 script Cat Hand Agent 421,{
+mid_camp,62,125,4 script Cat Hand Agent 4_M_BOSSCAT,{
function Catwarp;
if (ep13_yong1 < 1) {
mes "[Cat Hand Agent]";
@@ -7961,7 +7961,7 @@ function Catwarp {
}
}
-mid_camp,72,94,4 script Fluffy Gyaruk 421,{
+mid_camp,72,94,4 script Fluffy Gyaruk 4_M_BOSSCAT,{
if (ep13_yong1 < 1) {
mes "[Fluffy Gyaruk]";
mes "*Sniff Sniff* Can't you smell fish";
@@ -8083,7 +8083,7 @@ mid_camp,72,94,4 script Fluffy Gyaruk 421,{
}
}
-mid_camp,69,144,0 script Ferocious Gorurug 421,{
+mid_camp,69,144,0 script Ferocious Gorurug 4_M_BOSSCAT,{
if (checkquest(12060,PLAYTIME) == -1) {
if (ep13_yong1 < 4) {
mes "[Ferocious Gorurug]";
@@ -8251,7 +8251,7 @@ mid_camp,69,144,0 script Ferocious Gorurug 421,{
}
}
-spl_fild02,314,165,0 script School of Fish#1::Fishinghole 844,{
+spl_fild02,314,165,0 script School of Fish#1::Fishinghole CLEAR_NPC,{
if ((checkquest(12060,PLAYTIME) == -1) && (countitem(6039) < 20)) {
specialeffect2 EF_BUBBLE;
specialeffect2 EF_INVENOM;
@@ -8313,11 +8313,11 @@ spl_fild02,314,165,0 script School of Fish#1::Fishinghole 844,{
}
}
-spl_fild02,321,169,0 duplicate(Fishinghole) School of Fish#2 844
-spl_fild02,326,171,0 duplicate(Fishinghole) School of Fish#3 844
-mid_camp,75,135,0 duplicate(Fishinghole) School of Fish#4 844
+spl_fild02,321,169,0 duplicate(Fishinghole) School of Fish#2 CLEAR_NPC
+spl_fild02,326,171,0 duplicate(Fishinghole) School of Fish#3 CLEAR_NPC
+mid_camp,75,135,0 duplicate(Fishinghole) School of Fish#4 CLEAR_NPC
-mid_camp,66,122,55 script Henry Clifford 712,{
+mid_camp,66,122,55 script Henry Clifford 4_M_05,{
if (countitem(6049) > 0) {
mes "[Henry Clifford]";
mes "Congratulations, you've caught a precious Marlin.";
@@ -8367,7 +8367,7 @@ mid_camp,66,122,55 script Henry Clifford 712,{
}
}
-mid_camp,88,100,55 script Cat Hand Mining Agent 876,{
+mid_camp,88,100,55 script Cat Hand Mining Agent 4_CAT,{
if (checkquest(12062,PLAYTIME) == -1) {
if ((countitem(6048) > 2) && (ep13_yong1 > 9)) {
mes "[Cat Hand Mining Agent]";
@@ -8445,26 +8445,26 @@ OnTimer120000:
stopnpctimer;
end;
}
-man_fild01,180,170,0 duplicate(manukrock) Mysterious Rock#1 844
-man_fild01,147,157,0 duplicate(manukrock) Mysterious Rock#2 844
-man_fild01,114,174,0 duplicate(manukrock) Mysterious Rock#3 844
-man_fild01,92,155,0 duplicate(manukrock) Mysterious Rock#4 844
-man_fild01,170,318,0 duplicate(manukrock) Mysterious Rock#5 844
-man_fild01,146,269,0 duplicate(manukrock) Mysterious Rock#6 844
-man_fild01,118,238,0 duplicate(manukrock) Mysterious Rock#7 844
-man_fild01,70,246,0 duplicate(manukrock) Mysterious Rock#8 844
-man_fild01,64,197,0 duplicate(manukrock) Mysterious Rock#9 844
-man_fild03,82,134,0 duplicate(manukrock) Mysterious Rock#10 844
-man_fild03,67,160,0 duplicate(manukrock) Mysterious Rock#11 844
-man_fild03,66,171,0 duplicate(manukrock) Mysterious Rock#12 844
-man_fild03,81,198,0 duplicate(manukrock) Mysterious Rock#13 844
-man_fild03,82,216,0 duplicate(manukrock) Mysterious Rock#14 844
-man_fild03,98,226,0 duplicate(manukrock) Mysterious Rock#15 844
-man_fild03,104,248,0 duplicate(manukrock) Mysterious Rock#16 844
-man_fild03,91,272,0 duplicate(manukrock) Mysterious Rock#17 844
-man_fild03,95,301,0 duplicate(manukrock) Mysterious Rock#18 844
-
-sec_in02,80,171,0 script Piece of crack#sec 406,{
+man_fild01,180,170,0 duplicate(manukrock) Mysterious Rock#1 CLEAR_NPC
+man_fild01,147,157,0 duplicate(manukrock) Mysterious Rock#2 CLEAR_NPC
+man_fild01,114,174,0 duplicate(manukrock) Mysterious Rock#3 CLEAR_NPC
+man_fild01,92,155,0 duplicate(manukrock) Mysterious Rock#4 CLEAR_NPC
+man_fild01,170,318,0 duplicate(manukrock) Mysterious Rock#5 CLEAR_NPC
+man_fild01,146,269,0 duplicate(manukrock) Mysterious Rock#6 CLEAR_NPC
+man_fild01,118,238,0 duplicate(manukrock) Mysterious Rock#7 CLEAR_NPC
+man_fild01,70,246,0 duplicate(manukrock) Mysterious Rock#8 CLEAR_NPC
+man_fild01,64,197,0 duplicate(manukrock) Mysterious Rock#9 CLEAR_NPC
+man_fild03,82,134,0 duplicate(manukrock) Mysterious Rock#10 CLEAR_NPC
+man_fild03,67,160,0 duplicate(manukrock) Mysterious Rock#11 CLEAR_NPC
+man_fild03,66,171,0 duplicate(manukrock) Mysterious Rock#12 CLEAR_NPC
+man_fild03,81,198,0 duplicate(manukrock) Mysterious Rock#13 CLEAR_NPC
+man_fild03,82,216,0 duplicate(manukrock) Mysterious Rock#14 CLEAR_NPC
+man_fild03,98,226,0 duplicate(manukrock) Mysterious Rock#15 CLEAR_NPC
+man_fild03,104,248,0 duplicate(manukrock) Mysterious Rock#16 CLEAR_NPC
+man_fild03,91,272,0 duplicate(manukrock) Mysterious Rock#17 CLEAR_NPC
+man_fild03,95,301,0 duplicate(manukrock) Mysterious Rock#18 CLEAR_NPC
+
+sec_in02,80,171,0 script Piece of crack#sec 2_MONEMUS,{
callfunc "F_GM_NPC";
mes "1~3000";
input .@input;
@@ -8481,7 +8481,7 @@ sec_in02,80,171,0 script Piece of crack#sec 406,{
// Report from the New World :: ep13_1_edq
//============================================================
-mid_campin,90,121,5 script Hibba Agip 459,{
+mid_campin,90,121,5 script Hibba Agip 4_M_REDSWORD,{
cutin "ep13_captin_edq",2;
set .@start,(ep13_newbs + ep13_ryu + mao_morocc2 + ep13_1_rhea + ep13_animal + ep13_start);
if ((ep13_1_edq == 0) && (.@start > 115)) {
@@ -9246,7 +9246,7 @@ mid_campin,90,121,5 script Hibba Agip 459,{
}
}
-mid_campin,94,118,3 script Staff Officer Abidal 755,{
+mid_campin,94,118,3 script Staff Officer Abidal 4_M_SAGE_C,{
if ((ep13_1_edq == 13) || (ep13_1_edq == 14)) {
mes "[Staff Officer Abidal]";
mes "Phew, I'm glad the mission is over. Thank you so much for your help.";
@@ -9767,7 +9767,7 @@ mid_campin,94,118,3 script Staff Officer Abidal 755,{
}
}
-mid_campin,85,118,7 script Instructor Igrid 751,{
+mid_campin,85,118,7 script Instructor Igrid 4_M_CRU,{
if ((ep13_1_edq == 13) || (ep13_1_edq == 14)) {
mes "[Instructor Igrid]";
mes "Hey, rookies. I guess you were lucky enough to complete the mission.";
@@ -9819,7 +9819,7 @@ mid_campin,85,118,7 script Instructor Igrid 751,{
}
}
-mid_camp,206,286,3 script Expedition Messenger 997,{
+mid_camp,206,286,3 script Expedition Messenger 4_M_MOCASS1,{
if ((ep13_1_edq == 3) && (countitem(11012) > 0)) {
mes "[Expedition Messenger]";
mes "Welcome, I've been waiting for you.";
@@ -10002,7 +10002,7 @@ OnInit:
end;
}
-mid_camp,2,2,3 script Command Timer#edq 997,4,4,{
+mid_camp,2,2,3 script Command Timer#edq 4_M_MOCASS1,4,4,{
OnInit:
disablenpc "Command Timer#edq";
end;
@@ -10025,7 +10025,7 @@ OnTimer3600000:
end;
}
-mid_camp,203,286,3 script Expedition Messenger#2 997,4,4,{
+mid_camp,203,286,3 script Expedition Messenger#2 4_M_MOCASS1,4,4,{
mes "[Expedition Agent]";
mes "......";
next;
@@ -10051,7 +10051,7 @@ OnDisable:
end;
}
-mid_camp,209,286,3 script Expedition Messenger#3 998,4,4,{
+mid_camp,209,286,3 script Expedition Messenger#3 4_M_MOCASS2,4,4,{
mes "[Expedition Agent]";
mes "...";
next;
@@ -10072,7 +10072,7 @@ OnDisable:
end;
}
-man_fild01,315,95,3 script Expedition Scout#1 707,{
+man_fild01,315,95,3 script Expedition Scout#1 4_M_MOC_SOLDIER,{
mes "[Expedition Scout]";
mes "Good day. I'm from the Third Scout Party under direct command of the commander of the Midgard Expedition.";
next;
@@ -10144,11 +10144,11 @@ man_fild01,315,95,3 script Expedition Scout#1 707,{
close;
}
}
-man_fild03,202,251,3 duplicate(Expedition Scout#1) Expedition Scout#2 707
-spl_fild02,295,368,3 duplicate(Expedition Scout#1) Expedition Scout#3 707
-spl_fild03,172,71,3 duplicate(Expedition Scout#1) Expedition Scout#4 707
+man_fild03,202,251,3 duplicate(Expedition Scout#1) Expedition Scout#2 4_M_MOC_SOLDIER
+spl_fild02,295,368,3 duplicate(Expedition Scout#1) Expedition Scout#3 4_M_MOC_SOLDIER
+spl_fild03,172,71,3 duplicate(Expedition Scout#1) Expedition Scout#4 4_M_MOC_SOLDIER
-prt_castle,88,165,3 script Laur 57,{
+prt_castle,88,165,3 script Laur 1_M_LIBRARYMASTER,{
mes "[Laur]";
if (ep13_1_edq == 9 || ep13_1_edq == 111 || ep13_1_edq == 121 || ep13_1_edq == 113 || ep13_1_edq == 123) {
mes "I'm Laur, the aide of the Home Minister of the Rune-Midgarts Kingdom. Do you have any business with me?";
@@ -10205,7 +10205,7 @@ prt_castle,88,165,3 script Laur 57,{
}
}
-ra_temple,122,174,3 script Nuria 918,{
+ra_temple,122,174,3 script Nuria 4_F_RACHOLD,{
mes "[Nuria]";
if (ep13_1_edq == 9 || ep13_1_edq == 101 || ep13_1_edq == 121 || ep13_1_edq == 122 || ep13_1_edq == 103) {
mes "Welcome, stranger. How can I help you?";
@@ -10250,7 +10250,7 @@ ra_temple,122,174,3 script Nuria 918,{
}
}
-lhz_in01,110,174,5 script Gerhart 903,{
+lhz_in01,110,174,5 script Gerhart 4_M_KHKYEL,{
mes "[Gerhart]";
if (ep13_1_edq == 9 || ep13_1_edq == 101 || ep13_1_edq == 111 || ep13_1_edq == 102 || ep13_1_edq == 112) {
mes "Welcome, " + strcharinfo(0) + ". What took you so long?";
@@ -10428,7 +10428,7 @@ OnMyMobDead:
// Persuing Rayan Moore :: ep13_moc2
//============================================================
-mid_campin,68,185,3 script Pursuit Party Leader#1 803,{
+mid_campin,68,185,3 script Pursuit Party Leader#1 1_F_SIGNZISK,{
if (checkweight(714,3) == 0) {
mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
close;
@@ -10825,7 +10825,7 @@ mid_campin,68,185,3 script Pursuit Party Leader#1 803,{
}
}
-mid_camp,191,206,3 script Manager#moc2_finder 852,{
+mid_camp,191,206,3 script Manager#moc2_finder 4_M_EIN_SOLDIER,{
mes "[Manager]";
mes "Everything's okay so far!";
mes "How may I help you?";
@@ -10891,7 +10891,7 @@ mid_camp,191,206,3 script Manager#moc2_finder 852,{
}
}
-mid_camp,199,311,7 script Mr. Kidd#ep13_dan01 884,{
+mid_camp,199,311,7 script Mr. Kidd#ep13_dan01 4_M_ACROSS,{
if (checkweight(714,1) == 0) {
mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
close;
@@ -11543,7 +11543,7 @@ OnTouch:
}
}
-mid_camp,256,272,3 script Defaria#moc2 897,{
+mid_camp,256,272,3 script Defaria#moc2 4_M_HUGRANFA,{
if (checkweight(714,1) == 0) {
mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
close;
@@ -11958,7 +11958,7 @@ mid_camp,256,272,3 script Defaria#moc2 897,{
}
}
-mid_camp,255,269,0 script Wet Firewood#moc2 844,{
+mid_camp,255,269,0 script Wet Firewood#moc2 CLEAR_NPC,{
if (mao_morocc2 > 102) {
mes "You've found some half-burnt logs of high quality.";
mes "It seems somebody already roasted sweet potatoes with these logs.";
@@ -11971,7 +11971,7 @@ mid_camp,255,269,0 script Wet Firewood#moc2 844,{
}
}
-morocc,43,108,5 script Sharp-Looking Boy#dan_07 82,{
+morocc,43,108,5 script Sharp-Looking Boy#dan_07 4_KID01,{
mes "[Jack]";
if (BaseClass == Job_Assassin) {
mes "Almost half of this town has been destroyed,";
@@ -11989,7 +11989,7 @@ morocc,43,108,5 script Sharp-Looking Boy#dan_07 82,{
}
}
-morocc,45,110,0 script que_job01#01 45,2,2,{
+morocc,45,110,0 script que_job01#01 WARPNPC,2,2,{
OnTouch:
if (BaseClass == Job_Assassin) {
warp "que_job01",9,94;
@@ -12014,7 +12014,7 @@ que_job01,6,94,0 warp morocc#01 2,2,morocc,45,103
que_job01,17,48,0 warp que_job01#02 2,2,que_job01,68,92
que_job01,68,96,0 warp que_job01#03 2,2,que_job01,17,53;
-que_job01,82,95,3 script Bar Master#moc2_01 46,{
+que_job01,82,95,3 script Bar Master#moc2_01 1_ETC_01,{
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -12216,7 +12216,7 @@ que_job01,82,95,3 script Bar Master#moc2_01 46,{
}
}
-que_job01,80,77,0 script que_job01#04 45,2,2,{
+que_job01,80,77,0 script que_job01#04 WARPNPC,2,2,{
OnTouch:
if (BaseClass == Job_Assassin || mao_request > 0 || mao_morocc2 > 4) {
warp "que_job01",61,50;
@@ -12322,7 +12322,7 @@ OnTouch:
}
}
-que_job01,81,79,5 script Idle Knight#dan_08 733,{
+que_job01,81,79,5 script Idle Knight#dan_08 4_M_JOB_KNIGHT1,{
mes "[Litheron]";
mes "What, haven't you seen a Knight before?";
mes "You think Knights don't belong here?";
@@ -12337,7 +12337,7 @@ que_job01,81,79,5 script Idle Knight#dan_08 733,{
que_job01,65,50,0 warp que_job01#05 2,2,que_job01,84,77
-que_job01,49,49,5 script Tao#dan_09 877,{
+que_job01,49,49,5 script Tao#dan_09 4_F_YUNYANG,{
mes "[Tao]";
if (BaseClass == Job_Assassin) {
mes "Welcome, meow.";
@@ -12419,7 +12419,7 @@ que_job01,49,49,5 script Tao#dan_09 877,{
}
}
-que_job01,51,55,0 script que_job01#room_1 45,1,1,{
+que_job01,51,55,0 script que_job01#room_1 WARPNPC,1,1,{
OnInit:
OnReset:
set $@moc_mao_room1,0; //Global Variable
@@ -12484,7 +12484,7 @@ OnTouch:
}
}
-que_job01,1,1,0 script #room1timer 844,{
+que_job01,1,1,0 script #room1timer CLEAR_NPC,{
OnEnable:
initnpctimer;
mapannounce "que_job01", "You will now enter the Master Zone, Area 1.",bc_map,"0x70DBDB";
@@ -12530,14 +12530,14 @@ OnTouch:
end;
}
-que_job01,11,4,0 script que_job01#room1_out 45,1,1,{
+que_job01,11,4,0 script que_job01#room1_out WARPNPC,1,1,{
OnTouch:
warp "que_job01",52,50;
donpcevent " #room1timer::OnStop";
end;
}
-que_job01,16,21,5 script Valdes#moc_master_1 55,{
+que_job01,16,21,5 script Valdes#moc_master_1 1_M_JOBTESTER,{
mes "[Valdes]";
if (BaseClass == Job_Assassin) {
mes "What is it? I have nothing to ask you to do.";
@@ -12577,7 +12577,7 @@ OnEnable:
end;
}
-que_job01,51,44,0 script que_job01#room_2 45,1,1,{
+que_job01,51,44,0 script que_job01#room_2 WARPNPC,1,1,{
end;
OnInit:
@@ -12662,7 +12662,7 @@ OnTouch:
}
}
-que_job01,1,2,0 script #room2timer 844,{
+que_job01,1,2,0 script #room2timer CLEAR_NPC,{
OnEnable:
initnpctimer;
mapannounce "que_job01", "Master Zone 2 is now under surveillance.",bc_map,"0x70DBDB";
@@ -12728,21 +12728,21 @@ OnTouch:
end;
}
-que_job01,80,27,0 script que_job01#room2_1_out 45,1,1,{
+que_job01,80,27,0 script que_job01#room2_1_out WARPNPC,1,1,{
OnTouch:
warp "que_job01",52,50;
donpcevent " #room2timer::OnStop";
end;
}
-que_job01,144,61,0 script que_job01#room2_2_out 45,1,1,{
+que_job01,144,61,0 script que_job01#room2_2_out WARPNPC,1,1,{
OnTouch:
warp "que_job01",52,50;
donpcevent " #room2timer::OnStop";
end;
}
-que_job01,84,17,3 script Rin#moc_room2_1 885,{
+que_job01,84,17,3 script Rin#moc_room2_1 4_F_ACROSS,{
if (checkweight(714,1) == 0) {
mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
close;
@@ -13013,7 +13013,7 @@ que_job01,84,17,3 script Rin#moc_room2_1 885,{
end;
}
-que_job01,144,54,3 script Rin#moc_room2_2 885,{
+que_job01,144,54,3 script Rin#moc_room2_2 4_F_ACROSS,{
if (checkweight(714,1) == 0) {
mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
close;
@@ -13325,7 +13325,7 @@ OnEnable:
end;
}
-que_job01,143,50,1 script Rayan#moc_room2_2 456,{
+que_job01,143,50,1 script Rayan#moc_room2_2 4_M_DSTMAN,{
mes "- For some reason, Rayan is shivering in fear. -";
next;
cutin "moc2_rin02",2;
@@ -13347,7 +13347,7 @@ OnEnable:
end;
}
-hu_fild04,235,103,0 script Heap of Earth#mao2_01 844,4,4,{
+hu_fild04,235,103,0 script Heap of Earth#mao2_01 CLEAR_NPC,4,4,{
if (checkweight(714,1) == 0) {
mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
close;
@@ -13406,7 +13406,7 @@ OnTouch:
end;
}
-hu_fild04,321,131,0 script Traces#mao2_object02 844,{
+hu_fild04,321,131,0 script Traces#mao2_object02 CLEAR_NPC,{
if ((mao_morocc2 == 7) || (mao_morocc2 == 8)) {
mes "You find many footprints on the ground.";
mes "Considering all the blood on the ground, a battle must have occurred here fairly recently.";
@@ -13419,7 +13419,7 @@ hu_fild04,321,131,0 script Traces#mao2_object02 844,{
}
}
-hu_fild04,368,180,0 script Traces#mao2_object03 844,{
+hu_fild04,368,180,0 script Traces#mao2_object03 CLEAR_NPC,{
if ((mao_morocc2 == 7) || (mao_morocc2 == 8)) {
mes "Somebody left a mark under this small tree.";
mes "The mark is weathered and faded,";
@@ -13605,7 +13605,7 @@ OnTouch:
end;
}
-que_dan01,49,36,5 script Corpse#moc2_dead01 457,{
+que_dan01,49,36,5 script Corpse#moc2_dead01 4_M_DSTMANDEAD,{
if (checkweight(714,1) == 0) {
mes "- You cannot proceed with the quest when you're carrying too many items with you. -";
close;
@@ -13722,14 +13722,14 @@ OnEnable:
end;
}
-que_dan01,34,34,7 duplicate(#dandelion_duplicates) Rin#moc2_bt_rin01 885
-que_dan01,29,34,7 duplicate(#dandelion_duplicates) Rin#moc2_bt_rin02 885
-que_dan01,36,34,3 duplicate(#dandelion_duplicates) Rayan#moc2_bt_r01 456
-que_dan01,39,37,3 duplicate(#dandelion_duplicates) Dandelion Member#moc2_1 456
-que_dan01,41,34,3 duplicate(#dandelion_duplicates) Dandelion Member#moc2_2 456
-que_dan01,26,40,5 duplicate(#dandelion_duplicates) Dandelion Member#moc2_3 456
-que_dan01,21,35,5 duplicate(#dandelion_duplicates) Dandelion Member#moc2_4 456
-que_dan01,25,32,7 duplicate(#dandelion_duplicates) Dandelion Member#moc2_5 456
+que_dan01,34,34,7 duplicate(#dandelion_duplicates) Rin#moc2_bt_rin01 4_F_ACROSS
+que_dan01,29,34,7 duplicate(#dandelion_duplicates) Rin#moc2_bt_rin02 4_F_ACROSS
+que_dan01,36,34,3 duplicate(#dandelion_duplicates) Rayan#moc2_bt_r01 4_M_DSTMAN
+que_dan01,39,37,3 duplicate(#dandelion_duplicates) Dandelion Member#moc2_1 4_M_DSTMAN
+que_dan01,41,34,3 duplicate(#dandelion_duplicates) Dandelion Member#moc2_2 4_M_DSTMAN
+que_dan01,26,40,5 duplicate(#dandelion_duplicates) Dandelion Member#moc2_3 4_M_DSTMAN
+que_dan01,21,35,5 duplicate(#dandelion_duplicates) Dandelion Member#moc2_4 4_M_DSTMAN
+que_dan01,25,32,7 duplicate(#dandelion_duplicates) Dandelion Member#moc2_5 4_M_DSTMAN
yuno_fild09,234,133,0 warp #moc2_fild09-que_dan02 1,1,que_dan02,13,10
que_dan02,13,6,0 warp #moc_que_dan02-fild09 1,1,yuno_fild09,234,129
@@ -13840,7 +13840,7 @@ OnTouch:
que_dan02,88,11,0 warp #moc2_b1-b2 1,1,que_dan02,21,33
-que_dan02,115,53,3 script Man#moc2_crazyR01 456,{
+que_dan02,115,53,3 script Man#moc2_crazyR01 4_M_DSTMAN,{
if (mao_morocc2 == 19) {
mes "A man covered in blood is standing at a corner with a mysterious grin.";
next;
@@ -13923,7 +13923,7 @@ que_dan02,115,53,3 script Man#moc2_crazyR01 456,{
end;
}
-que_dan02,115,54,5 script Mr. Kidd#moc_extra01 884,{
+que_dan02,115,54,5 script Mr. Kidd#moc_extra01 4_M_ACROSS,{
end;
OnInit:
@@ -13936,31 +13936,31 @@ OnEnable:
end;
}
-que_dan02,108,17,3 script Dismembered Corpse#moc2 457,{
+que_dan02,108,17,3 script Dismembered Corpse#moc2 4_M_DSTMANDEAD,{
mes "You find a horribly dismembered dead body.";
mes "It is disgusting to decribe the status of the Corpse!.";
close;
}
-que_dan02,103,24,5 script Crushed Corpse#moc2 457,{
+que_dan02,103,24,5 script Crushed Corpse#moc2 4_M_DSTMANDEAD,{
mes "You find a horribly disfigured corpse.";
mes "that appears to have been crushed to death.";
close;
}
-que_dan02,92,37,7 script Mutated Corpse#moc2 457,{
+que_dan02,92,37,7 script Mutated Corpse#moc2 4_M_DSTMANDEAD,{
mes "You find a terribly mutated corpse.";
mes "R.I.P.";
close;
}
-que_dan02,99,36,0 script Mutilated Corpse#moc2 457,{
+que_dan02,99,36,0 script Mutilated Corpse#moc2 4_M_DSTMANDEAD,{
mes "You find a terribly mutilated corpse.";
mes "Rest in peace.";
close;
}
-que_dan02,102,42,3 script Disfigured Corpse#moc2 457,{
+que_dan02,102,42,3 script Disfigured Corpse#moc2 4_M_DSTMANDEAD,{
mes "You find a horribly disfigured corpse.";
mes "... . . . . . !!!";
close;
@@ -13970,7 +13970,7 @@ que_dan02,102,42,3 script Disfigured Corpse#moc2 457,{
//============================================================
/*
// Event NPC, now disabled on official servers.
-prontera,161,192,5 script Ash-Vacuum Warper 707,{
+prontera,161,192,5 script Ash-Vacuum Warper 4_M_MOC_SOLDIER,{
mes "[Warp Soldier]";
mes "For a limited period.";
mes "I can send you to Ash-Vacuum without any fee.";
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index e71a787b8..951ffab4d 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -51,7 +51,7 @@
// Cat Hand Addition :: cat_enhance
//============================================================
-spl_fild02,25,211,4 script Cat Hand Agent#spl 421,{
+spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{
function Catwarp;
if (ep13_yong1 < 3) {
mes "[Cat Hand Agent]";
@@ -413,7 +413,7 @@ function Catwarp {
}
}
}
-man_fild02,132,47,4 duplicate(Cat Hand Agent#spl) Cat Hand Agent#man 421
+man_fild02,132,47,4 duplicate(Cat Hand Agent#spl) Cat Hand Agent#man 4_M_BOSSCAT
- script Mysterious Rock#30::manukrock2 -1,{
if ((countitem(6048) < 3) && (checkquest(12062,PLAYTIME) == -1)) {
@@ -444,18 +444,18 @@ OnTimer120000:
end;
}
-man_fild02,146,81,0 duplicate(manukrock2) Mysterious Rock#31 844
-man_fild02,140,148,0 duplicate(manukrock2) Mysterious Rock#32 844
-man_fild02,88,263,0 duplicate(manukrock2) Mysterious Rock#33 844
-man_fild02,146,365,0 duplicate(manukrock2) Mysterious Rock#34 844
-man_fild02,336,305,0 duplicate(manukrock2) Mysterious Rock#35 844
-man_fild02,248,124,0 duplicate(manukrock2) Mysterious Rock#36 844
-man_fild02,285,115,0 duplicate(manukrock2) Mysterious Rock#37 844
-man_fild02,346,116,0 duplicate(manukrock2) Mysterious Rock#38 844
-man_fild02,358,174,0 duplicate(manukrock2) Mysterious Rock#39 844
-man_fild02,241,227,0 duplicate(manukrock2) Mysterious Rock#40 844
+man_fild02,146,81,0 duplicate(manukrock2) Mysterious Rock#31 CLEAR_NPC
+man_fild02,140,148,0 duplicate(manukrock2) Mysterious Rock#32 CLEAR_NPC
+man_fild02,88,263,0 duplicate(manukrock2) Mysterious Rock#33 CLEAR_NPC
+man_fild02,146,365,0 duplicate(manukrock2) Mysterious Rock#34 CLEAR_NPC
+man_fild02,336,305,0 duplicate(manukrock2) Mysterious Rock#35 CLEAR_NPC
+man_fild02,248,124,0 duplicate(manukrock2) Mysterious Rock#36 CLEAR_NPC
+man_fild02,285,115,0 duplicate(manukrock2) Mysterious Rock#37 CLEAR_NPC
+man_fild02,346,116,0 duplicate(manukrock2) Mysterious Rock#38 CLEAR_NPC
+man_fild02,358,174,0 duplicate(manukrock2) Mysterious Rock#39 CLEAR_NPC
+man_fild02,241,227,0 duplicate(manukrock2) Mysterious Rock#40 CLEAR_NPC
-spl_fild03,226,151,0 script School of Fish#5::FishingHole_spl3 844,{
+spl_fild03,226,151,0 script School of Fish#5::FishingHole_spl3 CLEAR_NPC,{
if ((checkquest(12060,PLAYTIME) == -1) && (countitem(6039) < 20)) {
specialeffect2 EF_BUBBLE;
specialeffect2 EF_INVENOM;
@@ -519,19 +519,19 @@ spl_fild03,226,151,0 script School of Fish#5::FishingHole_spl3 844,{
}
end;
}
-spl_fild03,268,230,0 duplicate(FishingHole_spl3) School of Fish#6 844
-spl_fild03,293,253,0 duplicate(FishingHole_spl3) School of Fish#7 844
-spl_fild03,165,100,0 duplicate(FishingHole_spl3) School of Fish#8 844
-spl_fild03,317,190,0 duplicate(FishingHole_spl3) School of Fish#9 844
-spl_fild01,41,118,0 duplicate(FishingHole_spl3) School of Fish#10 844
-spl_fild01,317,361,0 duplicate(FishingHole_spl3) School of Fish#11 844
-spl_fild01,55,269,0 duplicate(FishingHole_spl3) School of Fish#12 844
-spl_fild01,332,131,0 duplicate(FishingHole_spl3) School of Fish#13 844
-spl_fild01,170,74,0 duplicate(FishingHole_spl3) School of Fish#14 844
+spl_fild03,268,230,0 duplicate(FishingHole_spl3) School of Fish#6 CLEAR_NPC
+spl_fild03,293,253,0 duplicate(FishingHole_spl3) School of Fish#7 CLEAR_NPC
+spl_fild03,165,100,0 duplicate(FishingHole_spl3) School of Fish#8 CLEAR_NPC
+spl_fild03,317,190,0 duplicate(FishingHole_spl3) School of Fish#9 CLEAR_NPC
+spl_fild01,41,118,0 duplicate(FishingHole_spl3) School of Fish#10 CLEAR_NPC
+spl_fild01,317,361,0 duplicate(FishingHole_spl3) School of Fish#11 CLEAR_NPC
+spl_fild01,55,269,0 duplicate(FishingHole_spl3) School of Fish#12 CLEAR_NPC
+spl_fild01,332,131,0 duplicate(FishingHole_spl3) School of Fish#13 CLEAR_NPC
+spl_fild01,170,74,0 duplicate(FishingHole_spl3) School of Fish#14 CLEAR_NPC
// Two Tribes :: ep13_2_msg
//============================================================
-spl_in01,32,306,3 script Splendide Guard#ep13md01 447,2,2,{
+spl_in01,32,306,3 script Splendide Guard#ep13md01 4_M_FAIRYSOLDIER,2,2,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -949,7 +949,7 @@ OnTouch:
end;
}
-spl_fild02,45,214,0 script ????#ep13_mdplant01 844,{
+spl_fild02,45,214,0 script ????#ep13_mdplant01 CLEAR_NPC,{
if (ep13_mdrama == 2) {
cutin "ep13_plant01",2;
mes "Weeds are easy to find around here...";
@@ -975,7 +975,7 @@ spl_fild02,45,214,0 script ????#ep13_mdplant01 844,{
end;
}
-spl_fild02,122,106,0 script ????#ep13_mdplant02 844,{
+spl_fild02,122,106,0 script ????#ep13_mdplant02 CLEAR_NPC,{
if (ep13_mdrama > 2) {
cutin "ep13_plant01",2;
mes "Weeds are easy to find around here...";
@@ -994,7 +994,7 @@ spl_fild02,122,106,0 script ????#ep13_mdplant02 844,{
end;
}
-spl_fild02,329,191,0 script ????#ep13_mdplant03 844,{
+spl_fild02,329,191,0 script ????#ep13_mdplant03 CLEAR_NPC,{
if (ep13_mdrama > 2) {
cutin "ep13_plant01",2;
mes "Weeds are easy to find around here...";
@@ -1013,7 +1013,7 @@ spl_fild02,329,191,0 script ????#ep13_mdplant03 844,{
end;
}
-spl_fild02,328,323,0 script ????#ep13_mdplant04 844,{
+spl_fild02,328,323,0 script ????#ep13_mdplant04 CLEAR_NPC,{
if (ep13_mdrama == 3) {
mes "There are footprints here as well as signs that someone has fallen.";
mes "It looks like someone was fighting here?";
@@ -1034,7 +1034,7 @@ spl_fild02,328,323,0 script ????#ep13_mdplant04 844,{
}
}
-spl_fild01,341,109,0 script ????#ep13_mdplant05 844,{
+spl_fild01,341,109,0 script ????#ep13_mdplant05 CLEAR_NPC,{
if (ep13_mdrama == 4) {
mes "There's evidence that there was a fight here too.";
mes "These footsteps can't be a Laphine's...";
@@ -1097,7 +1097,7 @@ OnTouch:
}
}
-nyd_dun01,58,223,0 script Petrified Sapha#ep13md03 844,{
+nyd_dun01,58,223,0 script Petrified Sapha#ep13md03 CLEAR_NPC,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -1317,7 +1317,7 @@ nyd_dun01,58,223,0 script Petrified Sapha#ep13md03 844,{
}
}
-nyd_dun01,55,223,5 script Snorren#ep13md17 454,{
+nyd_dun01,55,223,5 script Snorren#ep13md17 4_MAN_PIOM,{
disablenpc "Snorren#ep13md17";
end;
@@ -1331,7 +1331,7 @@ OnEnable:
end;
}
-nyd_dun01,62,233,0 script Trunk of a Tree#ep13 844,2,2,{
+nyd_dun01,62,233,0 script Trunk of a Tree#ep13 CLEAR_NPC,2,2,{
mes "The trunk of a Tree moderately stretched upward.";
mes "There are big thorns here that should be enough to use as footholds to climb up.";
close;
@@ -1349,7 +1349,7 @@ OnTouch:
close;
}
}
-manuk,278,177,5 script Villager#ep13_11 454,{
+manuk,278,177,5 script Villager#ep13_11 4_MAN_PIOM,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -1447,7 +1447,7 @@ manuk,278,177,5 script Villager#ep13_11 454,{
}
}
-manuk,281,177,3 script Villager#ep13_12 449,{
+manuk,281,177,3 script Villager#ep13_12 4_MAN_BENKUNI,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -1549,7 +1549,7 @@ manuk,281,177,3 script Villager#ep13_12 449,{
}
}
-man_in01,175,59,5 script Snorren#ep13_13 454,{
+man_in01,175,59,5 script Snorren#ep13_13 4_MAN_PIOM,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -1861,7 +1861,7 @@ man_in01,175,59,5 script Snorren#ep13_13 454,{
}
}
-man_in01,183,58,0 script to_in013ep13mdwarp01 45,1,1,{
+man_in01,183,58,0 script to_in013ep13mdwarp01 WARPNPC,1,1,{
OnTouch:
if ((ep13_mdrama > 17) && (ep13_mdrama < 24)) {
warp "man_in01",13,125;
@@ -1881,7 +1881,7 @@ OnTouch:
man_in01,10,125,0 warp to_out1#ep13mdwarp02 1,1,man_in01,179,58
man_in01,65,125,0 warp to_out2#ep13mdwarp03 1,1,man_in01,179,58
-man_in01,22,126,3 script Captured Laphine#ep13md 441,{
+man_in01,22,126,3 script Captured Laphine#ep13md 4_F_FAIRYKID6,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -2056,7 +2056,7 @@ man_in01,22,126,3 script Captured Laphine#ep13md 441,{
}
}
-man_in01,17,128,5 script Snorren#ep13md_15 454,{
+man_in01,17,128,5 script Snorren#ep13md_15 4_MAN_PIOM,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -2186,7 +2186,7 @@ man_in01,17,128,5 script Snorren#ep13md_15 454,{
}
}
-man_in01,19,126,3 script Luik#ep13md16 450,{
+man_in01,19,126,3 script Luik#ep13md16 4_MAN_GALTUN,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -2363,7 +2363,7 @@ OnTouch:
close;
}
-spl_in02,236,92,5 script Arc#ep13md_l02 447,{
+spl_in02,236,92,5 script Arc#ep13md_l02 4_M_FAIRYSOLDIER,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -2532,9 +2532,9 @@ spl_in02,236,92,5 script Arc#ep13md_l02 447,{
close;
}
}
-spl_in02,239,93,3 duplicate(Arc#ep13md_l02) Terra#ep13md_l03 441
+spl_in02,239,93,3 duplicate(Arc#ep13md_l02) Terra#ep13md_l03 4_F_FAIRYKID6
-splendide,287,140,0 script terrashome_in 45,1,1,{
+splendide,287,140,0 script terrashome_in WARPNPC,1,1,{
OnTouch:
if (ep13_mdrama > 25) {
warp "spl_in02",237,89;
@@ -2548,7 +2548,7 @@ OnTouch:
spl_in02,236,86,0 warp terrashome_out 1,1,splendide,285,139;
-spl_fild01,357,44,0 script ???#ep13mdf01 844,{
+spl_fild01,357,44,0 script ???#ep13mdf01 CLEAR_NPC,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -2597,7 +2597,7 @@ spl_fild01,357,44,0 script ???#ep13mdf01 844,{
}
}
-spl_fild01,312,79,0 script ???#ep13mdf02 844,{
+spl_fild01,312,79,0 script ???#ep13mdf02 CLEAR_NPC,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -2646,7 +2646,7 @@ spl_fild01,312,79,0 script ???#ep13mdf02 844,{
}
}
-spl_fild01,329,29,0 script ???#ep13mdf03 844,{
+spl_fild01,329,29,0 script ???#ep13mdf03 CLEAR_NPC,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -2703,7 +2703,7 @@ spl_fild01,329,29,0 script ???#ep13mdf03 844,{
// Monster Suppression :: ep13_2_dayquest
//============================================================
-manuk,252,116,3 script Manuk Galtun#ep13_2day 450,{
+manuk,252,116,3 script Manuk Galtun#ep13_2day 4_MAN_GALTUN,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -2819,7 +2819,7 @@ manuk,252,116,3 script Manuk Galtun#ep13_2day 450,{
// - Laphine Craftsman
// - Draco Egg Collection (NPC includes 'Wanted' quest)
//============================================================
-man_in01,378,276,3 script Manuk Engineer#ep13_2 453,{
+man_in01,378,276,3 script Manuk Engineer#ep13_2 4_MAN_NITT,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -2926,7 +2926,7 @@ man_in01,378,276,3 script Manuk Engineer#ep13_2 453,{
}
}
-spl_in01,97,313,3 script Laphine Craftsman#ep13 446,{
+spl_in01,97,313,3 script Laphine Craftsman#ep13 4_M_FAIRYKID5,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -3045,7 +3045,7 @@ spl_in01,97,313,3 script Laphine Craftsman#ep13 446,{
close;
}
-mid_camp,146,306,3 script Pet Breeder#ep13_eden01 982,{
+mid_camp,146,306,3 script Pet Breeder#ep13_eden01 4_F_SCIENCE,{
if (checkweight(1201,2) == 0) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -3234,7 +3234,7 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 982,{
close;
}
-mid_camp,192,239,4 script Wanted Sign#ep13_2ect01 857,{
+mid_camp,192,239,4 script Wanted Sign#ep13_2ect01 4_BOARD3,{
if (ep13_mdrama > 5) {
mes "[Wanted]";
mes " ";
@@ -3303,14 +3303,14 @@ OnDisable:
end;
}
-nyd_dun01,258,134,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg01 463
-nyd_dun01,100,210,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg02 463
-nyd_dun01,74,68,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg03 463
-nyd_dun01,98,142,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg04 463
-nyd_dun01,244,157,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg05 463
-nyd_dun01,59,185,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg06 463
+nyd_dun01,258,134,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg01 4_DRAGON_EGG
+nyd_dun01,100,210,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg02 4_DRAGON_EGG
+nyd_dun01,74,68,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg03 4_DRAGON_EGG
+nyd_dun01,98,142,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg04 4_DRAGON_EGG
+nyd_dun01,244,157,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg05 4_DRAGON_EGG
+nyd_dun01,59,185,0 duplicate(Dragon Egg#ep13_degg_0) Dragon Egg#ep13_degg06 4_DRAGON_EGG
-nyd_dun02,68,256,0 script Dragon Egg#ep13_degg_1 463,{
+nyd_dun02,68,256,0 script Dragon Egg#ep13_degg_1 4_DRAGON_EGG,{
if (checkweight(1201,2) == 0) {
mes "- You're carrying too many items. -";
close;
@@ -3337,11 +3337,11 @@ OnDisable:
disablenpc strnpcinfo(0);
end;
}
-nyd_dun02,68,256,0 duplicate(Dragon Egg#ep13_degg_1) Dragon Egg#ep13_degg11 463
-nyd_dun02,202,166,0 duplicate(Dragon Egg#ep13_degg_1) Dragon Egg#ep13_degg12 463
-nyd_dun02,200,165,0 duplicate(Dragon Egg#ep13_degg_1) Dragon Egg#ep13_degg13 463
+nyd_dun02,68,256,0 duplicate(Dragon Egg#ep13_degg_1) Dragon Egg#ep13_degg11 4_DRAGON_EGG
+nyd_dun02,202,166,0 duplicate(Dragon Egg#ep13_degg_1) Dragon Egg#ep13_degg12 4_DRAGON_EGG
+nyd_dun02,200,165,0 duplicate(Dragon Egg#ep13_degg_1) Dragon Egg#ep13_degg13 4_DRAGON_EGG
-nyd_dun02,201,166,0 script Dragon Egg#ep13_degg_2 463,{
+nyd_dun02,201,166,0 script Dragon Egg#ep13_degg_2 4_DRAGON_EGG,{
if (checkweight(1201,2) == 0) {
mes "- You're carrying too many items. -";
close;
@@ -3368,9 +3368,9 @@ OnDisable:
disablenpc strnpcinfo(0);
end;
}
-nyd_dun02,201,166,0 duplicate(Dragon Egg#ep13_degg_2) Dragon Egg#ep13_degg16 463
-nyd_dun02,203,167,0 duplicate(Dragon Egg#ep13_degg_2) Dragon Egg#ep13_degg17 463
-nyd_dun02,201,164,0 duplicate(Dragon Egg#ep13_degg_2) Dragon Egg#ep13_degg18 463
+nyd_dun02,201,166,0 duplicate(Dragon Egg#ep13_degg_2) Dragon Egg#ep13_degg16 4_DRAGON_EGG
+nyd_dun02,203,167,0 duplicate(Dragon Egg#ep13_degg_2) Dragon Egg#ep13_degg17 4_DRAGON_EGG
+nyd_dun02,201,164,0 duplicate(Dragon Egg#ep13_degg_2) Dragon Egg#ep13_degg18 4_DRAGON_EGG
nyd_dun02,201,157,5 script Egg Keeper Draco#13_1 2013,3,3,{
@@ -3431,7 +3431,7 @@ OnTimer180000:
end;
}
-nyd_dun02,144,103,3 script Stranger#ep13_2_dan01 456,3,3,{
+nyd_dun02,144,103,3 script Stranger#ep13_2_dan01 4_M_DSTMAN,3,3,{
end;
OnEnable:
@@ -3458,7 +3458,7 @@ OnTouch:
end;
}
-nyd_dun02,206,114,5 script Stranger#ep13_2_dan02 456,3,3,{
+nyd_dun02,206,114,5 script Stranger#ep13_2_dan02 4_M_DSTMAN,3,3,{
end;
OnInit:
@@ -3516,7 +3516,7 @@ OnTimer300000:
// Otherworld language :: ep13_2_rhea
//============================================================
-mid_camp,197,237,3 script Schwartzvalt Mechanic#1 869,{
+mid_camp,197,237,3 script Schwartzvalt Mechanic#1 4_M_LGTMAN,{
if (ep13_1_edq > 2 || ep13_start == 100) {
if (ep13_2_rhea < 1) {
mes "[Mechanic Engineer Dorance]";
@@ -3749,7 +3749,7 @@ mid_camp,197,237,3 script Schwartzvalt Mechanic#1 869,{
}
}
-mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{
+mid_campin,168,82,3 script Arunafeltz Linguist#1 4_M_TRAINEE,{
if (ep13_2_rhea < 1) {
mes "[Linguist Dictionary]";
mes "Language distinguishes humans from animals. Every single intellectual life form has their own language.";
@@ -4175,7 +4175,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 935,{
}
}
-mid_camp,147,256,3 script Rune Midgarts Magician#1 735,{
+mid_camp,147,256,3 script Rune Midgarts Magician#1 4_M_JOB_WIZARD,{
if (ep13_2_rhea < 4) {
mes "[Magician Whisper]";
mes "To store a tremendous amount of information, well, it's impossible with existing technology.";
@@ -4519,7 +4519,7 @@ function script jewel_13_2 {
end;
}
-spl_fild02,27,218,0 script Half-buried Gem#1 844,{
+spl_fild02,27,218,0 script Half-buried Gem#1 CLEAR_NPC,{
callfunc "jewel_13_2","Red",1;
OnInit:
@@ -4551,7 +4551,7 @@ OnTimer300000:
end;
}
-man_fild03,227,109,0 script Half-buried Gem#2 844,{
+man_fild03,227,109,0 script Half-buried Gem#2 CLEAR_NPC,{
callfunc "jewel_13_2","Blue",2;
OnInit:
@@ -4583,7 +4583,7 @@ OnTimer300000:
end;
}
-mid_camp,7,3,0 script Translator Preparation#1 708,{
+mid_camp,7,3,0 script Translator Preparation#1 4_M_PAY_SOLDIER,{
callfunc "F_GM_NPC";
mes "[EP13 Translator Quest Preparation]";
mes "First, you must confirm that you are my master.";
@@ -4646,7 +4646,7 @@ mid_camp,7,3,0 script Translator Preparation#1 708,{
// - Midgard Ore
// - Alfheim Perfume
//============================================================
-man_in01,372,221,5 script Scientist#lifeguard 449,{
+man_in01,372,221,5 script Scientist#lifeguard 4_MAN_BENKUNI,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
mes "[Dr. Lifeguard]";
if (ep13_2_tre == 0) {
@@ -4925,14 +4925,14 @@ OnTouch:
end;
}
-mjolnir_01,32,309,3 duplicate(mjo_find) #mj01_01 111,7,7
-mjolnir_01,217,34,3 duplicate(mjo_find) #mj01_02 111,7,7
-mjolnir_02,90,195,3 duplicate(mjo_find) #mj02_01 111,5,10
-mjolnir_02,206,187,3 duplicate(mjo_find) #mj02_02 111,7,7
-mjolnir_04,125,380,3 duplicate(mjo_find) #mj04_01 111,7,7
-mjolnir_04,220,130,3 duplicate(mjo_find) #mj04_02 111,7,7
-mjolnir_09,229,214,3 duplicate(mjo_find) #mj09_01 111,10,10
-mjolnir_10,188,260,3 duplicate(mjo_find) #mj10_01 111,10,10
+mjolnir_01,32,309,3 duplicate(mjo_find) #mj01_01 HIDDEN_NPC,7,7
+mjolnir_01,217,34,3 duplicate(mjo_find) #mj01_02 HIDDEN_NPC,7,7
+mjolnir_02,90,195,3 duplicate(mjo_find) #mj02_01 HIDDEN_NPC,5,10
+mjolnir_02,206,187,3 duplicate(mjo_find) #mj02_02 HIDDEN_NPC,7,7
+mjolnir_04,125,380,3 duplicate(mjo_find) #mj04_01 HIDDEN_NPC,7,7
+mjolnir_04,220,130,3 duplicate(mjo_find) #mj04_02 HIDDEN_NPC,7,7
+mjolnir_09,229,214,3 duplicate(mjo_find) #mj09_01 HIDDEN_NPC,10,10
+mjolnir_10,188,260,3 duplicate(mjo_find) #mj10_01 HIDDEN_NPC,10,10
mjolnir_01,364,256,0 script #mj01_find -1,5,5,{
end;
@@ -4944,7 +4944,7 @@ OnTouch:
close;
}
-mjolnir_01,1,1,3 script #mj01_01_t 111,{
+mjolnir_01,1,1,3 script #mj01_01_t HIDDEN_NPC,{
end;
OnEnable:
@@ -4957,7 +4957,7 @@ OnTimer60000:
end;
}
-mjolnir_01,1,1,3 script #mj01_02_t 111,{
+mjolnir_01,1,1,3 script #mj01_02_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -4989,7 +4989,7 @@ OnTouch:
}
-mjolnir_02,1,1,3 script #mj02_01_t 111,{
+mjolnir_02,1,1,3 script #mj02_01_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5000,7 +5000,7 @@ OnTimer60000:
end;
}
-mjolnir_02,1,1,3 script #mj02_02_t 111,{
+mjolnir_02,1,1,3 script #mj02_02_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5041,7 +5041,7 @@ OnTouch:
close;
}
-mjolnir_04,1,1,3 script #mj04_01_t 111,{
+mjolnir_04,1,1,3 script #mj04_01_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5052,7 +5052,7 @@ OnTimer60000:
end;
}
-mjolnir_04,1,1,3 script #mj04_02_t 111,{
+mjolnir_04,1,1,3 script #mj04_02_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5108,7 +5108,7 @@ OnTouch:
close;
}
-mjolnir_09,1,1,3 script #mj09_01_t 111,{
+mjolnir_09,1,1,3 script #mj09_01_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5164,7 +5164,7 @@ OnTouch:
close;
}
-mjolnir_10,1,1,3 script #mj10_01_t 111,{
+mjolnir_10,1,1,3 script #mj10_01_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5275,13 +5275,13 @@ OnTouch:
end;
}
-hu_fild05,251,345,3 duplicate(hu_find) #hu_01 111,10,10
-hu_fild05,134,322,3 duplicate(hu_find) #hu_02 111,10,10
-hu_fild05,72,104,3 duplicate(hu_find) #hu_03 111,10,10
-hu_fild05,65,99,3 duplicate(hu_find) #hu_04 111,10,10
-hu_fild05,323,84,3 duplicate(hu_find) #hu_05 111,10,10
+hu_fild05,251,345,3 duplicate(hu_find) #hu_01 HIDDEN_NPC,10,10
+hu_fild05,134,322,3 duplicate(hu_find) #hu_02 HIDDEN_NPC,10,10
+hu_fild05,72,104,3 duplicate(hu_find) #hu_03 HIDDEN_NPC,10,10
+hu_fild05,65,99,3 duplicate(hu_find) #hu_04 HIDDEN_NPC,10,10
+hu_fild05,323,84,3 duplicate(hu_find) #hu_05 HIDDEN_NPC,10,10
-hu_fild05,1,1,3 script #hu_01_t 111,{
+hu_fild05,1,1,3 script #hu_01_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5292,7 +5292,7 @@ OnTimer60000:
end;
}
-hu_fild05,1,1,3 script #hu_02_t 111,{
+hu_fild05,1,1,3 script #hu_02_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5303,7 +5303,7 @@ OnTimer60000:
end;
}
-hu_fild05,1,1,3 script #hu_03_t 111,{
+hu_fild05,1,1,3 script #hu_03_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5314,7 +5314,7 @@ OnTimer60000:
end;
}
-hu_fild05,1,1,3 script #hu_04_t 111,{
+hu_fild05,1,1,3 script #hu_04_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5325,7 +5325,7 @@ OnTimer60000:
end;
}
-hu_fild05,1,1,3 script #hu_05_t 111,{
+hu_fild05,1,1,3 script #hu_05_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5408,12 +5408,12 @@ OnTouch:
end;
}
-ve_fild03,152,134,3 duplicate(ve_find) #ve_01 111,10,10
-ve_fild03,256,228,3 duplicate(ve_find) #ve_02 111,10,10
-ve_fild03,85,189,3 duplicate(ve_find) #ve_03 111,10,10
-ve_fild03,282,268,3 duplicate(ve_find) #ve_04 111,10,10
+ve_fild03,152,134,3 duplicate(ve_find) #ve_01 HIDDEN_NPC,10,10
+ve_fild03,256,228,3 duplicate(ve_find) #ve_02 HIDDEN_NPC,10,10
+ve_fild03,85,189,3 duplicate(ve_find) #ve_03 HIDDEN_NPC,10,10
+ve_fild03,282,268,3 duplicate(ve_find) #ve_04 HIDDEN_NPC,10,10
-ve_fild03,1,1,3 script #ve_01_t 111,{
+ve_fild03,1,1,3 script #ve_01_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5424,7 +5424,7 @@ OnTimer40000:
end;
}
-ve_fild03,1,1,3 script #ve_02_t 111,{
+ve_fild03,1,1,3 script #ve_02_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5435,7 +5435,7 @@ OnTimer40000:
end;
}
-ve_fild03,1,1,3 script #ve_03_t 111,{
+ve_fild03,1,1,3 script #ve_03_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5446,7 +5446,7 @@ OnTimer40000:
end;
}
-ve_fild03,1,1,3 script #ve_04_t 111,{
+ve_fild03,1,1,3 script #ve_04_t HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5457,7 +5457,7 @@ OnTimer40000:
end;
}
-spl_in01,30,324,3 script High Laphine#grenouille 446,{
+spl_in01,30,324,3 script High Laphine#grenouille 4_M_FAIRYKID5,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
if (checkweight(1201,1) == 0) {
mes "[Grenouille]";
@@ -5691,7 +5691,7 @@ spl_in01,30,324,3 script High Laphine#grenouille 446,{
}
}
-spl_in02,139,65,3 script Middle-Ranked Laphine#la 438,{
+spl_in02,139,65,3 script Middle-Ranked Laphine#la 4_F_FAIRYKID3,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
if (checkweight(1201,1) == 0) {
mes "[Flowery]";
@@ -5796,14 +5796,14 @@ spl_in02,139,65,3 script Middle-Ranked Laphine#la 438,{
end;
}
-splendide,160,265,3 duplicate(Purifier) Purifier#1 844
-splendide,262,262,3 duplicate(Purifier) Purifier#2 844
-splendide,262,187,3 duplicate(Purifier) Purifier#3 844
-splendide,164,82,3 duplicate(Purifier) Purifier#4 844
-splendide,171,116,3 duplicate(Purifier) Purifier#5 844
-splendide,134,280,3 duplicate(Purifier) Purifier#6 844
+splendide,160,265,3 duplicate(Purifier) Purifier#1 CLEAR_NPC
+splendide,262,262,3 duplicate(Purifier) Purifier#2 CLEAR_NPC
+splendide,262,187,3 duplicate(Purifier) Purifier#3 CLEAR_NPC
+splendide,164,82,3 duplicate(Purifier) Purifier#4 CLEAR_NPC
+splendide,171,116,3 duplicate(Purifier) Purifier#5 CLEAR_NPC
+splendide,134,280,3 duplicate(Purifier) Purifier#6 CLEAR_NPC
-splendide,205,139,5 script Exhausted Soldier#1 447,{
+splendide,205,139,5 script Exhausted Soldier#1 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
if (ep13_2_tre1 == 5) {
if (countitem(6082) > 0) {
@@ -5852,7 +5852,7 @@ OnInit:
end;
}
-splendide,1,1,1 script #tukare_1 111,{
+splendide,1,1,1 script #tukare_1 HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5863,7 +5863,7 @@ OnTimer60000:
end;
}
-splendide,181,135,5 script Exhausted Soldier#2 447,{
+splendide,181,135,5 script Exhausted Soldier#2 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
if (ep13_2_tre1 == 5) {
if (countitem(6082) > 0) {
@@ -5909,7 +5909,7 @@ OnInit:
end;
}
-splendide,1,1,1 script #tukare_2 111,{
+splendide,1,1,1 script #tukare_2 HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5920,7 +5920,7 @@ OnTimer60000:
end;
}
-splendide,139,178,5 script Exhausted Soldier#3 447,{
+splendide,139,178,5 script Exhausted Soldier#3 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
if (ep13_2_tre1 == 5) {
if (countitem(6082) > 0) {
@@ -5969,7 +5969,7 @@ OnInit:
end;
}
-splendide,1,1,1 script #tukare_3 111,{
+splendide,1,1,1 script #tukare_3 HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -5980,7 +5980,7 @@ OnTimer60000:
end;
}
-splendide,164,188,5 script Exhausted Soldier#4 447,{
+splendide,164,188,5 script Exhausted Soldier#4 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
if (ep13_2_tre1 == 5) {
if (countitem(6082) > 0) {
@@ -6029,7 +6029,7 @@ OnInit:
end;
}
-splendide,1,1,1 script #tukare_4 111,{
+splendide,1,1,1 script #tukare_4 HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -6040,7 +6040,7 @@ OnTimer60000:
end;
}
-splendide,177,257,5 script Exhausted Soldier#5 447,{
+splendide,177,257,5 script Exhausted Soldier#5 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
if (ep13_2_tre1 == 5) {
if (countitem(6082) > 0) {
@@ -6089,7 +6089,7 @@ OnInit:
end;
}
-splendide,1,1,1 script #tukare_5 111,{
+splendide,1,1,1 script #tukare_5 HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -6100,7 +6100,7 @@ OnTimer60000:
end;
}
-splendide,124,212,5 script Exhausted Soldier#6 447,{
+splendide,124,212,5 script Exhausted Soldier#6 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
if (ep13_2_tre1 == 5) {
if (countitem(6082) > 0) {
@@ -6149,7 +6149,7 @@ OnInit:
end;
}
-splendide,1,1,1 script #tukare_6 111,{
+splendide,1,1,1 script #tukare_6 HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -6160,7 +6160,7 @@ OnTimer60000:
end;
}
-splendide,196,153,5 script Exhausted Soldier#7 447,{
+splendide,196,153,5 script Exhausted Soldier#7 4_M_FAIRYSOLDIER,{
if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) {
if (ep13_2_tre1 == 5) {
if (countitem(6082) > 0) {
@@ -6209,7 +6209,7 @@ OnInit:
end;
}
-splendide,1,1,1 script #tukare_7 111,{
+splendide,1,1,1 script #tukare_7 HIDDEN_NPC,{
OnEnable:
initnpctimer;
end;
@@ -6222,7 +6222,7 @@ OnTimer60000:
// Secret note of Bazett :: ep13_2_dailybs
//============================================================
-mid_camp,283,198,5 script Bazett Teablack#ep13bs 883,{
+mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{
if (checkweight(1201,1) == 0) {
mes " - Hold on!! -";
mes " - You are carrying too many different items - ";
@@ -6621,7 +6621,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 883,{
}
}
-manuk,193,135,0 script Worker#ep13bs 454,{
+manuk,193,135,0 script Worker#ep13bs 4_MAN_PIOM,{
if (isequipped(2782) == 1) {
if (ep13_2_busut == 3) {
if (ep13_2_bs1 == 1) {
@@ -6888,7 +6888,7 @@ manuk,193,135,0 script Worker#ep13bs 454,{
// Yggdrasil Dungeon Floor 2 puzzle :: ny_dun02_puzzle
//============================================================
-nyd_dun02,178,255,0 script Strange Device#ep13_out 844,3,3,{
+nyd_dun02,178,255,0 script Strange Device#ep13_out CLEAR_NPC,3,3,{
mes "There's something strange here.";
mes "Maybe that device can be controlled from here.";
next;
@@ -6909,7 +6909,7 @@ OnTouch:
end;
}
-nyd_dun02,139,274,0 script Strange Device#ep13_in 844,3,3,{
+nyd_dun02,139,274,0 script Strange Device#ep13_in CLEAR_NPC,3,3,{
if ($@08_ep13nydun02_in == 1) {
mes "The device has already been activated.";
mes "You must wait for the controls to reset.";
@@ -7049,69 +7049,69 @@ OnTouch:
end;
}
-nyd_dun02,143,272,0 duplicate(ep13_warp_s_0) ep13_warp_s1 139
-nyd_dun02,143,266,0 duplicate(ep13_warp_s_0) ep13_warp_s3 139
-nyd_dun02,146,272,0 duplicate(ep13_warp_s_0) ep13_warp_11 139
-nyd_dun02,146,266,0 duplicate(ep13_warp_s_0) ep13_warp_13 139
-nyd_dun02,149,260,0 duplicate(ep13_warp_s_0) ep13_warp_25 139
-nyd_dun02,149,257,0 duplicate(ep13_warp_s_0) ep13_warp_26 139
-nyd_dun02,152,270,0 duplicate(ep13_warp_s_0) ep13_warp_31 139
-nyd_dun02,152,264,0 duplicate(ep13_warp_s_0) ep13_warp_33 139
-nyd_dun02,155,269,0 duplicate(ep13_warp_s_0) ep13_warp_41 139
-nyd_dun02,155,254,0 duplicate(ep13_warp_s_0) ep13_warp_46 139
-nyd_dun02,158,263,0 duplicate(ep13_warp_s_0) ep13_warp_52 139
-nyd_dun02,158,254,0 duplicate(ep13_warp_s_0) ep13_warp_55 139
-nyd_dun02,161,261,0 duplicate(ep13_warp_s_0) ep13_warp_62 139
-nyd_dun02,161,255,0 duplicate(ep13_warp_s_0) ep13_warp_64 139
-nyd_dun02,161,249,0 duplicate(ep13_warp_s_0) ep13_warp_66 139
-nyd_dun02,164,261,0 duplicate(ep13_warp_s_0) ep13_warp_71 139
-nyd_dun02,164,255,0 duplicate(ep13_warp_s_0) ep13_warp_73 139
-nyd_dun02,164,249,0 duplicate(ep13_warp_s_0) ep13_warp_75 139
-nyd_dun02,167,249,0 duplicate(ep13_warp_s_0) ep13_warp_84 139
-nyd_dun02,170,257,0 duplicate(ep13_warp_s_0) ep13_warp_91 139
-nyd_dun02,170,254,0 duplicate(ep13_warp_s_0) ep13_warp_92 139
-nyd_dun02,170,248,0 duplicate(ep13_warp_s_0) ep13_warp_94 139
-nyd_dun02,170,245,0 duplicate(ep13_warp_s_0) ep13_warp_95 139
-
-nyd_dun02,146,263,0 duplicate(ep13_warp_s_1) ep13_warp_14 139
-nyd_dun02,149,272,0 duplicate(ep13_warp_s_1) ep13_warp_21 139
-nyd_dun02,152,258,0 duplicate(ep13_warp_s_1) ep13_warp_35 139
-nyd_dun02,155,266,0 duplicate(ep13_warp_s_1) ep13_warp_42 139
-nyd_dun02,158,251,0 duplicate(ep13_warp_s_1) ep13_warp_56 139
-nyd_dun02,164,258,0 duplicate(ep13_warp_s_1) ep13_warp_72 139
-nyd_dun02,164,246,0 duplicate(ep13_warp_s_1) ep13_warp_76 139
-nyd_dun02,167,255,0 duplicate(ep13_warp_s_1) ep13_warp_82 139
-nyd_dun02,170,251,0 duplicate(ep13_warp_s_1) ep13_warp_93 139
-
-nyd_dun02,149,269,0 duplicate(ep13_warp_s_2) ep13_warp_22 139
-nyd_dun02,149,263,0 duplicate(ep13_warp_s_2) ep13_warp_24 139
-nyd_dun02,155,263,0 duplicate(ep13_warp_s_2) ep13_warp_43 139
-nyd_dun02,155,257,0 duplicate(ep13_warp_s_2) ep13_warp_45 139
-nyd_dun02,161,264,0 duplicate(ep13_warp_s_2) ep13_warp_61 139
-nyd_dun02,161,252,0 duplicate(ep13_warp_s_2) ep13_warp_65 139
-nyd_dun02,167,258,0 duplicate(ep13_warp_s_2) ep13_warp_81 139
-nyd_dun02,167,252,0 duplicate(ep13_warp_s_2) ep13_warp_83 139
-nyd_dun02,167,246,0 duplicate(ep13_warp_s_2) ep13_warp_85 139
-nyd_dun02,173,251,0 duplicate(ep13_warp_s_2) ep13_warp_e1 139
-nyd_dun02,173,248,0 duplicate(ep13_warp_s_2) ep13_warp_e2 139
-nyd_dun02,173,245,0 duplicate(ep13_warp_s_2) ep13_warp_e3 139
-
-nyd_dun02,143,269,0 duplicate(ep13_warp_w_0) ep13_warp_s2 139,1,1
-nyd_dun02,143,263,0 duplicate(ep13_warp_w_0) ep13_warp_s4 139,1,1
-nyd_dun02,146,269,0 duplicate(ep13_warp_w_0) ep13_warp_12 139,1,1
-nyd_dun02,146,260,0 duplicate(ep13_warp_w_0) ep13_warp_15 139,1,1
-nyd_dun02,149,266,0 duplicate(ep13_warp_w_0) ep13_warp_23 139,1,1
-nyd_dun02,152,267,0 duplicate(ep13_warp_w_0) ep13_warp_32 139,1,1
-nyd_dun02,152,261,0 duplicate(ep13_warp_w_0) ep13_warp_34 139,1,1
-nyd_dun02,155,260,0 duplicate(ep13_warp_w_0) ep13_warp_44 139,1,1
-nyd_dun02,158,266,0 duplicate(ep13_warp_w_0) ep13_warp_51 139,1,1
-nyd_dun02,158,260,0 duplicate(ep13_warp_w_0) ep13_warp_53 139,1,1
-nyd_dun02,158,257,0 duplicate(ep13_warp_w_0) ep13_warp_54 139,1,1
-nyd_dun02,161,258,0 duplicate(ep13_warp_w_0) ep13_warp_63 139,1,1
-nyd_dun02,164,252,0 duplicate(ep13_warp_w_0) ep13_warp_74 139,1,1
-nyd_dun02,173,242,0 duplicate(ep13_warp_w_0) ep13_warp_e4 139,1,1
-
-nyd_dun02,149,269,0 script ep13_warp_22_2 139,1,1,{
+nyd_dun02,143,272,0 duplicate(ep13_warp_s_0) ep13_warp_s1 HIDDEN_WARP_NPC
+nyd_dun02,143,266,0 duplicate(ep13_warp_s_0) ep13_warp_s3 HIDDEN_WARP_NPC
+nyd_dun02,146,272,0 duplicate(ep13_warp_s_0) ep13_warp_11 HIDDEN_WARP_NPC
+nyd_dun02,146,266,0 duplicate(ep13_warp_s_0) ep13_warp_13 HIDDEN_WARP_NPC
+nyd_dun02,149,260,0 duplicate(ep13_warp_s_0) ep13_warp_25 HIDDEN_WARP_NPC
+nyd_dun02,149,257,0 duplicate(ep13_warp_s_0) ep13_warp_26 HIDDEN_WARP_NPC
+nyd_dun02,152,270,0 duplicate(ep13_warp_s_0) ep13_warp_31 HIDDEN_WARP_NPC
+nyd_dun02,152,264,0 duplicate(ep13_warp_s_0) ep13_warp_33 HIDDEN_WARP_NPC
+nyd_dun02,155,269,0 duplicate(ep13_warp_s_0) ep13_warp_41 HIDDEN_WARP_NPC
+nyd_dun02,155,254,0 duplicate(ep13_warp_s_0) ep13_warp_46 HIDDEN_WARP_NPC
+nyd_dun02,158,263,0 duplicate(ep13_warp_s_0) ep13_warp_52 HIDDEN_WARP_NPC
+nyd_dun02,158,254,0 duplicate(ep13_warp_s_0) ep13_warp_55 HIDDEN_WARP_NPC
+nyd_dun02,161,261,0 duplicate(ep13_warp_s_0) ep13_warp_62 HIDDEN_WARP_NPC
+nyd_dun02,161,255,0 duplicate(ep13_warp_s_0) ep13_warp_64 HIDDEN_WARP_NPC
+nyd_dun02,161,249,0 duplicate(ep13_warp_s_0) ep13_warp_66 HIDDEN_WARP_NPC
+nyd_dun02,164,261,0 duplicate(ep13_warp_s_0) ep13_warp_71 HIDDEN_WARP_NPC
+nyd_dun02,164,255,0 duplicate(ep13_warp_s_0) ep13_warp_73 HIDDEN_WARP_NPC
+nyd_dun02,164,249,0 duplicate(ep13_warp_s_0) ep13_warp_75 HIDDEN_WARP_NPC
+nyd_dun02,167,249,0 duplicate(ep13_warp_s_0) ep13_warp_84 HIDDEN_WARP_NPC
+nyd_dun02,170,257,0 duplicate(ep13_warp_s_0) ep13_warp_91 HIDDEN_WARP_NPC
+nyd_dun02,170,254,0 duplicate(ep13_warp_s_0) ep13_warp_92 HIDDEN_WARP_NPC
+nyd_dun02,170,248,0 duplicate(ep13_warp_s_0) ep13_warp_94 HIDDEN_WARP_NPC
+nyd_dun02,170,245,0 duplicate(ep13_warp_s_0) ep13_warp_95 HIDDEN_WARP_NPC
+
+nyd_dun02,146,263,0 duplicate(ep13_warp_s_1) ep13_warp_14 HIDDEN_WARP_NPC
+nyd_dun02,149,272,0 duplicate(ep13_warp_s_1) ep13_warp_21 HIDDEN_WARP_NPC
+nyd_dun02,152,258,0 duplicate(ep13_warp_s_1) ep13_warp_35 HIDDEN_WARP_NPC
+nyd_dun02,155,266,0 duplicate(ep13_warp_s_1) ep13_warp_42 HIDDEN_WARP_NPC
+nyd_dun02,158,251,0 duplicate(ep13_warp_s_1) ep13_warp_56 HIDDEN_WARP_NPC
+nyd_dun02,164,258,0 duplicate(ep13_warp_s_1) ep13_warp_72 HIDDEN_WARP_NPC
+nyd_dun02,164,246,0 duplicate(ep13_warp_s_1) ep13_warp_76 HIDDEN_WARP_NPC
+nyd_dun02,167,255,0 duplicate(ep13_warp_s_1) ep13_warp_82 HIDDEN_WARP_NPC
+nyd_dun02,170,251,0 duplicate(ep13_warp_s_1) ep13_warp_93 HIDDEN_WARP_NPC
+
+nyd_dun02,149,269,0 duplicate(ep13_warp_s_2) ep13_warp_22 HIDDEN_WARP_NPC
+nyd_dun02,149,263,0 duplicate(ep13_warp_s_2) ep13_warp_24 HIDDEN_WARP_NPC
+nyd_dun02,155,263,0 duplicate(ep13_warp_s_2) ep13_warp_43 HIDDEN_WARP_NPC
+nyd_dun02,155,257,0 duplicate(ep13_warp_s_2) ep13_warp_45 HIDDEN_WARP_NPC
+nyd_dun02,161,264,0 duplicate(ep13_warp_s_2) ep13_warp_61 HIDDEN_WARP_NPC
+nyd_dun02,161,252,0 duplicate(ep13_warp_s_2) ep13_warp_65 HIDDEN_WARP_NPC
+nyd_dun02,167,258,0 duplicate(ep13_warp_s_2) ep13_warp_81 HIDDEN_WARP_NPC
+nyd_dun02,167,252,0 duplicate(ep13_warp_s_2) ep13_warp_83 HIDDEN_WARP_NPC
+nyd_dun02,167,246,0 duplicate(ep13_warp_s_2) ep13_warp_85 HIDDEN_WARP_NPC
+nyd_dun02,173,251,0 duplicate(ep13_warp_s_2) ep13_warp_e1 HIDDEN_WARP_NPC
+nyd_dun02,173,248,0 duplicate(ep13_warp_s_2) ep13_warp_e2 HIDDEN_WARP_NPC
+nyd_dun02,173,245,0 duplicate(ep13_warp_s_2) ep13_warp_e3 HIDDEN_WARP_NPC
+
+nyd_dun02,143,269,0 duplicate(ep13_warp_w_0) ep13_warp_s2 HIDDEN_WARP_NPC,1,1
+nyd_dun02,143,263,0 duplicate(ep13_warp_w_0) ep13_warp_s4 HIDDEN_WARP_NPC,1,1
+nyd_dun02,146,269,0 duplicate(ep13_warp_w_0) ep13_warp_12 HIDDEN_WARP_NPC,1,1
+nyd_dun02,146,260,0 duplicate(ep13_warp_w_0) ep13_warp_15 HIDDEN_WARP_NPC,1,1
+nyd_dun02,149,266,0 duplicate(ep13_warp_w_0) ep13_warp_23 HIDDEN_WARP_NPC,1,1
+nyd_dun02,152,267,0 duplicate(ep13_warp_w_0) ep13_warp_32 HIDDEN_WARP_NPC,1,1
+nyd_dun02,152,261,0 duplicate(ep13_warp_w_0) ep13_warp_34 HIDDEN_WARP_NPC,1,1
+nyd_dun02,155,260,0 duplicate(ep13_warp_w_0) ep13_warp_44 HIDDEN_WARP_NPC,1,1
+nyd_dun02,158,266,0 duplicate(ep13_warp_w_0) ep13_warp_51 HIDDEN_WARP_NPC,1,1
+nyd_dun02,158,260,0 duplicate(ep13_warp_w_0) ep13_warp_53 HIDDEN_WARP_NPC,1,1
+nyd_dun02,158,257,0 duplicate(ep13_warp_w_0) ep13_warp_54 HIDDEN_WARP_NPC,1,1
+nyd_dun02,161,258,0 duplicate(ep13_warp_w_0) ep13_warp_63 HIDDEN_WARP_NPC,1,1
+nyd_dun02,164,252,0 duplicate(ep13_warp_w_0) ep13_warp_74 HIDDEN_WARP_NPC,1,1
+nyd_dun02,173,242,0 duplicate(ep13_warp_w_0) ep13_warp_e4 HIDDEN_WARP_NPC,1,1
+
+nyd_dun02,149,269,0 script ep13_warp_22_2 HIDDEN_WARP_NPC,1,1,{
OnInit:
OnDisable:
disablenpc "ep13_warp_22_2";
@@ -7131,7 +7131,7 @@ OnTouch:
end;
}
-nyd_dun02,149,263,0 script ep13_warp_24_2 139,1,1,{
+nyd_dun02,149,263,0 script ep13_warp_24_2 HIDDEN_WARP_NPC,1,1,{
OnEnable:
enablenpc "ep13_warp_24_2";
end;
@@ -7155,7 +7155,7 @@ OnDisable:
end;
}
-nyd_dun02,155,263,0 script ep13_warp_43_2 139,1,1,{
+nyd_dun02,155,263,0 script ep13_warp_43_2 HIDDEN_WARP_NPC,1,1,{
OnInit:
OnDisable:
disablenpc "ep13_warp_43_2";
@@ -7173,7 +7173,7 @@ OnTouch:
end;
}
-nyd_dun02,155,257,0 script ep13_warp_45_2 139,1,1,{
+nyd_dun02,155,257,0 script ep13_warp_45_2 HIDDEN_WARP_NPC,1,1,{
OnInit:
OnDisable:
disablenpc "ep13_warp_45_2";
@@ -7193,7 +7193,7 @@ OnTouch:
end;
}
-nyd_dun02,161,264,0 script ep13_warp_61_2 139,1,1,{
+nyd_dun02,161,264,0 script ep13_warp_61_2 HIDDEN_WARP_NPC,1,1,{
OnInit:
OnDisable:
disablenpc "ep13_warp_61_2";
@@ -7213,7 +7213,7 @@ OnTouch:
end;
}
-nyd_dun02,161,252,0 script ep13_warp_65_2 139,1,1,{
+nyd_dun02,161,252,0 script ep13_warp_65_2 HIDDEN_WARP_NPC,1,1,{
OnEnable:
enablenpc "ep13_warp_65_2";
end;
@@ -7239,7 +7239,7 @@ OnDisable:
end;
}
-nyd_dun02,167,258,0 script ep13_warp_81_2 139,1,1,{
+nyd_dun02,167,258,0 script ep13_warp_81_2 HIDDEN_WARP_NPC,1,1,{
OnInit:
OnDisable:
disablenpc "ep13_warp_81_2";
@@ -7258,7 +7258,7 @@ OnTouch:
end;
}
-nyd_dun02,167,252,0 script ep13_warp_83_2 139,1,1,{
+nyd_dun02,167,252,0 script ep13_warp_83_2 HIDDEN_WARP_NPC,1,1,{
OnInit:
OnDisable:
disablenpc "ep13_warp_83_2";
@@ -7276,7 +7276,7 @@ OnTouch:
end;
}
-nyd_dun02,167,246,0 script ep13_warp_85_2 139,1,1,{
+nyd_dun02,167,246,0 script ep13_warp_85_2 HIDDEN_WARP_NPC,1,1,{
OnInit:
OnDisable:
disablenpc "ep13_warp_85_2";
@@ -7296,7 +7296,7 @@ OnTouch:
nyd_dun01,255,142,0 warp nynm_dun1f_to_2f 1,1,nyd_dun02,61,265
nyd_dun02,56,264,0 warp nynm_dun2f_to_1f 1,1,nyd_dun01,249,143
-nyd_dun02,1,1,0 script ep13_nd2f_mng 844,{
+nyd_dun02,1,1,0 script ep13_nd2f_mng CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "Enter password.";
next;
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index af109a71d..f018327d1 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -38,7 +38,7 @@
//----------------------------------------------------------------------------
// Kain Himere
//----------------------------------------------------------------------------
-airplane,47,61,7 script Crewman 833,{
+airplane,47,61,7 script Crewman 4_M_ZONDAOYAJI,{
if (kain_ticket == 4) {
mes "[Kain Himere]";
mes "Ah...";
@@ -474,7 +474,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Elle Cherno
//----------------------------------------------------------------------------
-ein_in01,261,241,3 script Elle Cherno 703,3,3,{
+ein_in01,261,241,3 script Elle Cherno 4_F_KID2,3,3,{
OnTouch:
mes "[Elle Cherno]";
mes "Let's get to work";
@@ -559,7 +559,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Theo Cherno
//----------------------------------------------------------------------------
-ein_in01,123,94,1 script Theo Cherno 851,{
+ein_in01,123,94,1 script Theo Cherno 4_M_REPAIR,{
if (kain_ticket == 7) {
callfunc "F_Cherno";
set kain_ticket, 8;
@@ -597,7 +597,7 @@ ein_in01,123,94,1 script Theo Cherno 851,{
//----------------------------------------------------------------------------
// Tarsha Cherno
//----------------------------------------------------------------------------
-ein_in01,125,99,3 script Tarsha Cherno 850,{
+ein_in01,125,99,3 script Tarsha Cherno 4_F_EINWOMAN,{
if (kain_ticket == 7) {
callfunc "F_Cherno";
set kain_ticket, 8;
@@ -781,7 +781,7 @@ ein_in01,125,99,3 script Tarsha Cherno 850,{
}
}
-ein_in01,127,94,3 script #exp_ein 111,{ end; }
+ein_in01,127,94,3 script #exp_ein HIDDEN_NPC,{ end; }
function script F_Cherno {
specialeffect EF_COMBOATTACK1,AREA,"#exp_ein";
@@ -891,7 +891,7 @@ function script F_Cherno {
//----------------------------------------------------------------------------
// Unidentified Machine
//----------------------------------------------------------------------------
-ein_in01,122,103,5 script Unidentified Machine#ein 111,{
+ein_in01,122,103,5 script Unidentified Machine#ein HIDDEN_NPC,{
mes "^3355FFIt's...";
mes "It's a really";
mes "strange looking";
@@ -903,7 +903,7 @@ ein_in01,122,103,5 script Unidentified Machine#ein 111,{
//----------------------------------------------------------------------------
// Mirror
//----------------------------------------------------------------------------
-ein_in01,121,99,3 script Mirror#ein 111,{
+ein_in01,121,99,3 script Mirror#ein HIDDEN_NPC,{
if (kain_ticket == 8) {
mes "^3355FFIt's a mirror.";
mes "So, of course the";
@@ -1026,7 +1026,7 @@ ein_in01,121,99,3 script Mirror#ein 111,{
//----------------------------------------------------------------------------
// Tree from Einbech
//----------------------------------------------------------------------------
-einbech,45,113,5 script Tree#t1-1::Tree 111,{
+einbech,45,113,5 script Tree#t1-1::Tree HIDDEN_NPC,{
if (kain_ticket == 11) {
mes "^3355FFYou crouch down";
mes "under the tree and";
@@ -1138,14 +1138,14 @@ L_Diary:
mes "^333333But those moments grow fewer the more he drinks. When will he finally overcome his pain?^000000";
return;
}
-einbech,36,100,5 duplicate(Tree) Tree#t1-2 111
-einbech,44,90,5 duplicate(Tree) Tree#t1-3 111
-einbech,53,94,5 duplicate(Tree) Tree#t1-4 111
+einbech,36,100,5 duplicate(Tree) Tree#t1-2 HIDDEN_NPC
+einbech,44,90,5 duplicate(Tree) Tree#t1-3 HIDDEN_NPC
+einbech,53,94,5 duplicate(Tree) Tree#t1-4 HIDDEN_NPC
//----------------------------------------------------------------------------
// Expert Repairman
//----------------------------------------------------------------------------
-ein_in01,117,80,5 script Unidentified Machine#as 111,{
+ein_in01,117,80,5 script Unidentified Machine#as HIDDEN_NPC,{
if (kain_ticket > 12) {
mes "["+strcharinfo(0)+"]";
mes "This is the";
@@ -1573,7 +1573,7 @@ OnCaptainMobDead:
end;
}
-airplane_01,246,54,3 script Airship Captain#02 873,{
+airplane_01,246,54,3 script Airship Captain#02 4_M_REINDEER,{
cutin "fly_felrock",2;
mes "[Tarlock]";
mes "I am Tarlock,";
@@ -1590,22 +1590,22 @@ OnInit:
end;
}
-airplane_01,249,50,0 script boom0#airplane 139,{ end; }
-airplane_01,239,62,0 script boom1#airplane 139,{ end; }
-airplane_01,244,55,0 script boom2#airplane 139,{ end; }
-airplane_01,239,50,0 script boom3#airplane 139,{ end; }
-airplane_01,245,59,0 script boom4#airplane 139,{ end; }
-airplane_01,245,48,0 script boom5#airplane 139,{ end; }
-airplane_01,235,39,0 script boom6#airplane 139,{ end; }
-airplane_01,252,41,0 script boom7#airplane 139,{ end; }
-airplane_01,252,63,0 script boom8#airplane 139,{ end; }
-airplane_01,234,65,0 script boom9#airplane 139,{ end; }
-airplane_01,227,67,0 script boom10#airplane 139,{ end; }
+airplane_01,249,50,0 script boom0#airplane HIDDEN_WARP_NPC,{ end; }
+airplane_01,239,62,0 script boom1#airplane HIDDEN_WARP_NPC,{ end; }
+airplane_01,244,55,0 script boom2#airplane HIDDEN_WARP_NPC,{ end; }
+airplane_01,239,50,0 script boom3#airplane HIDDEN_WARP_NPC,{ end; }
+airplane_01,245,59,0 script boom4#airplane HIDDEN_WARP_NPC,{ end; }
+airplane_01,245,48,0 script boom5#airplane HIDDEN_WARP_NPC,{ end; }
+airplane_01,235,39,0 script boom6#airplane HIDDEN_WARP_NPC,{ end; }
+airplane_01,252,41,0 script boom7#airplane HIDDEN_WARP_NPC,{ end; }
+airplane_01,252,63,0 script boom8#airplane HIDDEN_WARP_NPC,{ end; }
+airplane_01,234,65,0 script boom9#airplane HIDDEN_WARP_NPC,{ end; }
+airplane_01,227,67,0 script boom10#airplane HIDDEN_WARP_NPC,{ end; }
//----------------------------------------------------------------------------
// Captain Tarlock :: lght_air
//----------------------------------------------------------------------------
-airplane_01,238,154,3 script Airship Captain#01 873,{
+airplane_01,238,154,3 script Airship Captain#01 4_M_REINDEER,{
cutin "fly_felrock",2;
mes "[Tarlock]";
mes "I am Tarlock,";
@@ -1888,7 +1888,7 @@ airplane_01,238,154,3 script Airship Captain#01 873,{
//----------------------------------------------------------------------------
// Captain Ferlock :: lght_ymir
//----------------------------------------------------------------------------
-airplane,236,163,5 script Airship Captain#03 873,{
+airplane,236,163,5 script Airship Captain#03 4_M_REINDEER,{
cutin "fly_trock.bmp",2;
if (hg_ma1 == 3 || hg_ma1 == 4) {
mes "[Ferlock]";
@@ -2322,7 +2322,7 @@ airplane,236,163,5 script Airship Captain#03 873,{
// Heart Fragment Quest :: lght_ymir
//============================================================
-airplane,236,63,4 script Hallen 706,{
+airplane,236,63,4 script Hallen 4_M_KID1,{
if (hg_ma1 == 3) {
mes "[Hallen]";
mes "Sha Sha~ ";
@@ -2751,7 +2751,7 @@ airplane,236,63,4 script Hallen 706,{
}
}
-airplane,33,69,4 script Kaci 73,{
+airplane,33,69,4 script Kaci 1_F_MERCHANT_01,{
if (hg_ma1 == 3) {
mes "[Kaci]";
mes "Hello there. My name is Kaci. If you feel bored boarding the airship, why don't you play a game of dice with me.";
@@ -3001,7 +3001,7 @@ L_Ask:
end;
}
-ein_in01,279,25,0 script #lab01_heart 139,1,1,{
+ein_in01,279,25,0 script #lab01_heart HIDDEN_WARP_NPC,1,1,{
end;
OnTouch:
if (lhz_heart == 9)
@@ -3016,7 +3016,7 @@ OnTouch:
}
}
-ein_in01,264,17,0 script #lab02_heart 139,1,1,{
+ein_in01,264,17,0 script #lab02_heart HIDDEN_WARP_NPC,1,1,{
end;
OnTouch:
if (lhz_heart == 9)
@@ -3038,7 +3038,7 @@ OnTouch:
}
}
-ein_in01,263,35,3 script Ferlock#lab 873,{
+ein_in01,263,35,3 script Ferlock#lab 4_M_REINDEER,{
end;
OnInit:
@@ -3056,7 +3056,7 @@ OnTimer120000:
end;
}
-ein_in01,261,35,0 script lab03#heart 139,1,1,{
+ein_in01,261,35,0 script lab03#heart HIDDEN_WARP_NPC,1,1,{
end;
OnTouch:
if (lhz_heart == 9) {
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index 961fdbca0..bde9e8841 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -35,7 +35,7 @@
// Doll Quest
//============================================================
-alberta,117,135,0 script Elin 96,{
+alberta,117,135,0 script Elin 4W_KID,{
if (checkweight(1201,1) == 0) {
mes "[Elin]";
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
@@ -387,7 +387,7 @@ alberta,117,135,0 script Elin 96,{
// 'Boy's Cap' Quest
//============================================================
-alberta_in,28,145,4 script Grampa 120,{
+alberta_in,28,145,4 script Grampa 2_M_PHARMACIST,{
mes "[Grampa]";
mes "*Gasp*...";
mes "....*Gasp!*";
@@ -465,7 +465,7 @@ alberta_in,28,145,4 script Grampa 120,{
// 'Antlers' Quest
//============================================================
-alberta_in,122,53,4 script Cherokee 47,{
+alberta_in,122,53,4 script Cherokee 1_M_01,{
mes "[Cherokee]";
mes "Hey there~!";
next;
@@ -511,7 +511,7 @@ alberta_in,122,53,4 script Cherokee 47,{
// 'Bao Bao', 'Crescent Hairpin', 'Fashionable Glasses', 'Heart Hairpin' Quest
//============================================================
-alberta,120,53,1 script Stylish Merchant#new30 51,{
+alberta,120,53,1 script Stylish Merchant#new30 1_M_BARD,{
if ((countitem(10007) > 0) && (countitem(968) > 49)) {
mes "[Zic]";
mes "I know I know, you just want to get a Bao Bao of your own. But I can't concentrate on my work if you keep rushing me like this.";
@@ -644,7 +644,7 @@ alberta,120,53,1 script Stylish Merchant#new30 51,{
// 'Hat of the Sun God', 'Sunday Hat', 'Mage Hat', 'Magician Hat' Quest
//============================================================
-alberta,136,79,1 script Hat store girl#new30 71,{
+alberta,136,79,1 script Hat store girl#new30 1_F_LIBRARYGIRL,{
mes "[Tempestra]";
mes "Ah, such a cool breeze. It's good to visit the seashore. I think it was the right choice to come here to take a break from my business.";
next;
@@ -945,7 +945,7 @@ alberta,136,79,1 script Hat store girl#new30 71,{
// Turtle Quest
//============================================================
-alberta,91,70,4 script Kinsey#tur 89,{
+alberta,91,70,4 script Kinsey#tur 4_M_ORIENT02,{
mes "[Kinsey]";
mes "What does a man have to do to get a stiff drink around here? I mean, there are absolutely no good bars in Alberta!";
next;
@@ -990,7 +990,7 @@ alberta,91,70,4 script Kinsey#tur 89,{
close;
}
-alberta_in,23,104,4 script Grandpa Turtle#tur 120,{
+alberta_in,23,104,4 script Grandpa Turtle#tur 2_M_PHARMACIST,{
mes "[Grandpa Turtle]";
mes "Ooog...";
mes "So dizzy...";
@@ -1224,7 +1224,7 @@ alberta_in,23,104,4 script Grandpa Turtle#tur 120,{
close;
}
-tur_dun01,165,29,4 script Sailor#tur2 709,{
+tur_dun01,165,29,4 script Sailor#tur2 4_M_SEAMAN,{
mes "[Gotanblue]";
mes "Do you want";
mes "to return";
@@ -1319,7 +1319,7 @@ tur_dun01,165,29,4 script Sailor#tur2 709,{
}
}
-alberta_in,18,102,4 script Letter#tur 111,{
+alberta_in,18,102,4 script Letter#tur HIDDEN_NPC,{
mes "[Explorer's Letter]";
mes "- O / X / XOVX -";
mes "If you find this letter, please don't disregard what you have read.";
@@ -1339,7 +1339,7 @@ alberta_in,18,102,4 script Letter#tur 111,{
close;
}
-alberta,248,93,4 script Voyage log#tur 111,{
+alberta,248,93,4 script Voyage log#tur HIDDEN_NPC,{
if (rand(2)) {
mes "[Voyage log]";
mes "03:20 am";
@@ -1523,7 +1523,7 @@ alberta,248,93,4 script Voyage log#tur 111,{
}
}
-tur_dun01,160,81,4 script Skull Stone#tur 111,{
+tur_dun01,160,81,4 script Skull Stone#tur HIDDEN_NPC,{
if (TURTLE == 2) {
mes "^3355FFUnder the stone^000000";
mes "^3355FFis a tiny key hole^000000";
@@ -1566,7 +1566,7 @@ tur_dun01,160,81,4 script Skull Stone#tur 111,{
close;
}
-tur_dun02,132,251,4 script Turtle Tree Roots#tur 111,{
+tur_dun02,132,251,4 script Turtle Tree Roots#tur HIDDEN_NPC,{
if (TURTLE == 3) {
mes "^3355FFUnder the tree roots^000000";
mes "^3355FFis a tiny key hole^000000";
@@ -1625,7 +1625,7 @@ tur_dun02,132,251,4 script Turtle Tree Roots#tur 111,{
close;
}
-tur_dun02,46,125,4 script A pile of turtle crystal 111,{
+tur_dun02,46,125,4 script A pile of turtle crystal HIDDEN_NPC,{
if (TURTLE == 7) {
mes "^3355FFAmong the Turtle Crystals,^000000";
mes "^3355FFyou find a strange key hole.^000000";
@@ -1681,7 +1681,7 @@ tur_dun02,46,125,4 script A pile of turtle crystal 111,{
close;
}
-tur_dun02,49,158,4 script Turtle Pillar#tur 111,{
+tur_dun02,49,158,4 script Turtle Pillar#tur HIDDEN_NPC,{
if (TURTLE == 8) {
mes "^3355FFAt the base of the pillar^000000";
mes "^3355FFis a tiny key hole with^000000";
@@ -1781,7 +1781,7 @@ tur_dun02,49,158,4 script Turtle Pillar#tur 111,{
close;
}
-tur_dun01,203,155,4 script Turtle stone#tur 111,{
+tur_dun01,203,155,4 script Turtle stone#tur HIDDEN_NPC,{
if (TURTLE == 4) {
mes "^3355FFOn top of the stone";
mes "is a small key hole";
@@ -1828,7 +1828,7 @@ tur_dun01,203,155,4 script Turtle stone#tur 111,{
close;
}
-tur_dun02,75,249,4 script Turtle stone#tur2 111,{
+tur_dun02,75,249,4 script Turtle stone#tur2 HIDDEN_NPC,{
if (TURTLE == 10) {
mes "^3355FFOn top of the stone";
mes "is a small keyhole";
@@ -1875,7 +1875,7 @@ tur_dun02,75,249,4 script Turtle stone#tur2 111,{
close;
}
-tur_dun03,118,233,4 script Turtle Stone#tur3 111,{
+tur_dun03,118,233,4 script Turtle Stone#tur3 HIDDEN_NPC,{
if (TURTLE == 11) {
mes "^3355FFOn top of the stone";
mes "is a small key hole";
@@ -1922,7 +1922,7 @@ tur_dun03,118,233,4 script Turtle Stone#tur3 111,{
close;
}
-tur_dun04,113,178,4 script Turtle Statue#tur 111,{
+tur_dun04,113,178,4 script Turtle Statue#tur HIDDEN_NPC,{
if (TURTLE == 12) {
mes "^3355FFOn top of the statue";
mes "is a small key hole";
@@ -1989,7 +1989,7 @@ tur_dun04,113,178,4 script Turtle Statue#tur 111,{
close;
}
-tur_dun03,105,76,4 script Knight Leader#tur 110,5,5,{
+tur_dun03,105,76,4 script Knight Leader#tur 4_M_MINISTER,5,5,{
mes "[Takuyaka]";
mes "Where did all my men go?!";
mes "This is horrible~!";
@@ -2067,7 +2067,7 @@ OnTouch:
close;
}
-tur_dun03,105,74,4 script Mudasamu#tur 119,{
+tur_dun03,105,74,4 script Mudasamu#tur 2_M_SWORDMASTER,{
mes "[Mudasamu]";
mes "My name is Mudasamu...";
mes "Second in command of the";
@@ -2098,7 +2098,7 @@ tur_dun03,105,74,4 script Mudasamu#tur 119,{
close;
}
-tur_dun01,190,115,4 script Knight#tur 105,{
+tur_dun01,190,115,4 script Knight#tur 8W_SOLDIER,{
mes "[?]";
mes "Where are they?";
mes "Oh hey! You're an adventurer, aren't you? Do you know where my comrades are?";
@@ -2160,7 +2160,7 @@ tur_dun01,190,115,4 script Knight#tur 105,{
}
}
-tur_dun03,189,126,4 script Knight#tur2 105,{
+tur_dun03,189,126,4 script Knight#tur2 8W_SOLDIER,{
mes "[Jayprocat]";
mes "Oh? Are you a civilian? Nice to meet you. I'm a mighty Security Knight of Alberta, Jayprocat.";
next;
@@ -2208,7 +2208,7 @@ tur_dun03,189,126,4 script Knight#tur2 105,{
close;
}
-tur_dun03,104,171,4 script Knight#tur3 105,{
+tur_dun03,104,171,4 script Knight#tur3 8W_SOLDIER,{
mes "[Squall]";
mes "Am I the only one left? Where are all my comrades?! I... I'm about to go crazy!";
next;
@@ -2260,7 +2260,7 @@ tur_dun03,104,171,4 script Knight#tur3 105,{
close;
}
-tur_dun03,67,130,4 script Knight#tur4 105,{
+tur_dun03,67,130,4 script Knight#tur4 8W_SOLDIER,{
mes "[Nysurea]";
mes "Hm? I'm surprised that someone around here is still alive.";
next;
@@ -2313,7 +2313,7 @@ tur_dun03,67,130,4 script Knight#tur4 105,{
// Alberta Boy
//============================================================
-alberta_in,131,95,5 script Iromo#ep3_2 706,{
+alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{
if (ep13_2_hiki == 13) {
mes "[Iromo]";
mes "But... this world is...";
@@ -2735,7 +2735,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 706,{
close;
}
-alberta_in,120,93,3 script Iromo's Mother#ep3_2 53,{
+alberta_in,120,93,3 script Iromo's Mother#ep3_2 1_M_INNKEEPER,{
if (ep13_2_hiki == 8) {
mes "[Mother]";
mes "Thank you for helping my son.";
@@ -2842,7 +2842,7 @@ alberta_in,120,93,3 script Iromo's Mother#ep3_2 53,{
close;
}
-alberta,45,106,5 script Little Boy#ep3_2 706,{
+alberta,45,106,5 script Little Boy#ep3_2 4_M_KID1,{
if (ep13_2_hiki == 6) {
mes "[Little Boy]";
mes "Iromo? He used to like ^FF0000Monster's Feed^000000 and ^FF0000Red Potion^000000.";
diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt
index 6075933da..17fd9190e 100644
--- a/npc/quests/quests_aldebaran.txt
+++ b/npc/quests/quests_aldebaran.txt
@@ -15,7 +15,7 @@
// 'Doctor Band', 'Feather Bonnet', 'Opera Masque', 'Sakkat Hat' Quest
//============================================================
-aldeba_in,152,166,4 script Trader#01 86,{
+aldeba_in,152,166,4 script Trader#01 4_M_04,{
mes "[Trader]";
mes "Who is this mysterious man?";
mes "I, the enigmatic and debonair 'Trader?'";
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 921d00123..53a11d0b8 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -18,7 +18,7 @@
// Momotaro Event :: japan_momo_q
//============================================================
-amatsu,223,236,3 script Publisher#ama 763,{
+amatsu,223,236,3 script Publisher#ama 4_M_JPN,{
if (checkweight(1201,1) == 0) {
mes "- Wait a moment!! -";
mes "- Currently you are carrying -";
@@ -210,7 +210,7 @@ amatsu,223,236,3 script Publisher#ama 763,{
}
}
-ama_test,52,44,3 script Assistant#ama 109,{
+ama_test,52,44,3 script Assistant#ama 4_M_MANAGER,{
if (event_momo == 0) {
mes "[Satoshi]";
mes "Welcome to <Momotaro Field Trip>";
@@ -401,7 +401,7 @@ OnTouch:
close;
}
-ama_test,49,93,4 script Grandpa#ama 766,{
+ama_test,49,93,4 script Grandpa#ama 4_M_JPNOJI,{
end;
OnInit:
@@ -409,7 +409,7 @@ OnInit:
end;
}
-ama_test,50,93,4 script Grandma#ama1 761,10,10,{
+ama_test,50,93,4 script Grandma#ama1 4_F_JPNOBA,10,10,{
end;
OnInit:
@@ -562,7 +562,7 @@ OnMyMobDead:
end;
}
-ama_test,50,100,3 script Coach#ama 762,15,15,{
+ama_test,50,100,3 script Coach#ama 4_M_JPN2,15,15,{
mes "[Coach]";
mes "Hoho~ Good.";
mes "I've been watching you in the VIP room. You were really something.";
@@ -704,7 +704,7 @@ OnMyMobDead:
end;
}
-ama_test,50,100,3 script Coach#after 762,5,5,{
+ama_test,50,100,3 script Coach#after 4_M_JPN2,5,5,{
end;
OnInit:
@@ -789,7 +789,7 @@ OnTouch:
// Sushi Quest :: japan_sushi
//============================================================
-ama_in01,162,17,1 script Sushi Master#ama 765,{
+ama_in01,162,17,1 script Sushi Master#ama 4_M_JPNOJI2,{
if (MaxWeight - Weight < 5000) {
mes "[Magumagu]";
mes "Hey. You look really heavy.";
@@ -1305,7 +1305,7 @@ ama_in01,162,17,1 script Sushi Master#ama 765,{
// Dungeon Quest :: japan_mono
//============================================================
-amatsu,112,164,4 script Gate Soldier#ama1 767,{
+amatsu,112,164,4 script Gate Soldier#ama1 8_M_JPNSOLDIER,{
mes "[Gate Soldier]";
mes "This is the great palace,";
mes "Toukoujyo.";
@@ -1321,7 +1321,7 @@ amatsu,112,164,4 script Gate Soldier#ama1 767,{
close;
}
-amatsu,119,164,4 script Gate Soldier#ama2 767,{
+amatsu,119,164,4 script Gate Soldier#ama2 8_M_JPNSOLDIER,{
mes "[Gate Soldier]";
mes "Are you from Rune-Midgard?";
mes "Welcome to Amatsu.";
@@ -1336,7 +1336,7 @@ amatsu,119,164,4 script Gate Soldier#ama2 767,{
close;
}
-ama_in02,207,40,6 script Gate Soldier#ama3 767,{
+ama_in02,207,40,6 script Gate Soldier#ama3 8_M_JPNSOLDIER,{
mes "[Gate Soldier]";
mes "Welcome. The lord of the palace";
mes "has specially allowed guests";
@@ -1348,7 +1348,7 @@ ama_in02,207,40,6 script Gate Soldier#ama3 767,{
close;
}
-ama_in02,207,49,6 script Gate Soldier#ama4 767,{
+ama_in02,207,49,6 script Gate Soldier#ama4 8_M_JPNSOLDIER,{
mes "[Gate Soldier]";
mes "The lord is really nice guy.";
mes "Who would know that our town was";
@@ -1363,7 +1363,7 @@ ama_in02,207,49,6 script Gate Soldier#ama4 767,{
close;
}
-amatsu,164,174,4 script Gate Soldier#ama5 767,{
+amatsu,164,174,4 script Gate Soldier#ama5 8_M_JPNSOLDIER,{
mes "[Gate Soldier]";
if (event_amatsu == 0) {
mes "You can't enter here.";
@@ -1401,7 +1401,7 @@ amatsu,164,174,4 script Gate Soldier#ama5 767,{
close;
}
-amatsu,171,174,4 script Gate Soldier#ama6 767,{
+amatsu,171,174,4 script Gate Soldier#ama6 8_M_JPNSOLDIER,{
mes "[Gate Soldier]";
if (event_amatsu == 0) {
mes "You can't enter here.";
@@ -1441,7 +1441,7 @@ amatsu,171,174,4 script Gate Soldier#ama6 767,{
close;
}
-ama_in02,187,57,2 script Soldier#ama1 767,{
+ama_in02,187,57,2 script Soldier#ama1 8_M_JPNSOLDIER,{
mes "[Ichiro]";
mes "Welcome.";
mes "Our lord prepared guest rooms";
@@ -1454,7 +1454,7 @@ ama_in02,187,57,2 script Soldier#ama1 767,{
close;
}
-ama_in02,170,62,4 script Soldier#ama2 767,{
+ama_in02,170,62,4 script Soldier#ama2 8_M_JPNSOLDIER,{
mes "[Jiro]";
mes "I'm Jiro, the administrator";
mes "of this Palace. What can I do for you?";
@@ -1505,7 +1505,7 @@ ama_in02,170,62,4 script Soldier#ama2 767,{
}
}
-ama_in02,37,157,4 script Soldier#ama3 767,{
+ama_in02,37,157,4 script Soldier#ama3 8_M_JPNSOLDIER,{
mes "[Saburo]";
mes "This is the training ground for improving our battle skills.";
mes "Please look around...";
@@ -1531,7 +1531,7 @@ ama_in02,37,157,4 script Soldier#ama3 767,{
close;
}
-ama_in02,32,51,6 script Soldier#ama4 767,{
+ama_in02,32,51,6 script Soldier#ama4 8_M_JPNSOLDIER,{
mes "[Shiro]";
mes "*Cough, Cough* What...";
mes "Don't talk to me...";
@@ -1550,7 +1550,7 @@ ama_in02,32,51,6 script Soldier#ama4 767,{
close;
}
-ama_in02,40,167,3 script Soldier#ama5 767,{
+ama_in02,40,167,3 script Soldier#ama5 8_M_JPNSOLDIER,{
mes "[Goro]";
mes "*Psst*... Please, be quiet.";
mes "I will tell you a story, okay?";
@@ -1578,7 +1578,7 @@ ama_in02,40,167,3 script Soldier#ama5 767,{
close;
}
-ama_in02,32,167,5 script Soldier#ama6 767,{
+ama_in02,32,167,5 script Soldier#ama6 8_M_JPNSOLDIER,{
mes "[Rokuro]";
mes "He always talks nonsense.";
mes "He says that our lord";
@@ -1600,7 +1600,7 @@ ama_in02,32,167,5 script Soldier#ama6 767,{
close;
}
-ama_in02,42,34,2 script Soldier#ama7 767,{
+ama_in02,42,34,2 script Soldier#ama7 8_M_JPNSOLDIER,{
mes "[Shichiro]";
mes "Have a good time.";
mes "My lord prepared some";
@@ -1616,7 +1616,7 @@ ama_in02,42,34,2 script Soldier#ama7 767,{
close;
}
-ama_in02,203,156,4 script Soldier#ama8 767,{
+ama_in02,203,156,4 script Soldier#ama8 8_M_JPNSOLDIER,{
mes "[Hachiro]";
mes "My lord is inside.";
mes "If you'd like to greet him, feel free to enter.";
@@ -1630,7 +1630,7 @@ ama_in02,203,156,4 script Soldier#ama8 767,{
close;
}
-ama_in02,195,156,4 script Soldier#ama9 767,{
+ama_in02,195,156,4 script Soldier#ama9 8_M_JPNSOLDIER,{
mes "[Kyuro]";
mes "This is not good.";
mes "My lord is really kind, but";
@@ -1645,7 +1645,7 @@ ama_in02,195,156,4 script Soldier#ama9 767,{
close;
}
-ama_in02,115,177,7 script Soldier#ama10 767,{
+ama_in02,115,177,7 script Soldier#ama10 8_M_JPNSOLDIER,{
mes "[Jyuro]";
mes "What are you doing in here?";
mes "There is nothing interesting here.";
@@ -1737,7 +1737,7 @@ ama_in02,115,177,7 script Soldier#ama10 767,{
close;
}
-ama_dun01,229,7,0 script Soldier#ama11 767,{
+ama_dun01,229,7,0 script Soldier#ama11 8_M_JPNSOLDIER,{
mes "[Jyuro]";
mes "Do you want to go back?";
next;
@@ -1753,7 +1753,7 @@ ama_dun01,229,7,0 script Soldier#ama11 767,{
close;
}
-ama_in02,200,176,4 script Lord of Palace#ama 768,{
+ama_in02,200,176,4 script Lord of Palace#ama 8_M_JPNMASTER,{
if (event_amatsu == 0) {
mes "[Ishida Yoshinaga]";
mes "What! A foreigner...? *Phew*";
@@ -1908,7 +1908,7 @@ ama_in02,200,176,4 script Lord of Palace#ama 768,{
close;
}
-ama_in01,22,111,0 script Grandma#ama2 761,{
+ama_in01,22,111,0 script Grandma#ama2 4_F_JPNOBA,{
if (event_amatsu == 4) {
mes "[....]";
mes "^FF6060Yelp, Yelp, a foolish human";
@@ -2052,7 +2052,7 @@ ama_in01,22,111,0 script Grandma#ama2 761,{
end;
}
-amatsu,189,166,5 script Kouji#ama 764,{
+amatsu,189,166,5 script Kouji#ama 4_M_JPNCHIBI,{
mes "[Kouji]";
mes "Ralralrah Ralralrah Ralralrahralralrah~";
mes "Ralralrah Ralralrah Ralralrahralralrah~";
@@ -2107,7 +2107,7 @@ amatsu,189,166,5 script Kouji#ama 764,{
close;
}
-ama_in01,169,173,1 script Shaman#ama 769,{
+ama_in01,169,173,1 script Shaman#ama 4_F_JPNMU,{
mes "[Tokako]";
mes "Er, I'm not really a shaman...";
mes "My friend, Takehue-kun brought";
@@ -2128,7 +2128,7 @@ ama_in01,169,173,1 script Shaman#ama 769,{
close;
}
-ama_in01,180,173,3 script Kitsune Mask#ama 762,{
+ama_in01,180,173,3 script Kitsune Mask#ama 4_M_JPN2,{
if (event_amatsu == 3) {
mes "[Takehue]";
mes "Eh, you are a foreigner.";
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index af7df5f6c..954c532a1 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -33,7 +33,7 @@
// Ayothaya Ring Quest :: ayo_ring
//============================================================
-ayothaya,233,105,3 script Powerful-Looking Woman 838,2,2,{
+ayothaya,233,105,3 script Powerful-Looking Woman 4_F_THAIAYO,2,2,{
if (thai_find == 14) {
mes "[Shuda]";
mes "Have you";
@@ -430,7 +430,7 @@ OnTouch:
}
}
-ayo_dun02,91,263,0 script #Annonblood 111,2,3,{
+ayo_dun02,91,263,0 script #Annonblood HIDDEN_NPC,2,3,{
if (!$@annonactive) {
if (thai_find == 13) {
mes "["+strcharinfo(0)+"]";
@@ -570,7 +570,7 @@ OnTouch:
}
-ayo_dun02,91,264,3 script Haggard Man 841,{
+ayo_dun02,91,264,3 script Haggard Man 4_M_THAIAYO,{
//completequest 12034;
if (thai_find == 13) {
mes "[Haggard Man]";
@@ -832,7 +832,7 @@ OnInit:
end;
}
-ayothaya,253,99,3 script Fisherman 843,{
+ayothaya,253,99,3 script Fisherman 4_M_THAIONGBAK,{
if (thai_find == 1) {
mes "[Dannai]";
mes "This place is known to be";
@@ -963,7 +963,7 @@ ayothaya,253,99,3 script Fisherman 843,{
}
}
-ayo_dun01,255,62,0 script AyoFootprint1 139,2,0,{
+ayo_dun01,255,62,0 script AyoFootprint1 HIDDEN_WARP_NPC,2,0,{
OnTouch:
if (thai_find == 4) {
if (rand(1,3) < 2) {
@@ -977,7 +977,7 @@ OnTouch:
end;
}
-ayo_dun01,74,142,0 script AyoFootprint2 139,2,0,{
+ayo_dun01,74,142,0 script AyoFootprint2 HIDDEN_WARP_NPC,2,0,{
OnTouch:
if (thai_find == 5) {
if (rand(1,3) < 2) {
@@ -991,7 +991,7 @@ OnTouch:
end;
}
-ayo_dun01,244,256,2 script AyoFootprint3 139,2,0,{
+ayo_dun01,244,256,2 script AyoFootprint3 HIDDEN_WARP_NPC,2,0,{
OnTouch:
if (thai_find == 6) {
if (rand(1,3) < 2) {
@@ -1005,7 +1005,7 @@ OnTouch:
end;
}
-ayo_dun01,17,257,0 script AyoFootprint4 139,2,0,{
+ayo_dun01,17,257,0 script AyoFootprint4 HIDDEN_WARP_NPC,2,0,{
OnTouch:
if (thai_find == 7) {
if (rand(1,3) < 2) {
@@ -1019,7 +1019,7 @@ OnTouch:
end;
}
-ayo_dun02,145,120,0 script AyoFootprint5 139,2,0,{
+ayo_dun02,145,120,0 script AyoFootprint5 HIDDEN_WARP_NPC,2,0,{
OnTouch:
if (thai_find == 8) {
if (rand(1,3) < 2) {
@@ -1036,7 +1036,7 @@ OnTouch:
end;
}
-ayo_dun02,135,168,0 script AyoFootprint6 139,0,2,{
+ayo_dun02,135,168,0 script AyoFootprint6 HIDDEN_WARP_NPC,0,2,{
OnTouch:
if (thai_find == 9) {
if (rand(1,3) == 1) {
@@ -1110,7 +1110,7 @@ OnTouch:
end;
}
-ayo_dun02,77,213,0 script AyoFootprint7 139,1,1,{
+ayo_dun02,77,213,0 script AyoFootprint7 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (thai_find == 10) {
if (rand(1,3) < 2) {
@@ -1127,7 +1127,7 @@ OnTouch:
end;
}
-ayo_dun02,86,254,0 script AyoFootprint8 139,1,1,{
+ayo_dun02,86,254,0 script AyoFootprint8 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (thai_find == 11) {
if (rand(1,3) < 2) {
@@ -1141,7 +1141,7 @@ OnTouch:
end;
}
-ayothaya,193,171,3 script Old Man#02 842,{
+ayothaya,193,171,3 script Old Man#02 4_M_THAIOLD,{
if (thai_find == 3) {
mes "[Tham]";
mes "Weird...";
@@ -1227,7 +1227,7 @@ ayothaya,193,171,3 script Old Man#02 842,{
// Ayothaya Dungeon Quest :: ayo_tiger
//============================================================
-ayothaya,83,132,0 script Dusit#thai 843,{
+ayothaya,83,132,0 script Dusit#thai 4_M_THAIONGBAK,{
if (ayodunquest == 0) {
mes "[Dusit]";
mes "Oh...!";
@@ -1326,7 +1326,7 @@ ayothaya,83,132,0 script Dusit#thai 843,{
}
}
-ayo_in01,181,193,4 script Shaman#thai 840,{
+ayo_in01,181,193,4 script Shaman#thai 4_F_THAISHAMAN,{
if (ayodunquest == 1) {
mes "[Boonthom]";
mes "You...!";
@@ -1795,7 +1795,7 @@ ayo_in01,181,193,4 script Shaman#thai 840,{
close;
}
-ayo_fild01,129,197,0 script Puraim#thai1 842,{
+ayo_fild01,129,197,0 script Puraim#thai1 4_M_THAIOLD,{
if ((ayodunquest > 2 && countitem(7285) > 0) || (ayodunquest > 2 && countitem(7287) > 0)) {
mes "[Puraim]";
mes "Huh...?";
@@ -1871,7 +1871,7 @@ ayo_fild01,129,197,0 script Puraim#thai1 842,{
close;
}
-ayo_fild02,25,154,0 script Aik#thai 843,{
+ayo_fild02,25,154,0 script Aik#thai 4_M_THAIONGBAK,{
mes "[Aik]";
mes "So, how was your expedition?";
mes "I hope that the evil spirits will not follow you outside of the ruins, and haunt your dreams.";
@@ -1905,7 +1905,7 @@ ayo_fild02,25,154,0 script Aik#thai 843,{
}
// Water Traps
-ayo_dun01,273,26,0 script #th_dun1_1_1::AyoTrap1 111,0,4,{
+ayo_dun01,273,26,0 script #th_dun1_1_1::AyoTrap1 HIDDEN_NPC,0,4,{
mes "^3355FFYou look down and see a pool";
mes "of water in the distance. It looks like a long drop to the bottom.^000000";
next;
@@ -1926,9 +1926,9 @@ OnTouch:
close;
}
-ayo_dun01,273,27,0 duplicate(AyoTrap1) #th_dun1_1_2 111
-ayo_dun01,272,27,0 duplicate(AyoTrap1) #th_dun1_1_3 111,0,4
-ayo_dun01,272,26,0 duplicate(AyoTrap1) #th_dun1_1_4 111
+ayo_dun01,273,27,0 duplicate(AyoTrap1) #th_dun1_1_2 HIDDEN_NPC
+ayo_dun01,272,27,0 duplicate(AyoTrap1) #th_dun1_1_3 HIDDEN_NPC,0,4
+ayo_dun01,272,26,0 duplicate(AyoTrap1) #th_dun1_1_4 HIDDEN_NPC
ayo_dun01,26,27,0 script #th_dun1_1::AyoTrap2 -1,1,1,{
OnTouch:
@@ -1969,7 +1969,7 @@ ayo_dun01,259,44,0 duplicate(AyoHint) #hint02_2 -1,2,0
ayo_dun01,259,46,0 duplicate(AyoHint) #hint02_3 -1,2,0
// Puzzle pieces
-ayo_dun01,198,164,0 script #hun_thai_1 111,{
+ayo_dun01,198,164,0 script #hun_thai_1 HIDDEN_NPC,{
if (ayodunquest == 3) {
set ayodunquest,4;
mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 1st part of the slate.^000000";
@@ -1981,7 +1981,7 @@ ayo_dun01,198,164,0 script #hun_thai_1 111,{
close;
}
-ayo_dun01,87,16,0 script #hun_thai_2 111,{
+ayo_dun01,87,16,0 script #hun_thai_2 HIDDEN_NPC,{
if (ayodunquest == 4) {
set ayodunquest,5;
mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 2nd part of the slate.^000000";
@@ -1993,7 +1993,7 @@ ayo_dun01,87,16,0 script #hun_thai_2 111,{
close;
}
-ayo_dun01,268,214,0 script #hun_thai_3 111,{
+ayo_dun01,268,214,0 script #hun_thai_3 HIDDEN_NPC,{
if (ayodunquest == 5) {
set ayodunquest,6;
mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 3rd part of the slate.^000000";
@@ -2005,7 +2005,7 @@ ayo_dun01,268,214,0 script #hun_thai_3 111,{
close;
}
-ayo_dun01,147,274,0 script #hun_thai_4 111,{
+ayo_dun01,147,274,0 script #hun_thai_4 HIDDEN_NPC,{
if (ayodunquest == 6) {
set ayodunquest,7;
mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 4th part of the slate.^000000";
@@ -2017,7 +2017,7 @@ ayo_dun01,147,274,0 script #hun_thai_4 111,{
close;
}
-ayo_dun01,99,118,0 script #hun_thai_5 111,{
+ayo_dun01,99,118,0 script #hun_thai_5 HIDDEN_NPC,{
if (ayodunquest == 7) {
set ayodunquest,8;
mes "^3355FFYou find a piece of a stone slate with letters etched on it. It seems to be the 5th part of the slate.^000000";
@@ -2029,7 +2029,7 @@ ayo_dun01,99,118,0 script #hun_thai_5 111,{
close;
}
-ayo_dun01,16,188,0 script #hun_thai_6 111,{
+ayo_dun01,16,188,0 script #hun_thai_6 HIDDEN_NPC,{
if (ayodunquest == 8) {
set ayodunquest,9;
setquest 12036;
@@ -2042,7 +2042,7 @@ ayo_dun01,16,188,0 script #hun_thai_6 111,{
close;
}
-ayo_dun01,24,283,0 script #2_dun_in 111,{
+ayo_dun01,24,283,0 script #2_dun_in HIDDEN_NPC,{
if (ayodunquest > 10) {
if (countitem(7287) > 0) {
mes "^3355FFThe holy threads";
@@ -2066,7 +2066,7 @@ ayo_dun01,24,283,0 script #2_dun_in 111,{
close;
}
-ayo_dun02,268,108,0 script #reward_tiger 111,{
+ayo_dun02,268,108,0 script #reward_tiger HIDDEN_NPC,{
if (ayodunquest == 11 && countitem(7287) > 0) {
mes "^3355FFYou find half of the skeletal remains of a person sticking out from the ground. It seems to be the remains of Boonthom's comrade.^000000";
next;
@@ -2089,7 +2089,7 @@ ayo_dun02,268,108,0 script #reward_tiger 111,{
// Tom Tung Goong Quest :: ayo_tom
//============================================================
-ayothaya,196,265,3 script Einon#ayo 842,{
+ayothaya,196,265,3 script Einon#ayo 4_M_THAIOLD,{
if (tomyumgoong == 0) {
mes "[Einon]";
mes "Do you know what the";
@@ -2164,7 +2164,7 @@ ayothaya,196,265,3 script Einon#ayo 842,{
close;
}
-ayo_in01,145,163,3 script Cook#ayo 839,{
+ayo_in01,145,163,3 script Cook#ayo 4_F_THAIGIRL,{
if (tomyumgoong < 2) {
mes "[Mali the Spicy]";
mes "Hello, there!";
@@ -2506,7 +2506,7 @@ ayo_in01,145,163,3 script Cook#ayo 839,{
close;
}
-ayothaya,153,86,5 script Thongpool#ayo 843,{
+ayothaya,153,86,5 script Thongpool#ayo 4_M_THAIONGBAK,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
mes "- Currently you're carrying -";
@@ -2619,7 +2619,7 @@ ayothaya,153,86,5 script Thongpool#ayo 843,{
close;
}
-ayothaya,121,240,7 script Mr. Jun#ayo 842,1,1,{
+ayothaya,121,240,7 script Mr. Jun#ayo 4_M_THAIOLD,1,1,{
if (MaxWeight - Weight < 2000 || checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
mes "- Currently you're carrying -";
@@ -2921,7 +2921,7 @@ OnTouch:
close;
}
-ayothaya,213,94,7 script Merchant#ayo 841,{
+ayothaya,213,94,7 script Merchant#ayo 4_M_THAIAYO,{
if (tomyumgoong == 6) {
mes "[Merchant Thongdum]";
mes "Hello, there~";
diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt
index 5fa68c77e..6faf8f84f 100644
--- a/npc/quests/quests_comodo.txt
+++ b/npc/quests/quests_comodo.txt
@@ -31,7 +31,7 @@
// Headgear Quests 1
// Cross Hat, Bulb Hairband, Striped Hairband, Blue Hairband
//============================================================
-comodo,228,159,3 script Hair Ornament Girl 700,{
+comodo,228,159,3 script Hair Ornament Girl 8_F_GIRL,{
mes "[Hair Ornament Girl]";
if (Sex == 1) {
mes "Oh, hello!";
@@ -228,7 +228,7 @@ comodo,228,159,3 script Hair Ornament Girl 700,{
// Headgear Quests 2
// 'Mine Helmet', 'Parcel Hat', 'Money Loser's Grief', 'Phantom of the Opera Mask'
//============================================================
-comodo,273,137,4 script Traveler#head 702,{
+comodo,273,137,4 script Traveler#head 4_F_GON,{
mes "[Isac Mari]";
mes "I travel around the world, and collect many interesting stories from people. Sometimes they teach me how to make special items.";
next;
@@ -471,7 +471,7 @@ comodo,273,137,4 script Traveler#head 702,{
// Doomed Swords - Comodo Portion. (Continued in Juno)
//============================================================
-comodo,206,310,4 script Campground Boy#cmd 704,{
+comodo,206,310,4 script Campground Boy#cmd 4_M_BIBI,{
switch (dmdswrd_Q) {
case 0:
mes "[Rochito]";
@@ -631,7 +631,7 @@ comodo,206,310,4 script Campground Boy#cmd 704,{
close;
}
-comodo,204,310,4 script Camping Youth#cmd 65,{
+comodo,204,310,4 script Camping Youth#cmd 1_M_YOUNGKNIGHT,{
switch (dmdswrd_Q) {
case 0:
case 1:
@@ -736,7 +736,7 @@ comodo,204,310,4 script Camping Youth#cmd 65,{
close;
}
-comodo,209,305,4 script Camping Maiden#cmd 71,{
+comodo,209,305,4 script Camping Maiden#cmd 1_F_LIBRARYGIRL,{
mes "[Emralhandas]";
mes "Rockha, let me pour";
mes "you another drink. We";
@@ -804,7 +804,7 @@ comodo,209,305,4 script Camping Maiden#cmd 71,{
close;
}
-comodo,209,314,4 script Campground Lad#cmd 706,{
+comodo,209,314,4 script Campground Lad#cmd 4_M_KID1,{
switch (dmdswrd_Q) {
case 0:
case 1:
@@ -853,7 +853,7 @@ comodo,209,314,4 script Campground Lad#cmd 706,{
close;
}
-comodo,221,310,4 script BBQ Boy#cmd 86,{
+comodo,221,310,4 script BBQ Boy#cmd 4_M_04,{
mes "[Rinta]";
mes "I didn't mean to,";
mes "but I accidentally";
@@ -871,7 +871,7 @@ comodo,221,310,4 script BBQ Boy#cmd 86,{
close;
}
-comodo,218,309,4 script BBQ Visitor#cmd 90,{
+comodo,218,309,4 script BBQ Visitor#cmd 4_F_01,{
mes "[Razy]";
mes "Those people over there";
mes "are friends of the Village";
@@ -890,7 +890,7 @@ comodo,218,309,4 script BBQ Visitor#cmd 90,{
close;
}
-comodo,216,310,4 script BBQ Papa#cmd::CmdFamily 50,{
+comodo,216,310,4 script BBQ Papa#cmd::CmdFamily 1_M_04,{
mes "[BBQ Boy]";
mes "D-daddy! Is what those";
mes "people talking about true?";
@@ -937,11 +937,11 @@ comodo,216,310,4 script BBQ Papa#cmd::CmdFamily 50,{
close;
}
-comodo,215,307,4 duplicate(CmdFamily) BBQ Mama#cmd 74
+comodo,215,307,4 duplicate(CmdFamily) BBQ Mama#cmd 1_F_MERCHANT_02
-comodo,213,310,4 duplicate(CmdFamily) BBQ Boy#cmd2 706
+comodo,213,310,4 duplicate(CmdFamily) BBQ Boy#cmd2 4_M_KID1
-cmd_in02,32,140,4 script Chief#cmd 49,{
+cmd_in02,32,140,4 script Chief#cmd 1_M_03,{
if (dmdswrd_Q > 4) {
mes "[Tausupa]";
mes "Maybe you can't tell because";
@@ -1092,7 +1092,7 @@ cmd_in02,32,140,4 script Chief#cmd 49,{
close;
}
-comodo,88,97,4 script Toruna#cmd 109,{
+comodo,88,97,4 script Toruna#cmd 4_M_MANAGER,{
mes "[Toruna]";
mes "When I think about it,";
mes "there are many fascinating";
@@ -1227,7 +1227,7 @@ comodo,88,97,4 script Toruna#cmd 109,{
close;
}
-comodo,164,291,4 script Rakusa#cmd 73,{
+comodo,164,291,4 script Rakusa#cmd 1_F_MERCHANT_01,{
switch (dmdswrd_Q) {
case 6:
mes "[Rakusa]";
@@ -1276,7 +1276,7 @@ comodo,164,291,4 script Rakusa#cmd 73,{
close;
}
-comodo,169,284,4 script Kichiri#cmd 98,{
+comodo,169,284,4 script Kichiri#cmd 4W_M_02,{
switch (dmdswrd_Q) {
case 7:
mes "[Kichiri]";
@@ -1324,7 +1324,7 @@ comodo,169,284,4 script Kichiri#cmd 98,{
close;
}
-comodo,163,280,4 script Magatu#cmd 55,{
+comodo,163,280,4 script Magatu#cmd 1_M_JOBTESTER,{
switch (dmdswrd_Q) {
case 8:
mes "[Magatu]";
@@ -1385,7 +1385,7 @@ comodo,163,280,4 script Magatu#cmd 55,{
close;
}
-cmd_in02,189,99,4 script Manzi#cmd 85,{
+cmd_in02,189,99,4 script Manzi#cmd 4_M_03,{
switch (dmdswrd_Q) {
case 9:
mes "["+strcharinfo(0)+"]";
@@ -1472,7 +1472,7 @@ cmd_in02,189,99,4 script Manzi#cmd 85,{
close;
}
-comodo,187,153,4 script Hullaris#cmd 701,{
+comodo,187,153,4 script Hullaris#cmd 4_F_GODEMOM,{
switch (dmdswrd_Q) {
case 10:
mes "[Hullaris]";
@@ -1707,7 +1707,7 @@ comodo,187,153,4 script Hullaris#cmd 701,{
close;
}
-beach_dun3,30,220,4 script Nigirboran#cmd 704,{
+beach_dun3,30,220,4 script Nigirboran#cmd 4_M_BIBI,{
switch (dmdswrd_Q) {
case 11:
mes "[Nigirboran]";
@@ -1939,7 +1939,7 @@ beach_dun3,30,220,4 script Nigirboran#cmd 704,{
close;
}
-aldebaran,44,53,4 script Meteurengut#cmd 64,{
+aldebaran,44,53,4 script Meteurengut#cmd 1_M_WIZARD,{
switch (dmdswrd_Q) {
case 14:
mes "[Meteurengut]";
@@ -2161,7 +2161,7 @@ aldebaran,44,53,4 script Meteurengut#cmd 64,{
close;
}
-morocc,201,30,4 script Zaka#cmd 99,{
+morocc,201,30,4 script Zaka#cmd 4W_M_03,{
switch (dmdswrd_Q) {
case 17:
mes "[Zaka]";
@@ -2375,7 +2375,7 @@ morocc,201,30,4 script Zaka#cmd 99,{
close;
}
-comodo,232,87,4 script Won#cmd 106,{
+comodo,232,87,4 script Won#cmd 1_M_MOC_LORD,{
switch (dmdswrd_Q) {
case 22:
mes "[Won]";
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index a0717be84..243c47fc7 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -53,7 +53,7 @@
// Oridecon Stone OR Mineral Stone Quest :: ein_amano
//============================================================
-einbech,97,167,5 script Cavitar 847,{
+einbech,97,167,5 script Cavitar 4_M_EINOLD,{
if (ein_gear1 == 2) {
mes "[Cavitar]";
mes "It's been a long";
@@ -472,7 +472,7 @@ einbech,97,167,5 script Cavitar 847,{
// Uwe Kleine :: ein_anoz
//============================================================
-einbroch,215,180,6 script Uwe Kleine#ein 85,{
+einbroch,215,180,6 script Uwe Kleine#ein 4_M_03,{
set EinUwe,0;
if (BaseClass == Job_Blacksmith) {
if (ein_cook > 999) {
@@ -3369,7 +3369,7 @@ OnTimer600000:
end;
}
-einbroch,132,84,3 script Liotzburg#ein 853,2,2,{
+einbroch,132,84,3 script Liotzburg#ein 4_M_YURI,2,2,{
if ((EinFactory == 13) || (EinFactory == 14)) {
changequest 8029,8030;
set EinFactory,14;
@@ -3449,7 +3449,7 @@ OnTouch:
}
}
-ein_in01,67,242,3 script Zelmeto 851,{
+ein_in01,67,242,3 script Zelmeto 4_M_REPAIR,{
if ($EinPolution > 9) {
mes "[Zelmeto]";
mes "We've got a big problem";
@@ -4104,7 +4104,7 @@ ein_in01,108,217,3 script 3rd Pressure Governor#1 111,{
end;
}
-ein_in01,62,258,3 script Main Control Panel#ins 111,{
+ein_in01,62,258,3 script Main Control Panel#ins HIDDEN_NPC,{
if ((EinFactory == 5) || (EinFactory == 6)) {
changequest 8021,8022;
set EinFactory,6;
@@ -4120,7 +4120,7 @@ ein_in01,62,258,3 script Main Control Panel#ins 111,{
end;
}
-ein_in01,46,197,3 script Conveyor#ins 111,{
+ein_in01,46,197,3 script Conveyor#ins HIDDEN_NPC,{
if ((EinFactory == 7) || (EinFactory == 8)) {
changequest 8023,8024;
set EinFactory,8;
@@ -4135,7 +4135,7 @@ ein_in01,46,197,3 script Conveyor#ins 111,{
end;
}
-ein_in01,100,266,3 script Pipe#ins 111,{
+ein_in01,100,266,3 script Pipe#ins HIDDEN_NPC,{
if ((EinFactory == 9) || (EinFactory == 10)) {
changequest 8025,8026;
set EinFactory,10;
@@ -4151,7 +4151,7 @@ ein_in01,100,266,3 script Pipe#ins 111,{
end;
}
-ein_in01,95,239,3 script Conveyor#ins2 111,{
+ein_in01,95,239,3 script Conveyor#ins2 HIDDEN_NPC,{
if ((EinFactory == 11) || (EinFactory == 12)) {
changequest 8027,8028;
set EinFactory,12;
@@ -4167,7 +4167,7 @@ ein_in01,95,239,3 script Conveyor#ins2 111,{
}
// Administrator NPC used to rig the invasion in Einbroch.
-sec_in02,127,86,3 script Factory Quest Test 851,{
+sec_in02,127,86,3 script Factory Quest Test 4_M_REPAIR,{
set .@i, callfunc("F_GM_NPC",8028,0,0,9000);
if (.@i == -2) {
mes "[Test1]";
@@ -4216,7 +4216,7 @@ sec_in02,127,86,3 script Factory Quest Test 851,{
// Murder Quest :: ein_main_tre
//============================================================
-einbech,165,105,7 script Buender Hikeman#ein 847,{
+einbech,165,105,7 script Buender Hikeman#ein 4_M_EINOLD,{
cutin "ein_hicman",2;
if (Shinokas_Quest == 0) {
mes "[Buender Hikeman]";
@@ -4722,7 +4722,7 @@ einbech,165,105,7 script Buender Hikeman#ein 847,{
}
}
-ein_in01,231,163,7 script Sick Old Man#ein 849,{
+ein_in01,231,163,7 script Sick Old Man#ein 4_M_DIEMAN,{
if (Shinokas_Quest < 2) {
mes "[Sick Old Man]";
mes "...!";
@@ -5252,7 +5252,7 @@ ein_in01,231,163,7 script Sick Old Man#ein 849,{
}
}
-ein_in01,32,133,7 script Maid#ein 850,{
+ein_in01,32,133,7 script Maid#ein 4_F_EINWOMAN,{
if (Shinokas_Quest == 4) {
mes "[Maid]";
mes "Did you ask me";
@@ -5285,7 +5285,7 @@ ein_in01,32,133,7 script Maid#ein 850,{
}
}
-ein_in01,254,35,1 script Scientist#ein 749,{
+ein_in01,254,35,1 script Scientist#ein 4_M_ALCHE_B,{
mes "[Scientist]";
mes "^333333*Grumble grumble*^000000";
next;
@@ -5350,7 +5350,7 @@ ein_in01,254,35,1 script Scientist#ein 749,{
close;
}
-ein_in01,266,27,3 script Unknown Stuff#ein 111,{
+ein_in01,266,27,3 script Unknown Stuff#ein HIDDEN_NPC,{
mes "^3355FFThere's something";
mes "attached to a huge";
mes "machine with many cords";
@@ -5358,7 +5358,7 @@ ein_in01,266,27,3 script Unknown Stuff#ein 111,{
close;
}
-einbroch,51,46,5 script Laboratory Soldier#ein-1 852,{
+einbroch,51,46,5 script Laboratory Soldier#ein-1 4_M_EIN_SOLDIER,{
mes "[Laboratory Soldier]";
mes "This area";
mes "is off limits.";
@@ -5367,7 +5367,7 @@ einbroch,51,46,5 script Laboratory Soldier#ein-1 852,{
close;
}
-einbroch,51,56,5 script Laboratory Soldier#ein-2 852,{
+einbroch,51,56,5 script Laboratory Soldier#ein-2 4_M_EIN_SOLDIER,{
mes "[Laboratory Soldier]";
mes "Yuck...!";
mes "There's this";
@@ -5383,7 +5383,7 @@ einbroch,51,56,5 script Laboratory Soldier#ein-2 852,{
close;
}
-airplane,31,77,5 script Drunken Man#ein 853,{
+airplane,31,77,5 script Drunken Man#ein 4_M_YURI,{
if (Shinokas_Quest == 8) {
mes "[Drunken Man]";
mes "Okay okay...";
@@ -5648,7 +5648,7 @@ OnTouch:
end;
}
-einbech,57,210,3 script Young Man#Shinokas_Quest 855,{
+einbech,57,210,3 script Young Man#Shinokas_Quest 4_M_EINMAN,{
mes "[Young Man]";
mes "Behind the pub,";
mes "you'll see this old man";
@@ -5673,7 +5673,7 @@ einbech,57,210,3 script Young Man#Shinokas_Quest 855,{
// Typing Test :: ein_main_ma1
//============================================================
-einbroch,51,52,0 script Security#ein 45,1,1,{
+einbroch,51,52,0 script Security#ein WARPNPC,1,1,{
end;
OnTouch:
@@ -5827,7 +5827,7 @@ OnTouch:
// Lovers Quest :: ein_ryu
//============================================================
-ein_in01,31,138,3 script Calla#ein 90,{
+ein_in01,31,138,3 script Calla#ein 4_F_01,{
if (checkweight(908,70) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -6122,7 +6122,7 @@ ein_in01,31,138,3 script Calla#ein 90,{
}
}
-ein_in01,200,101,5 script Klitzer#ein 854,{
+ein_in01,200,101,5 script Klitzer#ein 4_M_EINMAN2,{
if (EIN_LOVERQ == 16) {
mes "[Klitzer]";
mes "Look out, world!";
@@ -6508,7 +6508,7 @@ ein_in01,200,101,5 script Klitzer#ein 854,{
close;
}
-ein_in01,21,147,3 script Megass#EIN 853,3,3,{
+ein_in01,21,147,3 script Megass#EIN 4_M_YURI,3,3,{
end;
OnTouch:
@@ -6577,7 +6577,7 @@ OnTouch:
close;
}
-ein_in01,31,151,3 script Satra#ein 850,{
+ein_in01,31,151,3 script Satra#ein 4_F_EINWOMAN,{
if (EIN_LOVERQ > 12) {
mes "[Satra]";
mes "I understand that my";
@@ -7076,7 +7076,7 @@ ein_in01,31,151,3 script Satra#ein 850,{
close;
}
-ein_in01,191,102,5 script Kaijeta#ein 846,{
+ein_in01,191,102,5 script Kaijeta#ein 4_F_EINOLD,{
if (EIN_LOVERQ > 15) {
mes "[Kaijeta]";
mes "My son learned";
@@ -7199,7 +7199,7 @@ ein_in01,191,102,5 script Kaijeta#ein 846,{
close;
}
-einbroch,188,72,3 script Keneshiotz#ein 855,{
+einbroch,188,72,3 script Keneshiotz#ein 4_M_EINMAN,{
mes "[Keneshiotz]";
mes "This city is full of sky";
mes "high smokestacks and";
@@ -7222,7 +7222,7 @@ einbroch,188,72,3 script Keneshiotz#ein 855,{
close;
}
-einbech,216,118,3 script Catzllanpu#ein 854,{
+einbech,216,118,3 script Catzllanpu#ein 4_M_EINMAN2,{
mes "[Catzllanpu]";
mes "^333333*Sigh...*^000000";
mes "Simple pleasures.";
@@ -7248,7 +7248,7 @@ einbech,216,118,3 script Catzllanpu#ein 854,{
close;
}
-einbroch,208,208,3 script Kesunboss#ein 850,{
+einbroch,208,208,3 script Kesunboss#ein 4_F_EINWOMAN,{
mes "[Kesunboss]";
mes "Lady Calla is the";
mes "epitome of elegance,";
@@ -7279,7 +7279,7 @@ einbroch,208,208,3 script Kesunboss#ein 850,{
close;
}
-einbech,176,125,3 script Ellhenje#ein 850,{
+einbech,176,125,3 script Ellhenje#ein 4_F_EINWOMAN,{
mes "[Ellhenje]";
mes "Things might be";
mes "bad in this town";
@@ -7315,7 +7315,7 @@ einbech,176,125,3 script Ellhenje#ein 850,{
close;
}
-ein_in01,208,86,3 script Decii#ein 855,{
+ein_in01,208,86,3 script Decii#ein 4_M_EINMAN,{
mes "[Decii]";
mes "This is so";
mes "frustrating!";
@@ -7331,7 +7331,7 @@ ein_in01,208,86,3 script Decii#ein 855,{
close;
}
-ein_in01,192,90,3 script Supineque#ein 849,{
+ein_in01,192,90,3 script Supineque#ein 4_M_DIEMAN,{
mes "[Supineque]";
mes "Ugh...";
mes "I'm starving!";
diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt
index a220fd654..54e57218f 100644
--- a/npc/quests/quests_geffen.txt
+++ b/npc/quests/quests_geffen.txt
@@ -17,7 +17,7 @@
// Blacksmith: 'Welding Mask' Quest
//============================================================
-geffen_in,144,166,4 script Blacksmith 63,{
+geffen_in,144,166,4 script Blacksmith 1_M_SMITH,{
mes "[Blacksmith]";
mes "You've never heard of me? Why, I'm the Veteran Blacksmith of this land. I've spent 30 years in this hot and bloody hellfire, bending steel to my iron will!";
next;
@@ -83,7 +83,7 @@ geffen_in,144,166,4 script Blacksmith 63,{
// Eric: 'Headset' Quest
//============================================================
-geffen_in,30,71,4 script Eric 83,{
+geffen_in,30,71,4 script Eric 4_M_01,{
mes "[Eric]";
mes "Please listen";
mes "to my story";
@@ -164,7 +164,7 @@ geffen_in,30,71,4 script Eric 83,{
// Number Match Game :: gef_yagu
//============================================================
-geffen,122,77,4 script Nia#yagu 700,{
+geffen,122,77,4 script Nia#yagu 8_F_GIRL,{
mes "[Nia]";
mes "Hello, I'm Nia, the fifth";
mes "disciple of Mawong, the";
diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt
index a2e575a90..78b94c410 100644
--- a/npc/quests/quests_gonryun.txt
+++ b/npc/quests/quests_gonryun.txt
@@ -19,7 +19,7 @@
// Broken Sword :: broken_sword
//============================================================
-gon_in,17,93,5 script Chief#gon 775,{
+gon_in,17,93,5 script Chief#gon 4_M_TWMASKMAN,{
if (BaseLevel > 50) {
if (b_sword == 0) {
set b_sword,1;
@@ -415,7 +415,7 @@ gon_in,17,93,5 script Chief#gon 775,{
close;
}
-gon_in,152,35,4 script Hostess#gon 702,{
+gon_in,152,35,4 script Hostess#gon 4_F_GON,{
if (b_sword < 1) {
mes "[Mei Yen Fang]";
mes "Oh...you're new here, right?";
@@ -513,7 +513,7 @@ gon_in,152,35,4 script Hostess#gon 702,{
close;
}
-gon_in,165,16,4 script Man in hangover#gon 748,{
+gon_in,165,16,4 script Man in hangover#gon 4_M_ALCHE_A,{
if (b_sword < 4) {
mes "[Xue Bong]";
mes "Ahhh.. my stomach.. my head..";
@@ -793,7 +793,7 @@ OnCommandOn:
end;
}
-gon_dun01,201,25,0 script trace1-1#gnbs 139,1,1,{
+gon_dun01,201,25,0 script trace1-1#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 7) donpcevent "timer1-1::OnCommandOn";
end;
@@ -839,7 +839,7 @@ OnTimer3000:
end;
}
-gon_dun01,202,25,0 script #getitem1-1 111,2,1,{
+gon_dun01,202,25,0 script #getitem1-1 HIDDEN_NPC,2,1,{
if (b_sword != 7) end;
set b_sword,8;
mes "You found a ^FF0000piece of blade^000000.";
@@ -861,7 +861,7 @@ OnCommandOff:
end;
}
-gon_dun01,190,160,0 script trace1-2#gnbs 139,1,1,{
+gon_dun01,190,160,0 script trace1-2#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 7) donpcevent "timer1-2::OnCommandOn";
end;
@@ -907,7 +907,7 @@ OnTimer3000:
end;
}
-gon_dun01,190,159,0 script #getitem1-2 111,2,1,{
+gon_dun01,190,159,0 script #getitem1-2 HIDDEN_NPC,2,1,{
if (b_sword != 7) end;
set b_sword,8;
mes "You found a ^FF0000piece of blade^000000.";
@@ -929,7 +929,7 @@ OnCommandOff:
end;
}
-gon_dun01,163,53,0 script trace1-3#gnbs 139,1,1,{
+gon_dun01,163,53,0 script trace1-3#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 7) donpcevent "timer1-3::OnCommandOn";
end;
@@ -975,7 +975,7 @@ OnTimer3000:
end;
}
-gon_dun01,164,53,0 script #getitem1-3 111,2,1,{
+gon_dun01,164,53,0 script #getitem1-3 HIDDEN_NPC,2,1,{
if (b_sword != 7) end;
set b_sword,8;
mes "You found a ^FF0000piece of blade^000000.";
@@ -997,7 +997,7 @@ OnCommandOff:
end;
}
-gon_dun01,133,183,0 script trace1-4#gnbs 139,1,1,{
+gon_dun01,133,183,0 script trace1-4#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 7) donpcevent "timer1-4::OnCommandOn";
end;
@@ -1043,7 +1043,7 @@ OnTimer3000:
end;
}
-gon_dun01,134,183,0 script #getitem1-4 111,2,1,{
+gon_dun01,134,183,0 script #getitem1-4 HIDDEN_NPC,2,1,{
if (b_sword != 7) end;
set b_sword,8;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1065,7 +1065,7 @@ OnCommandOff:
end;
}
-gon_dun01,139,257,0 script trace1-5#gnbs 139,1,1,{
+gon_dun01,139,257,0 script trace1-5#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 7) donpcevent "timer1-5::OnCommandOn";
end;
@@ -1111,7 +1111,7 @@ OnTimer3000:
end;
}
-gon_dun01,140,257,0 script #getitem1-5 111,2,1,{
+gon_dun01,140,257,0 script #getitem1-5 HIDDEN_NPC,2,1,{
if (b_sword != 7) end;
set b_sword,8;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1141,7 +1141,7 @@ OnCommandOn:
end;
}
-gon_dun02,65,168,0 script trace2-1#gnbs 139,1,1,{
+gon_dun02,65,168,0 script trace2-1#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 8) donpcevent "timer2-1::OnCommandOn";
end;
@@ -1187,7 +1187,7 @@ OnTimer3000:
end;
}
-gon_dun02,202,25,0 script #getitem2-1 111,2,1,{
+gon_dun02,202,25,0 script #getitem2-1 HIDDEN_NPC,2,1,{
if (b_sword != 8) end;
set b_sword,9;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1209,7 +1209,7 @@ OnCommandOff:
end;
}
-gon_dun02,265,200,0 script trace2-2#gnbs 139,1,1,{
+gon_dun02,265,200,0 script trace2-2#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 8) donpcevent "timer2-2::OnCommandOn";
end;
@@ -1255,7 +1255,7 @@ OnTimer3000:
end;
}
-gon_dun02,265,201,0 script #getitem2-2 111,2,1,{
+gon_dun02,265,201,0 script #getitem2-2 HIDDEN_NPC,2,1,{
if (b_sword != 8) end;
set b_sword,9;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1277,7 +1277,7 @@ OnCommandOff:
end;
}
-gon_dun02,247,129,0 script trace2-3#gnbs 139,1,1,{
+gon_dun02,247,129,0 script trace2-3#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 8) donpcevent "timer2-3::OnCommandOn";
end;
@@ -1323,7 +1323,7 @@ OnTimer3000:
end;
}
-gon_dun02,247,128,0 script #getitem2-3 111,2,1,{
+gon_dun02,247,128,0 script #getitem2-3 HIDDEN_NPC,2,1,{
if (b_sword != 8) end;
set b_sword,9;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1345,7 +1345,7 @@ OnCommandOff:
end;
}
-gon_dun02,149,74,0 script trace2-4#gnbs 139,1,1,{
+gon_dun02,149,74,0 script trace2-4#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 8) donpcevent "timer2-4::OnCommandOn";
end;
@@ -1391,7 +1391,7 @@ OnTimer3000:
end;
}
-gon_dun02,149,75,0 script #getitem2-4 111,2,1,{
+gon_dun02,149,75,0 script #getitem2-4 HIDDEN_NPC,2,1,{
if (b_sword != 8) end;
set b_sword,9;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1413,7 +1413,7 @@ OnCommandOff:
end;
}
-gon_dun02,23,105,0 script trace2-5#gnbs 139,1,1,{
+gon_dun02,23,105,0 script trace2-5#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 8) donpcevent "timer2-5::OnCommandOn";
end;
@@ -1459,7 +1459,7 @@ OnTimer3000:
end;
}
-gon_dun02,23,106,0 script #getitem2-5 111,2,1,{
+gon_dun02,23,106,0 script #getitem2-5 HIDDEN_NPC,2,1,{
if (b_sword != 8) end;
set b_sword,9;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1481,7 +1481,7 @@ OnCommandOff:
end;
}
-gon_dun02,249,39,0 script trace2-6#gnbs 139,1,1,{
+gon_dun02,249,39,0 script trace2-6#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 8) donpcevent "timer2-6::OnCommandOn";
end;
@@ -1527,7 +1527,7 @@ OnTimer3000:
end;
}
-gon_dun02,249,40,0 script #getitem2-6 111,2,1,{
+gon_dun02,249,40,0 script #getitem2-6 HIDDEN_NPC,2,1,{
if (b_sword != 8) end;
set b_sword,9;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1557,7 +1557,7 @@ OnCommandOn:
end;
}
-gon_dun03,11,75,0 script trace3-1#gnbs 139,1,1,{
+gon_dun03,11,75,0 script trace3-1#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 9) donpcevent "timer3-1::OnCommandOn";
end;
@@ -1603,7 +1603,7 @@ OnTimer3000:
end;
}
-gon_dun03,10,74,0 script #getitem3-1 111,2,1,{
+gon_dun03,10,74,0 script #getitem3-1 HIDDEN_NPC,2,1,{
if (b_sword != 9) end;
set b_sword,10;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1629,7 +1629,7 @@ OnCommandOff:
end;
}
-gon_dun03,199,103,0 script trace3-2#gnbs 139,1,1,{
+gon_dun03,199,103,0 script trace3-2#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 9) donpcevent "timer3-2::OnCommandOn";
end;
@@ -1675,7 +1675,7 @@ OnTimer3000:
end;
}
-gon_dun03,199,102,0 script #getitem3-2 111,2,1,{
+gon_dun03,199,102,0 script #getitem3-2 HIDDEN_NPC,2,1,{
if (b_sword != 9) end;
set b_sword,10;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1701,7 +1701,7 @@ OnCommandOff:
end;
}
-gon_dun03,14,162,0 script trace3-3#gnbs 139,1,1,{
+gon_dun03,14,162,0 script trace3-3#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 9) donpcevent "timer3-3::OnCommandOn";
end;
@@ -1747,7 +1747,7 @@ OnTimer3000:
end;
}
-gon_dun03,14,163,0 script #getitem3-3 111,2,1,{
+gon_dun03,14,163,0 script #getitem3-3 HIDDEN_NPC,2,1,{
if (b_sword != 9) end;
set b_sword,10;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1773,7 +1773,7 @@ OnCommandOff:
end;
}
-gon_dun03,155,263,0 script trace3-4#gnbs 139,1,1,{
+gon_dun03,155,263,0 script trace3-4#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 9) donpcevent "timer3-4::OnCommandOn";
end;
@@ -1819,7 +1819,7 @@ OnTimer3000:
end;
}
-gon_dun03,156,263,0 script #getitem3-4 111,2,1,{
+gon_dun03,156,263,0 script #getitem3-4 HIDDEN_NPC,2,1,{
if (b_sword != 9) end;
set b_sword,10;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1845,7 +1845,7 @@ OnCommandOff:
end;
}
-gon_dun03,169,90,0 script trace3-5#gnbs 139,1,1,{
+gon_dun03,169,90,0 script trace3-5#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 9) donpcevent "timer3-5::OnCommandOn";
end;
@@ -1891,7 +1891,7 @@ OnTimer3000:
end;
}
-gon_dun03,170,90,0 script #getitem3-5 111,2,1,{
+gon_dun03,170,90,0 script #getitem3-5 HIDDEN_NPC,2,1,{
if (b_sword != 9) end;
set b_sword,10;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1917,7 +1917,7 @@ OnCommandOff:
end;
}
-gon_dun03,162,40,0 script trace3-6#gnbs 139,1,1,{
+gon_dun03,162,40,0 script trace3-6#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 9) donpcevent "timer3-6::OnCommandOn";
end;
@@ -1963,7 +1963,7 @@ OnTimer3000:
end;
}
-gon_dun03,68,39,0 script #getitem3-6 111,1,2,{
+gon_dun03,68,39,0 script #getitem3-6 HIDDEN_NPC,1,2,{
if (b_sword != 9) end;
set b_sword,10;
mes "You found a ^FF0000piece of blade^000000.";
@@ -1989,7 +1989,7 @@ OnCommandOff:
end;
}
-gon_dun03,68,212,0 script trace3-7#gnbs 139,1,1,{
+gon_dun03,68,212,0 script trace3-7#gnbs HIDDEN_WARP_NPC,1,1,{
if (b_sword == 9) donpcevent "timer3-7::OnCommandOn";
end;
@@ -2035,7 +2035,7 @@ OnTimer3000:
end;
}
-gon_dun03,68,213,0 script #getitem3-7 111,1,2,{
+gon_dun03,68,213,0 script #getitem3-7 HIDDEN_NPC,1,2,{
if (b_sword != 9) end;
set b_sword,10;
mes "You found a ^FF0000piece of blade^000000.";
@@ -2061,7 +2061,7 @@ OnCommandOff:
end;
}
-gon_in,18,27,5 script Madam#gnbs 771,{
+gon_in,18,27,5 script Madam#gnbs 4_F_TWGRANDMOM,{
mes "[Shang Hua Yen]";
mes "Ho, ho, ho~";
mes "Who might this be?";
@@ -2090,7 +2090,7 @@ gon_in,18,27,5 script Madam#gnbs 771,{
close;
}
-gon_dun03,62,222,0 script Strange dead body#gnbs 111,{
+gon_dun03,62,222,0 script Strange dead body#gnbs HIDDEN_NPC,{
if (b_sword < 7) {
mes "Here's a decomposing corpse.";
mes "It seems like monsters devoured it.";
@@ -2140,7 +2140,7 @@ gon_dun03,62,222,0 script Strange dead body#gnbs 111,{
close;
}
-gonryun,139,142,7 script Girl##gnbs1 772,{
+gonryun,139,142,7 script Girl##gnbs1 4_F_TWMASKGIRL,{
if (b_sword < 12) {
mes "[Shi Ying Xiao]";
mes "..........";
@@ -2176,7 +2176,7 @@ gonryun,139,142,7 script Girl##gnbs1 772,{
close;
}
-gonryun,100,241,0 script Stranger#gnbs 733,{
+gonryun,100,241,0 script Stranger#gnbs 4_M_JOB_KNIGHT1,{
if (b_sword < 14) {
mes "[Zuo Hei]";
mes "Hmm...";
@@ -2412,7 +2412,7 @@ gonryun,100,241,0 script Stranger#gnbs 733,{
close;
}
-geffen_in,71,112,2 script Blacksmith#SaYumMoon 731,{
+geffen_in,71,112,2 script Blacksmith#SaYumMoon 4_M_JOB_BLACKSMITH,{
if (b_sword < 17) {
mes "[Aumgarl]";
mes "*Sob*..*sob*....";
@@ -3000,7 +3000,7 @@ geffen_in,71,112,2 script Blacksmith#SaYumMoon 731,{
close;
}
-geffen_in,106,106,7 script Girl#gnbs2 716,{
+geffen_in,106,106,7 script Girl#gnbs2 4_M_KID2,{
if (b_sword < 20) {
mes "[Lyroo]";
mes "Ah...Ah....";
@@ -3114,7 +3114,7 @@ geffen_in,106,106,7 script Girl#gnbs2 716,{
close;
}
-prontera,275,86,2 script Young man#SaYumMoon 97,{
+prontera,275,86,2 script Young man#SaYumMoon 4W_M_01,{
if (b_sword < 20) {
mes "[Neil]";
mes "Oh man, it feels so good";
@@ -3156,7 +3156,7 @@ prontera,275,86,2 script Young man#SaYumMoon 97,{
close;
}
-yuno,208,164,4 script Active little girl#gnbs 101,{
+yuno,208,164,4 script Active little girl#gnbs 4W_F_01,{
if (b_sword < 21) {
mes "[Hisa]";
mes ".....";
@@ -3198,7 +3198,7 @@ yuno,208,164,4 script Active little girl#gnbs 101,{
close;
}
-yuno_in01,99,101,4 script Doctor#gnbs 744,{
+yuno_in01,99,101,4 script Doctor#gnbs 4_F_ALCHE,{
if (b_sword < 23) {
mes "[??????]";
mes "I don't believe we've met";
@@ -3673,7 +3673,7 @@ yuno_in01,99,101,4 script Doctor#gnbs 744,{
close;
}
-yuno_in01,104,94,0 script go away#gnbs 139,2,1,{
+yuno_in01,104,94,0 script go away#gnbs HIDDEN_WARP_NPC,2,1,{
OnTouch:
if (b_sword < 22) {
mes "[??????]";
@@ -3702,7 +3702,7 @@ OnTouch:
// Lost Knife :: gon_npc
//============================================================
-gonryun,237,226,3 script Han Ran Jiao#gon 776,{
+gonryun,237,226,3 script Han Ran Jiao#gon 4_M_TWMIDMAN,{
if (nakha == 0) {
mes "[Han Ran Jiao]";
mes "Oh no! What will I do?!";
@@ -3797,7 +3797,7 @@ gonryun,237,226,3 script Han Ran Jiao#gon 776,{
}
}
-gon_fild01,245,257,0 script #gonknife 111,3,3,{
+gon_fild01,245,257,0 script #gonknife HIDDEN_NPC,3,3,{
OnTouch:
if (nakha == 1) {
set nakha,2;
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index 79ed93242..99549715a 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -29,7 +29,7 @@
// Medicine Quest :: hg_herv
//============================================================
-hu_in01,387,245,0 script Allen Schuwell 849,2,2,{
+hu_in01,387,245,0 script Allen Schuwell 4_M_DIEMAN,2,2,{
if (BaseLevel > 49) {
if (hg_herb == 0) {
mes "[Allen]";
@@ -413,7 +413,7 @@ OnTouch:
}
-hu_in01,385,247,5 script Postell Schuwell#D 97,{
+hu_in01,385,247,5 script Postell Schuwell#D 4W_M_01,{
mes "[Postell]";
mes "Hey, uh...";
mes "I'm in the middle";
@@ -435,7 +435,7 @@ OnTimer100000:
end;
}
-hu_fild06,34,123,3 script Postell Schuwell 97,{
+hu_fild06,34,123,3 script Postell Schuwell 4W_M_01,{
if (hg_herb == 1) {
mes "[Postell]";
mes "I really like living";
@@ -516,7 +516,7 @@ hu_fild06,34,123,3 script Postell Schuwell 97,{
}
}
-hu_in01,370,255,3 script Upper Drawer#First 139,2,2,{
+hu_in01,370,255,3 script Upper Drawer#First HIDDEN_WARP_NPC,2,2,{
OnTouch:
set .@rand,rand(1,7);
if (hg_herb < 5) {
@@ -676,7 +676,7 @@ OnTouch:
}
}
-hu_in01,370,255,3 script Upper Drawer#Second 139,2,2,{
+hu_in01,370,255,3 script Upper Drawer#Second HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "Upper Drawer#Second";
end;
@@ -724,7 +724,7 @@ OnTimer4500:
// Biological Weapon Quest :: hg_bio
//============================================================
-ein_in01,16,36,3 script Morriphen 86,{
+ein_in01,16,36,3 script Morriphen 4_M_04,{
if (hg_bio == 0) {
if (hg_herb == 13) {
mes "[Morriphen]";
@@ -1253,7 +1253,7 @@ ein_in01,16,36,3 script Morriphen 86,{
}
}
-hu_in01,326,307,3 script Siria 90,{
+hu_in01,326,307,3 script Siria 4_F_01,{
if (hg_bio == 1) {
mes "[Siria]";
mes "Oh, hello there.";
@@ -1440,7 +1440,7 @@ hu_in01,326,307,3 script Siria 90,{
}
}
-lighthalzen,88,79,7 script Dono 85,{
+lighthalzen,88,79,7 script Dono 4_M_03,{
if (hg_bio == 2) {
mes "[Dono]";
mes "What do you want?";
@@ -1733,7 +1733,7 @@ lighthalzen,88,79,7 script Dono 85,{
}
}
-lhz_in03,193,28,3 script Makkie 83,{
+lhz_in03,193,28,3 script Makkie 4_M_01,{
if (hg_bio == 4) {
mes "[Makkie]";
mes "Hello, how may";
@@ -1894,7 +1894,7 @@ lhz_in03,193,28,3 script Makkie 83,{
// Rebellion Quest :: hg_tre
//============================================================
-hugel,70,137,5 script Shede 879,{
+hugel,70,137,5 script Shede 4_F_CAPEGIRL,{
cutin "siide1.bmp",2;
if (hg_tre == 0) {
mes "[Shede]";
@@ -2132,7 +2132,7 @@ hugel,70,137,5 script Shede 879,{
}
}
-hu_in01,256,40,3 script Herico 897,{
+hu_in01,256,40,3 script Herico 4_M_HUGRANFA,{
if (checkweight(7342,1) != 1) {
mes "[Herico]";
mes "Why don't you go take some load off your shoulder first, and come back?";
@@ -2890,7 +2890,7 @@ hu_in01,256,40,3 script Herico 897,{
end;
}
-lhz_in03,39,44,3 script Enquro Carson 97,{
+lhz_in03,39,44,3 script Enquro Carson 4W_M_01,{
if (hg_tre < 45) {
mes "[Enquro Carson]";
mes "Hello, everyone. This is Enquro Carson";
@@ -3064,7 +3064,7 @@ lhz_in03,39,44,3 script Enquro Carson 97,{
}
}
-hu_in01,310,380,5 script Girl#hugel 891,{
+hu_in01,310,380,5 script Girl#hugel 4_F_HUGIRL,{
if (hg_tre < 47) {
mes "[Girl]";
mes "Bah, I am bored.";
@@ -3182,7 +3182,7 @@ hu_in01,310,380,5 script Girl#hugel 891,{
}
}
-hu_in01,317,312,0 script Book 111,{
+hu_in01,317,312,0 script Book HIDDEN_NPC,{
cutin "hg_book.bmp",2;
if (hg_tre > 47) {
mes "- You picked up a very thick book. -";
@@ -3424,7 +3424,7 @@ hu_in01,317,312,0 script Book 111,{
}
}
-einbech,208,124,3 script Bomb Maker 851,{
+einbech,208,124,3 script Bomb Maker 4_M_REPAIR,{
if (hg_tre == 54) {
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "[Boomer]";
@@ -3483,7 +3483,7 @@ einbech,208,124,3 script Bomb Maker 851,{
}
}
-hu_fild06,168,359,3 script Moks Mushrooms#Mush1 111,{
+hu_fild06,168,359,3 script Moks Mushrooms#Mush1 HIDDEN_NPC,{
if (hg_tre > 9 && hg_tre < 15) {
mes "- You found mushrooms that are as big as your palm. -";
next;
@@ -3538,7 +3538,7 @@ OnTimer20000:
end;
}
-hu_fild06,194,341,3 script Moks Mushrooms#Mush2 111,{
+hu_fild06,194,341,3 script Moks Mushrooms#Mush2 HIDDEN_NPC,{
if (hg_tre > 9 && hg_tre < 15) {
mes "- You found mushrooms that are as big as your palm. -";
next;
@@ -3593,7 +3593,7 @@ OnTimer20000:
end;
}
-hu_fild06,198,339,3 script Moks Mushrooms#Mush3 111,{
+hu_fild06,198,339,3 script Moks Mushrooms#Mush3 HIDDEN_NPC,{
if (hg_tre > 9 && hg_tre < 15) {
mes "- You found mushrooms that are as big as your palm. -";
next;
@@ -3648,7 +3648,7 @@ OnTimer20000:
end;
}
-hugel,209,163,3 script Clam#C1 111,{
+hugel,209,163,3 script Clam#C1 HIDDEN_NPC,{
if (hg_tre > 19 && hg_tre < 25) {
mes "- You found very fresh clams whose shells are shining under the sunlight. -";
next;
@@ -3703,7 +3703,7 @@ OnTimer20000:
end;
}
-hugel,203,166,3 script Clam#C2 111,{
+hugel,203,166,3 script Clam#C2 HIDDEN_NPC,{
if (hg_tre > 19 && hg_tre < 25) {
mes "- You found very fresh clams whose shells are shining under the sunlight. -";
next;
@@ -3758,7 +3758,7 @@ OnTimer20000:
end;
}
-hugel,217,158,3 script Clam#C3 111,{
+hugel,217,158,3 script Clam#C3 HIDDEN_NPC,{
if (hg_tre > 19 && hg_tre < 25) {
mes "- You found very fresh clams whose shells are shining under the sunlight. -";
next;
@@ -3813,7 +3813,7 @@ OnTimer20000:
end;
}
-hugel,204,150,3 script Clam#C4 111,{
+hugel,204,150,3 script Clam#C4 HIDDEN_NPC,{
if (hg_tre > 19 && hg_tre < 25) {
mes "- You found very fresh clams whose shells are shining under the sunlight. -";
next;
@@ -4088,7 +4088,7 @@ OnTimer20000:
end;
}
-lhz_in01,214,129,0 script A Pile of Paper 111,{
+lhz_in01,214,129,0 script A Pile of Paper HIDDEN_NPC,{
if (hg_tre == 52) {
mes "- You found a pile of paper that was tied up with a thick ribbon.";
mes "On the very top paper, a period and a title saying 'Report of the **th Research'";
@@ -4104,7 +4104,7 @@ lhz_in01,214,129,0 script A Pile of Paper 111,{
end;
}
-lhz_in01,235,129,0 script HuMSpawner 139,{
+lhz_in01,235,129,0 script HuMSpawner HIDDEN_WARP_NPC,{
OnMonster:
if (rand(0,1))
mapannounce "lhz_in01","Intruder alert! Protect the research documents!",1,0xFF0000;
@@ -4124,7 +4124,7 @@ OnMonsterDead:
end;
}
-lhz_dun02,244,226,0 script Unethical Machine 111,{
+lhz_dun02,244,226,0 script Unethical Machine HIDDEN_NPC,{
if (hg_tre == 54) {
if (countitem(7138)) {
mes "["+strcharinfo(0)+"]";
@@ -4149,7 +4149,7 @@ lhz_dun02,244,226,0 script Unethical Machine 111,{
}
}
-lhz_dun02,244,227,0 script HiddenExplosion 139,5,5,{
+lhz_dun02,244,227,0 script HiddenExplosion HIDDEN_WARP_NPC,5,5,{
OnInit:
disablenpc "HiddenExplosion";
end;
@@ -4161,14 +4161,14 @@ OnTouch:
end;
}
-hu_in01,365,170,3 script Girl#Hu 793,{
+hu_in01,365,170,3 script Girl#Hu 4_F_NFLOSTGIRL,{
mes "[Girl]";
mes "I love sitting in front of a stove because it makes me warm~";
mes "Ah...it is so warm and relaxing...and now I feel sleepy...Zzzzz Zzzz...";
close;
}
-hu_in01,377,106,3 script Pub Granny 892,{
+hu_in01,377,106,3 script Pub Granny 4_F_HUGRANMA,{
mes "[Pub Granny]";
mes "Recently we have many tourists visiting our town.";
mes "They make me pretty busy, but I am so happy to see them enjoying my food. Hohoho!";
@@ -4177,7 +4177,7 @@ hu_in01,377,106,3 script Pub Granny 892,{
// Memory Quest :: hg_memo
//============================================================
-hugel,198,169,0 script #HugelTree 139,2,2,{
+hugel,198,169,0 script #HugelTree HIDDEN_WARP_NPC,2,2,{
if (BaseLevel > 49) {
if (!hg_memory) {
set hg_memory,1;
@@ -4225,7 +4225,7 @@ hugel,198,169,0 script #HugelTree 139,2,2,{
}
}
-hugel,191,172,3 script Manainne 892,1,{
+hugel,191,172,3 script Manainne 4_F_HUGRANMA,1,{
if (hg_memory == 1) {
mes "[Manainne]";
mes "This tree means so much";
@@ -4509,7 +4509,7 @@ hugel,191,172,3 script Manainne 892,1,{
}
}
-niflheim,90,106,3 script A Spirit#HQuest 802,{
+niflheim,90,106,3 script A Spirit#HQuest 4_NFWISP,{
if (hg_memory == 6) {
mes "[Spirit]";
mes "El Schatt...";
@@ -4571,7 +4571,7 @@ niflheim,90,106,3 script A Spirit#HQuest 802,{
}
}
-hugel,100,103,3 script Perfitz 866,{
+hugel,100,103,3 script Perfitz 4_M_LGTGRAND,{
if (hg_memory == 3) {
set hg_memory,4;
mes "[Perfitz]";
@@ -4633,7 +4633,7 @@ hugel,100,103,3 script Perfitz 866,{
}
}
-hugel,196,164,3 script El Schatt 50,{
+hugel,196,164,3 script El Schatt 1_M_04,{
if (hg_memory == 2) {
mes "[El Schatt]";
mes "What? What's that look for?";
@@ -4888,7 +4888,7 @@ hugel,196,164,3 script El Schatt 50,{
// Hide and Seek Quest :: hg_c_child
//============================================================
-hugel,107,67,3 script Torpy 706,{
+hugel,107,67,3 script Torpy 4_M_KID1,{
if (BaseLevel > 49) {
if (!hg_ubu01) {
mes "[Torpy]";
@@ -5068,7 +5068,7 @@ hugel,107,67,3 script Torpy 706,{
}
}
-hu_fild06,190,367,3 script Torpy's Mom 701,{
+hu_fild06,190,367,3 script Torpy's Mom 4_F_GODEMOM,{
if (hg_ubu01 == 0) {
mes "[Torpy's Mom]";
mes "Where did he go this time?!";
@@ -5186,7 +5186,7 @@ hu_fild06,190,367,3 script Torpy's Mom 701,{
}
}
-hugel,100,176,3 script Suspicious Barrel 111,{
+hugel,100,176,3 script Suspicious Barrel HIDDEN_NPC,{
if (hg_ubu01 == 3) {
mes "[Strange Man]";
mes "So... hun...gry...";
@@ -5366,7 +5366,7 @@ hugel,100,176,3 script Suspicious Barrel 111,{
}
}
-hugel,100,174,3 script Strange Man#Hugel 898,{
+hugel,100,174,3 script Strange Man#Hugel 4_M_HUMAN_01,{
if (hg_ubu01 == 5) {
mes "[Strange Man]";
mes "Ahhhh... Thanks for";
@@ -5454,7 +5454,7 @@ OnTimer60000:
// Fish Cake Soup Delivery Quest :: hg_odeng
//============================================================
-hu_in01,15,372,3 script Cellette Lavit 74,{
+hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{
if (!hg_odeng) {
mes "[Cellette]";
mes "Hi there, thanks for";
@@ -5806,7 +5806,7 @@ hu_in01,15,372,3 script Cellette Lavit 74,{
}
}
-hugel,76,134,3 script Neha 101,{
+hugel,76,134,3 script Neha 4W_F_01,{
if (hg_odeng == 1) {
if (countitem(584)) {
mes "[Neha]";
@@ -5903,7 +5903,7 @@ hugel,76,134,3 script Neha 101,{
}
}
-hugel,87,139,3 script Maewan 86,{
+hugel,87,139,3 script Maewan 4_M_04,{
if (hg_odeng == 2) {
if (countitem(584)) {
mes "[Maewan]";
@@ -5982,7 +5982,7 @@ hugel,87,139,3 script Maewan 86,{
}
-hugel,84,125,3 script Layoma 700,{
+hugel,84,125,3 script Layoma 8_F_GIRL,{
if (hg_odeng == 3) {
if (countitem(584)) {
mes "[Layoma]";
@@ -6051,7 +6051,7 @@ hugel,84,125,3 script Layoma 700,{
}
-hugel,102,161,3 script Erjan 100,{
+hugel,102,161,3 script Erjan 4W_SAILOR,{
if (hg_odeng == 4) {
if (countitem(584)) {
mes "[Erjan]";
@@ -6138,7 +6138,7 @@ hugel,102,161,3 script Erjan 100,{
// Juno Remedy Quest :: hg_ma1
//============================================================
-yuno,111,156,3 script Euslan 90,{
+yuno,111,156,3 script Euslan 4_F_01,{
if (BaseLevel < 60) {
mes "[Euslan]";
mes "^333333*Cough Cough*";
@@ -6481,7 +6481,7 @@ yuno,111,156,3 script Euslan 90,{
}
-que_bingo,49,12,0 script #Hg_Quest 139,4,4,{
+que_bingo,49,12,0 script #Hg_Quest HIDDEN_WARP_NPC,4,4,{
OnTouch:
if (hg_ma1 == 6) {
mes "[Arcade Owner]";
@@ -6502,7 +6502,7 @@ OnTouch:
}
}
-que_bingo,53,190,7 script Eukran 778,{
+que_bingo,53,190,7 script Eukran 4_M_TWTEAMAN,{
if (hg_ma1 == 6) {
mes "[Eukran]";
mes "Oh, weren't you just";
@@ -6548,7 +6548,7 @@ que_bingo,53,190,7 script Eukran 778,{
}
-odin_tem01,129,127,0 script HiddenActivator#Hugel 139,3,3,{
+odin_tem01,129,127,0 script HiddenActivator#Hugel HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (hg_ma1 == 8) {
mes "^3355FFYou can hear two";
@@ -6616,7 +6616,7 @@ OnInit:
}
-odin_tem01,130,134,4 script Young Man#Hu_Quest 774,{
+odin_tem01,130,134,4 script Young Man#Hu_Quest 4_M_TWBOY,{
if (hg_ma1 == 8) {
mes "[Young Man]";
mes "Hm? Oh, an adventurer.";
@@ -6854,7 +6854,7 @@ odin_tem01,130,134,4 script Young Man#Hu_Quest 774,{
}
-odin_tem01,111,144,0 script HiddenHugel 139,2,2,{
+odin_tem01,111,144,0 script HiddenHugel HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (hg_ma1 == 9) {
mes "^3355FFYou hear the voice of";
@@ -6891,7 +6891,7 @@ OnTouch:
// Cow Milking Quest :: hg_milkingcow
//============================================================
-hugel,56,104,3 script Kurupe 709,3,3,{
+hugel,56,104,3 script Kurupe 4_M_SEAMAN,3,3,{
if (hg_milk == 1) {
mes "[Kurupe]";
mes "Could Burupu be hiding";
@@ -7223,7 +7223,7 @@ OnTouch:
close;
}
-hu_fild06,217,270,3 script Burupu 896,3,3,{
+hu_fild06,217,270,3 script Burupu 4_M_HUBOY,3,3,{
if (hg_milk == 3) {
mes "[Burupu]";
mes "What? Kurupe wants me";
@@ -7368,7 +7368,7 @@ OnTouch:
}
}
-hugel,72,101,0 script Burupu's Instructions 111,{
+hugel,72,101,0 script Burupu's Instructions HIDDEN_NPC,{
if (hg_milk < 6) {
mes "^3355FFYou've found a small^000000";
mes "^3355FFnotebook on the ground.^000000";
@@ -7503,7 +7503,7 @@ hugel,72,101,0 script Burupu's Instructions 111,{
end;
}
-hugel,68,99,3 script Booboo the Cow 889,{
+hugel,68,99,3 script Booboo the Cow 4_BULL,{
if (hg_milk == 7 || hg_milk == 12) {
mes "[Booboo]";
mes "Boop boop boo~";
@@ -7675,7 +7675,7 @@ L_MilkCow:
// Odin Temple Excavation Quest :: hg_tem
//============================================================
-hugel,91,152,1 script Sign 837,{
+hugel,91,152,1 script Sign 2_BULLETIN_BOARD,{
mes "**Recruitment Notice**";
mes " ";
if (hg_odin < 60) {
@@ -7694,7 +7694,7 @@ hugel,91,152,1 script Sign 837,{
close;
}
-hu_in01,19,161,0 script Alex 803,{
+hu_in01,19,161,0 script Alex 1_F_SIGNZISK,{
if (!hg_odin) {
mes "[Alex]";
mes "Whatever you're";
@@ -8092,7 +8092,7 @@ hu_in01,19,161,0 script Alex 803,{
}
}
-hu_in01,14,11,4 script Laura 70,{
+hu_in01,14,11,4 script Laura 1_F_GYPSY,{
if (!hg_odin) {
cutin "hu_laura02.bmp",2;
mes "[Laura]";
@@ -8870,7 +8870,7 @@ hu_in01,14,11,4 script Laura 70,{
}
}
-hu_in01,18,167,4 script Julian 86,{
+hu_in01,18,167,4 script Julian 4_M_04,{
if (!hg_odin) {
mes "[Julian]";
mes "^333333*Sigh...*^000000";
@@ -8949,7 +8949,7 @@ hu_in01,18,167,4 script Julian 86,{
}
}
-hu_in01,16,21,0 script Ashe#5 139,2,2,{
+hu_in01,16,21,0 script Ashe#5 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (hg_odin == 18) {
mes "[Ashe]";
@@ -8963,7 +8963,7 @@ OnTouch:
}
}
-hu_in01,16,20,4 script Ashe 95,{
+hu_in01,16,20,4 script Ashe 4_F_SISTER,{
switch(hg_odin) {
case 0:
mes "[Ashe]";
@@ -9112,7 +9112,7 @@ hu_in01,16,20,4 script Ashe 95,{
}
}
-hu_in01,174,90,0 script Entrance 139,2,2,{
+hu_in01,174,90,0 script Entrance HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (hg_odin == 22 || hg_odin == 23) {
mes "[Laura]";
@@ -9123,7 +9123,7 @@ OnTouch:
}
}
-hu_in01,159,84,3 script Laura#2 70,{
+hu_in01,159,84,3 script Laura#2 1_F_GYPSY,{
if (hg_odin == 22 || hg_odin == 23) {
cutin "hu_laura03.bmp",2;
emotion e_an,0,"Laura#2";
@@ -9291,9 +9291,9 @@ hu_in01,159,84,3 script Laura#2 70,{
}
}
-hu_in01,158,84,5 duplicate(Laura#2) Alex#2 803,0,0
+hu_in01,158,84,5 duplicate(Laura#2) Alex#2 1_F_SIGNZISK,0,0
-hu_in01,162,85,4 script Ashe#2 95,{
+hu_in01,162,85,4 script Ashe#2 4_F_SISTER,{
if (hg_odin == 22 || hg_odin == 23) {
mes "[Ashe]";
mes "This...";
@@ -9339,7 +9339,7 @@ hu_in01,162,85,4 script Ashe#2 95,{
}
}
-hu_in01,171,90,0 script Ashe#3 139,2,2,{
+hu_in01,171,90,0 script Ashe#3 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (hg_odin == 25) {
mes "^3355FFAshe picked up";
@@ -9371,7 +9371,7 @@ OnTouch:
}
}
-hu_in01,155,82,4 script Julian#2 86,{
+hu_in01,155,82,4 script Julian#2 4_M_04,{
if (hg_odin == 22 || hg_odin == 23) {
mes "[Julian]";
mes "I...";
@@ -9388,11 +9388,11 @@ hu_in01,155,82,4 script Julian#2 86,{
close;
}
-moc_fild12,160,372,0 script Hit 139,{
+moc_fild12,160,372,0 script Hit HIDDEN_WARP_NPC,{
end;
}
-moc_fild12,160,365,0 script Ashe#4 139,4,4,{
+moc_fild12,160,365,0 script Ashe#4 HIDDEN_WARP_NPC,4,4,{
OnTouch:
if (hg_odin == 59) {
mes "[???]";
@@ -9490,7 +9490,7 @@ OnTouch:
}
}
-hugel,209,109,2 script Boatman#hugel 709,{
+hugel,209,109,2 script Boatman#hugel 4_M_SEAMAN,{
mes "[Boatman]";
mes "Ah, hello~";
mes "Would you like to sail";
@@ -9535,7 +9535,7 @@ hugel,209,109,2 script Boatman#hugel 709,{
}
}
-odin_tem01,93,146,4 script Boatman 709,{
+odin_tem01,93,146,4 script Boatman 4_M_SEAMAN,{
mes "[Boatman]";
mes "Ah, would you";
mes "like to sail back to";
@@ -9589,7 +9589,7 @@ OnTimer100000:
}
}
-odin_tem03,266,302,0 script warpinside#1 139,3,3,{
+odin_tem03,266,302,0 script warpinside#1 HIDDEN_WARP_NPC,3,3,{
OnInit:
disablenpc "warpinside#1";
end;
@@ -9621,7 +9621,7 @@ OnTouch:
}
}
-odin_tem03,288,271,0 script warpinside#2 139,3,3,{
+odin_tem03,288,271,0 script warpinside#2 HIDDEN_WARP_NPC,3,3,{
OnInit:
disablenpc "warpinside#2";
end;
@@ -9653,7 +9653,7 @@ OnTouch:
}
}
-odin_tem03,283,241,0 script warpinside#3 139,3,3,{
+odin_tem03,283,241,0 script warpinside#3 HIDDEN_WARP_NPC,3,3,{
OnInit:
disablenpc "warpinside#3";
end;
@@ -9685,7 +9685,7 @@ OnTouch:
}
}
-odin_tem03,179,275,0 script warpinside#4 139,3,3,{
+odin_tem03,179,275,0 script warpinside#4 HIDDEN_WARP_NPC,3,3,{
OnInit:
disablenpc "warpinside#4";
end;
@@ -9717,7 +9717,7 @@ OnTouch:
}
}
-odin_tem03,320,264,0 script warpinside#5 139,3,3,{
+odin_tem03,320,264,0 script warpinside#5 HIDDEN_WARP_NPC,3,3,{
OnInit:
disablenpc "warpinside#5";
end;
@@ -9749,7 +9749,7 @@ OnTouch:
}
}
-hu_in01,99,90,0 script Empty 139,3,3,{
+hu_in01,99,90,0 script Empty HIDDEN_WARP_NPC,3,3,{
OnTouch:
mes "^3355FFThis place is empty.";
mes "Everyone must";
@@ -9757,7 +9757,7 @@ OnTouch:
close;
}
-que_hugel,35,29,5 script object#1 139,2,2,{
+que_hugel,35,29,5 script object#1 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (hg_odin == 21) {
mes "^3355FFA weathered structure";
@@ -9821,7 +9821,7 @@ OnTouch:
}
}
-que_hugel,163,31,0 script object#2 139,3,3,{
+que_hugel,163,31,0 script object#2 HIDDEN_WARP_NPC,3,3,{
OnTouch:
mes "^3355FFWhen you come back";
mes "to your senses, you";
@@ -9830,7 +9830,7 @@ OnTouch:
close;
}
-que_hugel,163,178,0 script object#3 139,3,3,{
+que_hugel,163,178,0 script object#3 HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (hg_odin == 22) {
mes "["+strcharinfo(0)+"]";
@@ -9846,7 +9846,7 @@ OnTouch:
}
}
-hu_in01,15,108,0 script alex#warp 45,1,1,{
+hu_in01,15,108,0 script alex#warp WARPNPC,1,1,{
OnTouch:
if (hg_odin == 17) {
mes "[Alex]";
@@ -9936,7 +9936,7 @@ OnTouch:
}
}
-hugel,52,90,0 script alex#warp2 45,1,1,{
+hugel,52,90,0 script alex#warp2 WARPNPC,1,1,{
OnTouch:
if (hg_odin > 59) warp "hu_in01",102,90;
else if (hg_odin > 21 && hg_odin < 60) warp "hu_in01",173,90;
@@ -9944,13 +9944,13 @@ OnTouch:
end;
}
-hu_in01,155,70,0 script alex#warp3 45,1,1,{
+hu_in01,155,70,0 script alex#warp3 WARPNPC,1,1,{
OnTouch:
mes "^3355FFThe door is locked.^000000";
close;
}
-hu_in01,155,108,0 script alex#warp4 45,1,1,{
+hu_in01,155,108,0 script alex#warp4 WARPNPC,1,1,{
OnTouch:
mes "^3355FFThe door is locked.^000000";
close;
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index 7e894b47c..b46c8a82c 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -24,7 +24,7 @@
//= 1.9 Added GM management NPC. [Euphy]
//============================================================
-yuno_in04,190,125,4 script Scholar 700,{
+yuno_in04,190,125,4 script Scholar 8_F_GIRL,{
switch(yuno_hist) {
case 0:
mes "[Scholar]";
@@ -922,7 +922,7 @@ function script Func_JupHist {
}
}
-yuno_in04,186,125,4 script Bundle of Files 111,{
+yuno_in04,186,125,4 script Bundle of Files HIDDEN_NPC,{
mes "^8B6914*Thesis: The Fall of Juperos*";
mes "By Fayruz Khrhiyha";
mes "Sage Castle Researcher^000000";
@@ -1190,7 +1190,7 @@ yuno_in04,186,125,4 script Bundle of Files 111,{
}
}
-yuno_in04,188,118,4 script Book#juperos 111,{
+yuno_in04,188,118,4 script Book#juperos HIDDEN_NPC,{
if (yuno_hist > 7) {
mes "^8B6914*Self-Honesty*";
mes "*'Benefits Fo' Life!'*";
@@ -1250,7 +1250,7 @@ yuno_in04,188,118,4 script Book#juperos 111,{
// Bronze Statue - juperos_01 99 112
-juperos_01,99,112,4 script Bronze Statue#1 844,{
+juperos_01,99,112,4 script Bronze Statue#1 CLEAR_NPC,{
if (yuno_hist > 3) {
mes "^3355FF''Do you wish to see";
mes "the end of the madness?";
@@ -1311,7 +1311,7 @@ juperos_01,99,112,4 script Bronze Statue#1 844,{
}
}
-yuno_in04,169,109,1 script Ambitious Hollgrehenn 111,{
+yuno_in04,169,109,1 script Ambitious Hollgrehenn HIDDEN_NPC,{
mes "*Hollgrehenn: The Ambition*";
mes "By Aragham Caul*";
mes " ";
@@ -1336,7 +1336,7 @@ yuno_in04,169,109,1 script Ambitious Hollgrehenn 111,{
close;
}
-yuno_in04,174,111,1 script Penniless Hollgrehenn 111,{
+yuno_in04,174,111,1 script Penniless Hollgrehenn HIDDEN_NPC,{
mes "^8B6914*Penniless Hollgrehenn*";
mes " * Pennyless Hollgrehenn * ";
mes "By Hollgrehenn";
@@ -1355,7 +1355,7 @@ yuno_in04,174,111,1 script Penniless Hollgrehenn 111,{
close;
}
-yuno_in04,102,106,1 script Popular Feasts 111,{
+yuno_in04,102,106,1 script Popular Feasts HIDDEN_NPC,{
mes "^8B6914*Popular Feasts*";
mes "By Cabbage Pickle Community";
mes " ";
@@ -1400,14 +1400,14 @@ yuno_in04,102,106,1 script Popular Feasts 111,{
}
}
-yuno_in04,111,108,1 script Hamerun, Rat Hunter 111,{
+yuno_in04,111,108,1 script Hamerun, Rat Hunter HIDDEN_NPC,{
mes "["+strcharinfo(0)+"]";
mes "I can't...";
mes "reach it...!";
close;
}
-yuno_in04,167,127,1 script Red Book 111,{
+yuno_in04,167,127,1 script Red Book HIDDEN_NPC,{
mes "^3355FFYou find a book";
mes "with red binding.^000000";
next;
@@ -1464,7 +1464,7 @@ yuno_in04,167,127,1 script Red Book 111,{
}
}
-yuno_in04,121,109,1 script Scroll 111,{
+yuno_in04,121,109,1 script Scroll HIDDEN_NPC,{
mes "^3355FFYou've found an";
mes "antiquated scroll";
mes "that's collected a";
@@ -1517,7 +1517,7 @@ yuno_in04,121,109,1 script Scroll 111,{
}
}
-yuno_in04,118,116,4 script Paper 111,{
+yuno_in04,118,116,4 script Paper HIDDEN_NPC,{
mes "^3355FFIt's a piece of";
mes "paper that looks";
mes "like a personal letter.^000000";
@@ -1570,7 +1570,7 @@ yuno_in04,118,116,4 script Paper 111,{
}
}
-juperos_01,123,92,4 script Stone Statue 844,{
+juperos_01,123,92,4 script Stone Statue CLEAR_NPC,{
if (yuno_hist) {
mes "^3355FFIt's a stone statue";
mes "that looks exactly like";
@@ -1590,7 +1590,7 @@ juperos_01,123,92,4 script Stone Statue 844,{
close;
}
-juperos_01,99,71,4 script Bronze Statue#2 844,{
+juperos_01,99,71,4 script Bronze Statue#2 CLEAR_NPC,{
mes "^3355FFIt's an elaborate";
mes "bronze statue that";
mes "is twice the height of";
@@ -1598,13 +1598,13 @@ juperos_01,99,71,4 script Bronze Statue#2 844,{
close;
}
-juperos_01,79,92,4 script Sculpture 844,{
+juperos_01,79,92,4 script Sculpture CLEAR_NPC,{
mes "^3355FFIt's a sculpture that";
mes "looks familiar to you.^000000";
close;
}
-juperos_01,215,127,4 script Machine Statue 844,{
+juperos_01,215,127,4 script Machine Statue CLEAR_NPC,{
mes "^3355FFThis is the bust of a";
mes "humanoid machine with";
mes "a familiar Crest Piece";
@@ -1730,7 +1730,7 @@ OnMyMobDead:
}
-juperos_02,130,149,0 script Restricted Area#jupe 139,2,2,{
+juperos_02,130,149,0 script Restricted Area#jupe HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "Restricted Area#jupe";
end;
@@ -1815,7 +1815,7 @@ OnTouch:
//============================================================
// Security Checkpoint 1-1
//============================================================
-jupe_area1,88,224,0 script #hole#1-1 844,{
+jupe_area1,88,224,0 script #hole#1-1 CLEAR_NPC,{
cutin "1",2;
if ($@JupreArea1InUse == 1) {
mes "^3355FFThis seems like";
@@ -1923,7 +1923,7 @@ OnTimer22500:
end;
}
-jupe_area1,83,221,0 script Warp#1-1 139,2,2,{
+jupe_area1,83,221,0 script Warp#1-1 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "Warp#1-1";
end;
@@ -2107,7 +2107,7 @@ OnMyMobDead:
//============================================================
// Security Checkpoint 1-2
//============================================================
-jupe_area1,25,238,0 script #hole#1-2 844,{
+jupe_area1,25,238,0 script #hole#1-2 CLEAR_NPC,{
cutin "2",2;
if ($@JupreArea1InUse == 1) {
mes "^3355FFThis seems like";
@@ -2217,7 +2217,7 @@ OnTimer22500:
end;
}
-jupe_area1,21,225,0 script Warp#1-2 139,2,2,{
+jupe_area1,21,225,0 script Warp#1-2 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "Warp#1-2";
end;
@@ -2396,7 +2396,7 @@ OnMyMobDead:
//============================================================
// Security Checkpoint 1-3
//============================================================
-jupe_area1,36,146,0 script #hole#1-3 844,{
+jupe_area1,36,146,0 script #hole#1-3 CLEAR_NPC,{
cutin "3",2;
if ($@JupreArea1InUse == 1) {
mes "^3355FFThis seems like";
@@ -2504,7 +2504,7 @@ OnTimer22500:
end;
}
-jupe_area1,33,137,0 script Warp#1-3 139,2,2,{
+jupe_area1,33,137,0 script Warp#1-3 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "Warp#1-3";
end;
@@ -2684,7 +2684,7 @@ OnMyMobDead:
//============================================================
// Security Checkpoint 1-4
//============================================================
-jupe_area1,50,49,0 script #hole#1-4 844,{
+jupe_area1,50,49,0 script #hole#1-4 CLEAR_NPC,{
cutin "4",2;
if ($@JupreArea1InUse == 1) {
mes "^3355FFThis seems like";
@@ -2793,7 +2793,7 @@ OnTimer5000:
end;
}
-jupe_area1,57,53,0 script Warp#1-4 139,2,2,{
+jupe_area1,57,53,0 script Warp#1-4 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "Warp#1-4";
end;
@@ -2972,7 +2972,7 @@ OnMyMobDead:
//============================================================
// Move to Elevator
//============================================================
-jupe_area1,112,162,0 script Lever#ufe 844,{
+jupe_area1,112,162,0 script Lever#ufe CLEAR_NPC,{
mes "^3355FFIt's a lever";
mes "whose function";
mes "is not known to you.^000000";
@@ -2999,7 +2999,7 @@ OnTimer3000:
end;
}
-jupe_area1,117,157,0 script LeverWarp#ufe 139,2,2,{
+jupe_area1,117,157,0 script LeverWarp#ufe HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "LeverWarp#ufe";
end;
@@ -3024,7 +3024,7 @@ OnTimer3000:
//============================================================
// Security Checkpoint 2-1
//============================================================
-jupe_area2,74,224,0 script #hole#2-1 844,{
+jupe_area2,74,224,0 script #hole#2-1 CLEAR_NPC,{
cutin "1",2;
if ($@JupreArea2InUse == 1) {
mes "^3355FFThis seems like";
@@ -3132,7 +3132,7 @@ OnTimer22500:
end;
}
-jupe_area2,80,221,0 script Warp#2-1 139,2,2,{
+jupe_area2,80,221,0 script Warp#2-1 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "Warp#2-1";
end;
@@ -3316,7 +3316,7 @@ OnMyMobDead:
//============================================================
// Security Checkpoint 2-2
//============================================================
-jupe_area2,138,238,0 script #hole#2-2 844,{
+jupe_area2,138,238,0 script #hole#2-2 CLEAR_NPC,{
cutin "2",2;
if ($@JupreArea2InUse == 1) {
mes "^3355FFThis seems like";
@@ -3426,7 +3426,7 @@ OnTimer22500:
end;
}
-jupe_area2,142,225,0 script Warp#2-2 139,2,2,{
+jupe_area2,142,225,0 script Warp#2-2 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "Warp#2-2";
end;
@@ -3605,7 +3605,7 @@ OnMyMobDead:
//============================================================
// Security Checkpoint 2-3
//============================================================
-jupe_area2,127,146,0 script #hole#2-3 844,{
+jupe_area2,127,146,0 script #hole#2-3 CLEAR_NPC,{
cutin "3",2;
if ($@JupreArea2InUse == 1) {
mes "^3355FFThis seems like";
@@ -3713,7 +3713,7 @@ OnTimer22500:
end;
}
-jupe_area2,130,137,0 script Warp#2-3 139,2,2,{
+jupe_area2,130,137,0 script Warp#2-3 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "Warp#2-3";
end;
@@ -3895,7 +3895,7 @@ OnMyMobDead:
//============================================================
// Security Checkpoint 2-4
//============================================================
-jupe_area2,113,49,0 script #hole#2-4 844,{
+jupe_area2,113,49,0 script #hole#2-4 CLEAR_NPC,{
cutin "4",2;
if ($@JupreArea2InUse == 1) {
mes "^3355FFThis seems like";
@@ -4004,7 +4004,7 @@ OnTimer5000:
end;
}
-jupe_area2,106,53,0 script Warp#2-4 139,2,2,{
+jupe_area2,106,53,0 script Warp#2-4 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "Warp#2-4";
end;
@@ -4185,7 +4185,7 @@ OnMyMobDead:
//============================================================
// Move to Elevator
//============================================================
-jupe_area2,51,162,0 script Lever#ufe2 844,{
+jupe_area2,51,162,0 script Lever#ufe2 CLEAR_NPC,{
mes "^3355FFIt's a lever";
mes "whose function";
mes "is not known to you.^000000";
@@ -4212,7 +4212,7 @@ OnTimer3000:
end;
}
-jupe_area2,46,157,0 script LeverWarp#ufe2 139,2,2,{
+jupe_area2,46,157,0 script LeverWarp#ufe2 HIDDEN_WARP_NPC,2,2,{
OnInit:
disablenpc "LeverWarp#ufe2";
end;
@@ -4237,7 +4237,7 @@ OnTimer3000:
//============================================================
// Elevator Reception Room
//============================================================
-jupe_ele_r,51,98,0 script Switch#ufe 844,{
+jupe_ele_r,51,98,0 script Switch#ufe CLEAR_NPC,{
if ($@JupeElevatorInUse == 1) {
mes "^3355FFIt's some sort of";
mes "lever that looks like";
@@ -4388,7 +4388,7 @@ OnTimer27000:
end;
}
-jupe_ele_r,51,98,0 script Switch On#ufe 844,{
+jupe_ele_r,51,98,0 script Switch On#ufe CLEAR_NPC,{
mes "^3355FFIt seems like";
mes "someone else is";
mes "using this machine...^000000";
@@ -4560,7 +4560,7 @@ OnTimer10000:
//============================================================
// Elevator NPCs
//============================================================
-jupe_ele,14,6,1 script TimeOut#ufe 844,{
+jupe_ele,14,6,1 script TimeOut#ufe CLEAR_NPC,{
OnEnable:
initnpctimer;
end;
@@ -4634,7 +4634,7 @@ OnTimer142000:
end;
}
-jupe_ele,15,6,1 script Guard-1#ufe 844,{
+jupe_ele,15,6,1 script Guard-1#ufe CLEAR_NPC,{
OnEnable:
initnpctimer;
end;
@@ -4689,7 +4689,7 @@ OnMyMobDead:
end;
}
-jupe_ele,16,6,1 script Guard-2#ufe 844,{
+jupe_ele,16,6,1 script Guard-2#ufe CLEAR_NPC,{
OnEnable:
initnpctimer;
end;
@@ -4748,7 +4748,7 @@ OnMyMobDead:
end;
}
-jupe_ele,17,6,1 script Guard-3#ufe 844,{
+jupe_ele,17,6,1 script Guard-3#ufe CLEAR_NPC,{
OnEnable:
initnpctimer;
end;
@@ -4804,7 +4804,7 @@ OnMyMobDead:
end;
}
-jupe_ele,18,6,1 script Guard-4#ufe 844,{
+jupe_ele,18,6,1 script Guard-4#ufe CLEAR_NPC,{
OnEnable:
initnpctimer;
end;
@@ -4845,7 +4845,7 @@ OnMyMobDead:
end;
}
-jupe_ele,19,6,1 script GuardEnd#ufe 844,{
+jupe_ele,19,6,1 script GuardEnd#ufe CLEAR_NPC,{
OnInit:
disablenpc "GuardEnd#ufe";
end;
@@ -4966,7 +4966,7 @@ OnTimer2000:
end;
}
-juperos_02,33,59,0 script jupe_goto2F 45,2,2,{
+juperos_02,33,59,0 script jupe_goto2F WARPNPC,2,2,{
OnTouch:
switch(rand(1,4)) {
case 1: warp "juperos_01",120,72; end;
@@ -4980,7 +4980,7 @@ OnTouch:
//============================================================
// GM Management NPC
//============================================================
-sec_in02,39,167,0 script Juperos Manager 864,{
+sec_in02,39,167,0 script Juperos Manager 4_F_OPERATION,{
callfunc "F_GM_NPC";
mes "[Juperos Manager]";
mes "I'm the NPC in";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 7cc121cab..d14f5d54e 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -52,7 +52,7 @@ OnMyMobDead:
end;
}
-lighthalzen,267,200,3 script Guard#lhz01 868,{
+lighthalzen,267,200,3 script Guard#lhz01 4_M_LGTGUARD,{
if (countitem(7350) > 0) {
mes "[Guard]";
mes "Hold it right th--!";
@@ -119,7 +119,7 @@ lighthalzen,267,200,3 script Guard#lhz01 868,{
}
}
-lighthalzen,294,223,7 script Guard#lhz02 868,{
+lighthalzen,294,223,7 script Guard#lhz02 4_M_LGTGUARD,{
if (countitem(7350) > 0) {
mes "[Guard]";
mes "Hold it right th--!";
@@ -188,7 +188,7 @@ lighthalzen,294,223,7 script Guard#lhz02 868,{
// Cube Room Quest
//============================================================
-lighthalzen,341,224,3 script Fishbone 868,{
+lighthalzen,341,224,3 script Fishbone 4_M_LGTGUARD,{
// Retain prior position in quest.
if (piciburn) {
set lhz_sincube,piciburn;
@@ -653,7 +653,7 @@ lighthalzen,341,224,3 script Fishbone 868,{
}
}
-lhz_cube,237,198,0 script Bundle of Files#cube 111,{
+lhz_cube,237,198,0 script Bundle of Files#cube HIDDEN_NPC,{
if (lhz_sincube < 7) {
mes "^3355FFThere are a bunch";
mes "of files scattered";
@@ -695,7 +695,7 @@ lhz_cube,237,198,0 script Bundle of Files#cube 111,{
close;
}
-lhz_cube,234,202,0 script Picture#cube 111,{
+lhz_cube,234,202,0 script Picture#cube HIDDEN_NPC,{
if (lhz_secret01 < 2) {
mes "^3355FFThis picture hanging";
mes "on the wall catches";
@@ -791,7 +791,7 @@ lhz_cube,234,202,0 script Picture#cube 111,{
close;
}
-lhz_cube,242,201,0 script Drawer#cube 111,{
+lhz_cube,242,201,0 script Drawer#cube HIDDEN_NPC,{
if (lhz_secret01 < 1) {
mes "^3355FFThe drawer here";
mes "looks interesting,";
@@ -831,7 +831,7 @@ lhz_cube,242,201,0 script Drawer#cube 111,{
close;
}
-lhz_cube,248,179,0 script Chest#cube 111,{
+lhz_cube,248,179,0 script Chest#cube HIDDEN_NPC,{
if (lhz_sincube < 7) {
mes "^3355FFYou've found a chest";
mes "with an axe laid on";
@@ -862,7 +862,7 @@ lhz_cube,248,179,0 script Chest#cube 111,{
close;
}
-lhz_cube,237,183,0 script Barrel#cube 111,{
+lhz_cube,237,183,0 script Barrel#cube HIDDEN_NPC,{
set number_line,0;
if (lhz_sincube < 8) {
mes "^3355FFYou have";
@@ -959,7 +959,7 @@ lhz_cube,237,183,0 script Barrel#cube 111,{
close;
}
-lhz_cube,224,192,0 script Power Generator#cube 111,{
+lhz_cube,224,192,0 script Power Generator#cube HIDDEN_NPC,{
if (lhz_secret01 < 6) {
mes "^3355FFThis is a noisily";
mes "operating huge machine";
@@ -1008,7 +1008,7 @@ lhz_cube,224,192,0 script Power Generator#cube 111,{
close;
}
-lhz_cube,244,201,0 script Status Light#cube 111,{
+lhz_cube,244,201,0 script Status Light#cube HIDDEN_NPC,{
if (lhz_secret01 < 7) {
mes "^3355FFThe Status Light is";
mes "on. It looks like there's";
@@ -1043,7 +1043,7 @@ lhz_cube,244,201,0 script Status Light#cube 111,{
close;
}
-lhz_cube,234,200,0 script Desk#cube 111,{
+lhz_cube,234,200,0 script Desk#cube HIDDEN_NPC,{
if (lhz_secret02 <= 1) {
mes "^3355FFYou've found";
mes "a completely";
@@ -1180,7 +1180,7 @@ lhz_cube,234,200,0 script Desk#cube 111,{
}
}
-lhz_cube,247,198,0 script Bed#cube 111,{
+lhz_cube,247,198,0 script Bed#cube HIDDEN_NPC,{
if (lhz_secret02 == 0) {
mes "^3355FFYou've found a bed";
mes "in which the sheets";
@@ -1328,7 +1328,7 @@ lhz_cube,247,198,0 script Bed#cube 111,{
close;
}
-lhz_cube,229,184,0 script Goblet#cube 111,{
+lhz_cube,229,184,0 script Goblet#cube HIDDEN_NPC,{
if (lhz_sincube < 10) {
if (lhz_secret03 == 0) {
mes "^3355FFYou see an empty";
@@ -1357,7 +1357,7 @@ lhz_cube,229,184,0 script Goblet#cube 111,{
close;
}
-lhz_cube,231,202,0 script Chemicals#cube 111,{
+lhz_cube,231,202,0 script Chemicals#cube HIDDEN_NPC,{
if (lhz_secret03 < 1) {
mes "^3355FFThere is a bottle";
mes "containing slightly";
@@ -1405,7 +1405,7 @@ lhz_cube,231,202,0 script Chemicals#cube 111,{
close;
}
-lhz_cube,249,191,0 script Cabinet#cube 111,{
+lhz_cube,249,191,0 script Cabinet#cube HIDDEN_NPC,{
if (lhz_secret03 < 2) {
mes "^3355FFYou've found a";
mes "cabinet that contains";
@@ -1457,7 +1457,7 @@ lhz_cube,249,191,0 script Cabinet#cube 111,{
close;
}
-lhz_cube,224,197,0 script Experiment Tube#cube 111,{
+lhz_cube,224,197,0 script Experiment Tube#cube HIDDEN_NPC,{
if (lhz_secret01 < 8) {
mes "^3355FFYou find a strange";
mes "tube that seems to";
@@ -1556,7 +1556,7 @@ lhz_cube,224,197,0 script Experiment Tube#cube 111,{
}
}
-lhz_cube,248,193,0 script Box#cube1 111,{
+lhz_cube,248,193,0 script Box#cube1 HIDDEN_NPC,{
if ((lhz_secret01 < 9) && (lhz_secret02 < 4) && (lhz_secret03 < 3)) {
mes "^3355FFYou find a box with";
mes "three distinctively";
@@ -1685,7 +1685,7 @@ lhz_cube,248,193,0 script Box#cube1 111,{
close;
}
-lhz_cube,250,184,0 script Door#cube 111,{
+lhz_cube,250,184,0 script Door#cube HIDDEN_NPC,{
mes "^3355FFYou've come upon a";
mes "door that leads outside.^000000";
next;
@@ -1696,7 +1696,7 @@ lhz_cube,250,184,0 script Door#cube 111,{
close;
}
-lhz_dun02,224,6,0 script Exit1#lt 45,1,1,{
+lhz_dun02,224,6,0 script Exit1#lt WARPNPC,1,1,{
OnTouch:
if (MISC_QUEST&512) {
warp "lhz_cube",231,90;
@@ -1711,7 +1711,7 @@ OnTouch:
// Lighthalzen Pickpocket Mini-Quest
//============================================================
-lighthalzen,240,216,4 script Suspicious Guy#lhz_01 870,2,2,{
+lighthalzen,240,216,4 script Suspicious Guy#lhz_01 4_M_LGTPOOR,2,2,{
end;
OnTouch:
@@ -1780,7 +1780,7 @@ OnTouch:
}
}
-lighthalzen,220,169,3 script Suspicious Guy#lhz_02 870,2,2,{
+lighthalzen,220,169,3 script Suspicious Guy#lhz_02 4_M_LGTPOOR,2,2,{
end;
OnInit:
@@ -1852,7 +1852,7 @@ OnTouch:
}
}
-lighthalzen,164,127,4 script Suspicious Guy#lhz_03 870,2,2,{
+lighthalzen,164,127,4 script Suspicious Guy#lhz_03 4_M_LGTPOOR,2,2,{
end;
OnInit:
@@ -2036,7 +2036,7 @@ OnTouch:
// Friendship Quest
//============================================================
-lhz_in02,201,210,5 script Digotz 869,{
+lhz_in02,201,210,5 script Digotz 4_M_LGTMAN,{
if (BaseLevel < 50) {
mes "[Digotz]";
mes "Oh, an adventurer?";
@@ -2515,7 +2515,7 @@ lhz_in02,201,210,5 script Digotz 869,{
close;
}
-lighthalzen,337,232,3 script Maku 870,{
+lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{
if (friendship > 14) {
cutin "lhz_macu07",2;
mes "[Maku]";
@@ -3083,7 +3083,7 @@ lighthalzen,337,232,3 script Maku 870,{
}
-yuno_in04,107,14,5 script Student 754,{
+yuno_in04,107,14,5 script Student 4_M_SAGE_A,{
if (friendship == 7 || friendship == 8) {
mes "[Joey Choryee]";
mes "This is a study area where";
@@ -3112,7 +3112,7 @@ yuno_in04,107,14,5 script Student 754,{
close;
}
-yuno_in04,96,106,5 script Passionate Student 754,{
+yuno_in04,96,106,5 script Passionate Student 4_M_SAGE_A,{
if ((MaxWeight-Weight) < 300 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -3333,7 +3333,7 @@ yuno_in04,96,106,5 script Passionate Student 754,{
close;
}
-yuno_in04,168,117,3 script Book#lhz 111,{
+yuno_in04,168,117,3 script Book#lhz HIDDEN_NPC,{
if (friendship == 11) {
mes "^3355FFThere's nothing";
mes "over here that you";
@@ -3870,7 +3870,7 @@ OnTouch_:
end;
}
-lhz_que01,21,31,5 script #li_Varmunt 755,{
+lhz_que01,21,31,5 script #li_Varmunt 4_M_SAGE_C,{
if (countitem(7345) > 0) {
if (lhz_curse == 12) {
mes "[??]";
@@ -4006,7 +4006,7 @@ lhz_que01,21,31,5 script #li_Varmunt 755,{
end;
}
-lhz_que01,29,24,3 script #li_researcher 754,{
+lhz_que01,29,24,3 script #li_researcher 4_M_SAGE_A,{
if (countitem(7345) > 0) {
if (lhz_curse == 12) {
mes "Doctor Varmunt,";
@@ -4173,7 +4173,7 @@ OnTouch_:
end;
}
-lhz_que01,99,74,5 script #li_Man 48,{
+lhz_que01,99,74,5 script #li_Man 1_M_02,{
if (lhz_curse == 16) {
mes "[???]";
mes "It's over.";
@@ -4324,7 +4324,7 @@ OnTouch_:
close;
}
-lighthalzen,346,263,3 script Elder#lhz 846,{
+lighthalzen,346,263,3 script Elder#lhz 4_F_EINOLD,{
if (countitem(7345) > 0) {
if ((lhz_curse == 1) && (lhz_spi01 == 1) && (lhz_spi02 == 1) && (lhz_spi03 == 1) && (lhz_spi04 == 1)) {
mes "[Elder]";
@@ -4792,7 +4792,7 @@ lighthalzen,346,263,3 script Elder#lhz 846,{
}
}
-lhz_in03,32,162,3 script Crippled Girl#li_tre 53,{
+lhz_in03,32,162,3 script Crippled Girl#li_tre 1_M_INNKEEPER,{
if (lhz_curse == 23) {
if (countitem(7341) > 0) {
mes "["+strcharinfo(0)+"]";
@@ -5157,7 +5157,7 @@ lhz_in03,32,162,3 script Crippled Girl#li_tre 53,{
}
}
-lighthalzen,324,322,0 script #li_door 45,2,2,{
+lighthalzen,324,322,0 script #li_door WARPNPC,2,2,{
OnTouch_:
if ((lhz_curse > 19) && (lhz_curse < 23)) {
mes "^3355FFThe door is locked.^000000";
@@ -5244,7 +5244,7 @@ OnTouch_:
end;
}
-lhz_in01,114,181,5 script Representative#li_01 71,{
+lhz_in01,114,181,5 script Representative#li_01 1_F_LIBRARYGIRL,{
if (lhz_curse == 7) {
mes "[Representative]";
mes "Greetings, and welcome";
@@ -5403,7 +5403,7 @@ lhz_in01,114,181,5 script Representative#li_01 71,{
}
}
-lhz_in01,27,247,5 script Representative#li_02 71,{
+lhz_in01,27,247,5 script Representative#li_02 1_F_LIBRARYGIRL,{
if (lhz_curse > 6) {
mes "[Representative]";
mes "Welcome to the";
@@ -5545,7 +5545,7 @@ lhz_in01,27,247,5 script Representative#li_02 71,{
}
}
-lhz_in01,25,251,3 script Rekenber Guidebook#li 111,{
+lhz_in01,25,251,3 script Rekenber Guidebook#li HIDDEN_NPC,{
mes "..............";
next;
mes "^3131FF#The Vision^000000";
@@ -5581,7 +5581,7 @@ lhz_in01,25,251,3 script Rekenber Guidebook#li 111,{
close;
}
-lhz_in01,273,121,1 script Mad Scientist#li 865,{
+lhz_in01,273,121,1 script Mad Scientist#li 4_LGTSCIENCE,{
if (lhz_curse == 13) {
mes "[Wolfchev]";
mes "No one shall";
@@ -5780,7 +5780,7 @@ lhz_in01,273,121,1 script Mad Scientist#li 865,{
}
}
-lhz_in01,286,226,3 script Secretary Slierre#li 831,{
+lhz_in01,286,226,3 script Secretary Slierre#li 4_F_ZONDAGIRL,{
if (lhz_curse == 26) {
mes "[Sueii Slierre]";
mes "Excuse me, but you are";
@@ -6279,7 +6279,7 @@ OnTouch_:
end;
}
-lhz_in01,43,114,0 script #li_toend 45,1,1,{
+lhz_in01,43,114,0 script #li_toend WARPNPC,1,1,{
OnTouch_:
if (lhz_curse > 30) {
warp "lhz_que01",97,30;
@@ -6293,7 +6293,7 @@ OnTouch_:
lhz_que01,97,33,0 warp #li_toin01 1,1,lhz_in01,43,120
lhz_in01,278,132,0 warp #li_toin02 1,1,lhz_in01,43,120
-lhz_que01,89,15,3 script File#li 111,{
+lhz_que01,89,15,3 script File#li HIDDEN_NPC,{
mes "Name: Engeod";
mes "Age: XX";
mes "Height: XXX";
@@ -6311,7 +6311,7 @@ lhz_que01,89,15,3 script File#li 111,{
close;
}
-lhz_in01,269,114,3 script A File#li-1 111,{
+lhz_in01,269,114,3 script A File#li-1 HIDDEN_NPC,{
mes "Name: Engeod";
mes "Age: XX";
mes "Height: XXX";
@@ -6331,7 +6331,7 @@ lhz_in01,269,114,3 script A File#li-1 111,{
// President Quest, a.k.a. Schwartzvalt Triology Quest
//============================================================
-lighthalzen,179,170,4 script Ordinary Man 98,{
+lighthalzen,179,170,4 script Ordinary Man 4W_M_02,{
if(!lhz_boss)
{
@@ -7113,7 +7113,7 @@ OnTouch:
}
}
-yuno_fild04,165,245,4 script Dismal Guy 89,{
+yuno_fild04,165,245,4 script Dismal Guy 4_M_ORIENT02,{
if(lhz_boss < 8)
{
@@ -7293,7 +7293,7 @@ yuno_fild04,165,245,4 script Dismal Guy 89,{
}
}
-yuno_pre,69,20,4 script Secretary#1 862,{
+yuno_pre,69,20,4 script Secretary#1 4_F_LGTGIRL,{
if(lhz_boss < 11)
{
@@ -7549,7 +7549,7 @@ yuno_pre,69,20,4 script Secretary#1 862,{
}
}
-yuno_pre,95,71,5 script Guard 852,{
+yuno_pre,95,71,5 script Guard 4_M_EIN_SOLDIER,{
if(lhz_boss < 11)
{
@@ -7679,14 +7679,14 @@ yuno_pre,95,71,5 script Guard 852,{
}
}
-yuno_pre,96,69,2 script A Fine Gentleman 754,{
+yuno_pre,96,69,2 script A Fine Gentleman 4_M_SAGE_A,{
OnInit:
disablenpc "A Fine Gentleman";
end;
}
-yuno_pre,69,79,4 script Mr. President 872,{
+yuno_pre,69,79,4 script Mr. President 4_M_PRESIDENT,{
if(checkweight(7342,1) != 1)
{
@@ -8603,14 +8603,14 @@ L_Mission:
}
}
-yuno_pre,77,68,0 script Secretary#2 862,{
+yuno_pre,77,68,0 script Secretary#2 4_F_LGTGIRL,{
OnInit:
disablenpc "Secretary#2";
end;
}
-yuno_pre,75,73,0 script A Neat Gentleman 109,{
+yuno_pre,75,73,0 script A Neat Gentleman 4_M_MANAGER,{
OnInit:
disablenpc "A Neat Gentleman";
@@ -8653,7 +8653,7 @@ OnTouch:
}
}
-aldebaran,58,225,4 script Kafra Employee#l1 116,{
+aldebaran,58,225,4 script Kafra Employee#l1 4_F_KAFRA2,{
if(lhz_boss != 17)
{
@@ -8723,7 +8723,7 @@ aldebaran,58,225,4 script Kafra Employee#l1 116,{
}
}
-aldeba_in,155,240,5 script Kafra Employee#l2 859,{
+aldeba_in,155,240,5 script Kafra Employee#l2 4_F_AGENTKAFRA,{
if(checkweight(7343,1) != 1)
{
@@ -9006,7 +9006,7 @@ aldeba_in,155,240,5 script Kafra Employee#l2 859,{
}
}
-lhz_fild02,228,214,0 script Wounded Man 849,{
+lhz_fild02,228,214,0 script Wounded Man 4_M_DIEMAN,{
if(checkweight(7343,1) != 1)
{
@@ -9137,7 +9137,7 @@ OnTouch:
}
}
-lhz_fild01,66,219,4 script Mysterious Woman 859,{
+lhz_fild01,66,219,4 script Mysterious Woman 4_F_AGENTKAFRA,{
if(lhz_boss == 26)
{
@@ -9353,7 +9353,7 @@ OnInit:
end;
}
-lhz_in01,93,45,4 script Researcher#1 865,{
+lhz_in01,93,45,4 script Researcher#1 4_LGTSCIENCE,{
if(lhz_boss < 28)
{
@@ -9455,7 +9455,7 @@ lhz_in01,93,45,4 script Researcher#1 865,{
}
}
-lhz_in01,285,169,3 script Researcher#2 865,{
+lhz_in01,285,169,3 script Researcher#2 4_LGTSCIENCE,{
if(checkweight(7349,1) != 1)
{
@@ -9608,7 +9608,7 @@ lhz_in01,285,169,3 script Researcher#2 865,{
}
}
-lhz_in01,187,31,0 script #Sneak 111,4,3,{
+lhz_in01,187,31,0 script #Sneak HIDDEN_NPC,4,3,{
end;
@@ -9792,7 +9792,7 @@ OnTimer190000:
-lhz_in01,182,35,0 script File Search Engine 111,{
+lhz_in01,182,35,0 script File Search Engine HIDDEN_NPC,{
if((lhz_boss > 28) && (lhz_boss < 35))
{
@@ -9922,7 +9922,7 @@ L_Search:
close;
}
-lhz_in01,177,31,0 script Door#sneak 111,{
+lhz_in01,177,31,0 script Door#sneak HIDDEN_NPC,{
if(lhz_boss < 29)
{
@@ -9960,7 +9960,7 @@ lhz_in01,177,31,0 script Door#sneak 111,{
}
}
-lhz_in01,184,40,0 script Area 1-5 111,{
+lhz_in01,184,40,0 script Area 1-5 HIDDEN_NPC,{
if(checkweight(7344,1) != 1)
{
@@ -10009,7 +10009,7 @@ lhz_in01,184,40,0 script Area 1-5 111,{
}
}
-lhz_in01,184,52,0 script Area 1-7 111,{
+lhz_in01,184,52,0 script Area 1-7 HIDDEN_NPC,{
if((lhz_boss > 28) && (lhz_boss < 32))
{
@@ -10071,7 +10071,7 @@ lhz_in01,184,52,0 script Area 1-7 111,{
}
}
-lhz_in01,184,46,0 script Area 3-2 111,{
+lhz_in01,184,46,0 script Area 3-2 HIDDEN_NPC,{
if((lhz_boss > 28) && (lhz_boss < 30))
{
@@ -10136,7 +10136,7 @@ lhz_in01,184,46,0 script Area 3-2 111,{
}
}
-lhz_in01,184,48,0 script Area 3-3 111,{
+lhz_in01,184,48,0 script Area 3-3 HIDDEN_NPC,{
if((lhz_boss > 28) && (lhz_boss < 34))
{
@@ -10184,7 +10184,7 @@ lhz_in01,184,48,0 script Area 3-3 111,{
}
}
-lhz_in01,177,56,0 script Area 6-1 111,{
+lhz_in01,177,56,0 script Area 6-1 HIDDEN_NPC,{
if((lhz_boss > 28) && (lhz_boss < 33))
{
@@ -10231,7 +10231,7 @@ lhz_in01,177,56,0 script Area 6-1 111,{
}
}
-lhz_dun02,282,278,0 script Broken Machine 111,{
+lhz_dun02,282,278,0 script Broken Machine HIDDEN_NPC,{
if(checkweight(7346,1) != 1)
{
@@ -10311,7 +10311,7 @@ lhz_dun02,282,278,0 script Broken Machine 111,{
}
}
-sec_in02,17,170,4 script boss::lght_boss_admin 809,{
+sec_in02,17,170,4 script boss::lght_boss_admin 1_M_SIGNMONK,{
callfunc "F_GM_NPC";
mes "[Patch]";
mes "Tell me what you want.";
@@ -10332,7 +10332,7 @@ sec_in02,17,170,4 script boss::lght_boss_admin 809,{
close;
}
-lhz_in02,19,274,2 script Maintenance Guy 851,{
+lhz_in02,19,274,2 script Maintenance Guy 4_M_REPAIR,{
mes "[Kudiuu]";
mes "Holy...!";
@@ -10346,7 +10346,7 @@ lhz_in02,19,274,2 script Maintenance Guy 851,{
// Rekenber Job Quest
//============================================================
-lhz_in01,174,258,3 script Young Man#reken 868,{
+lhz_in01,174,258,3 script Young Man#reken 4_M_LGTGUARD,{
if(lhz_rekenber > 21)
{
@@ -11088,7 +11088,7 @@ lhz_in01,174,258,3 script Young Man#reken 868,{
end;
}
-lighthalzen,141,162,3 script Old Man#reken 85,{
+lighthalzen,141,162,3 script Old Man#reken 4_M_03,{
mes "[Old Man]";
mes "Lately, Kazien seems";
@@ -11201,7 +11201,7 @@ einbroch,55,52,3 script Laboratory Guard#reken 852,{
close;
}
-airplane_01,96,48,3 script Man#Lyozien 868,{
+airplane_01,96,48,3 script Man#Lyozien 4_M_LGTGUARD,{
if(lhz_rekenber > 21)
{
@@ -11908,7 +11908,7 @@ OnTimer120000:
end;
}
-airplane_01,99,47,3 script #packidentity 139,2,2,{
+airplane_01,99,47,3 script #packidentity HIDDEN_WARP_NPC,2,2,{
end;
OnInit:
@@ -11948,7 +11948,7 @@ OnTimer120000:
end;
}
-lhz_in01,187,247,3 script #flashback1 139,2,2,{
+lhz_in01,187,247,3 script #flashback1 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if(lhz_rekenber == 22)
@@ -11970,7 +11970,7 @@ OnTouch:
end;
}
-lhz_in01,75,248,3 script #flashback2 139,2,2,{
+lhz_in01,75,248,3 script #flashback2 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if(lhz_rekenber == 22)
@@ -12008,7 +12008,7 @@ OnTouch:
end;
}
-airplane_01,10,10,3 script #LyozienSwitch 111,{
+airplane_01,10,10,3 script #LyozienSwitch HIDDEN_NPC,{
callfunc "F_GM_NPC";
mes "[Lyozien Switch]";
mes "Input password.";
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 54a7b3e95..b9f086264 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -37,7 +37,7 @@
// Soup Quest :: lou_tre
//============================================================
-lou_in02,53,174,7 script Employee#1 822,6,62,{
+lou_in02,53,174,7 script Employee#1 4_M_CHNMAN,6,62,{
if (gettime(3) >= 10 && gettime(3) < 22) {
mes "[Chang Pai]";
mes "Welcome, welcome!";
@@ -112,7 +112,7 @@ OnTouch:
end;
}
-lou_in02,76,181,3 script Employee#2 822,2,2,{
+lou_in02,76,181,3 script Employee#2 4_M_CHNMAN,2,2,{
if (gettime(3) >= 10 && gettime(3) < 22) {
mes "[Huang Jia Xian]";
mes "Welcome~";
@@ -202,7 +202,7 @@ OnTouch:
end;
}
-lou_in02,61,175,3 script Employee#3 818,2,2,{
+lou_in02,61,175,3 script Employee#3 4_F_CHNWOMAN,2,2,{
if (gettime(3) >= 10 && gettime(3) < 22) {
if (ch_tre == 5) {
mes "[Ya Hua]";
@@ -299,7 +299,7 @@ OnTouch:
end;
}
-lou_in02,62,183,3 script Chef#1-2 820,2,2,{
+lou_in02,62,183,3 script Chef#1-2 4_M_CHNCOOK,2,2,{
if (ch_tre > 0 && ch_tre < 4) {
mes "[Wang Shi Long]";
mes "Hm? Aren't you a customer? I am Wang Shi Long, the chef of this restaurant.";
@@ -435,7 +435,7 @@ OnTouch:
end;
}
-lou_fild01,195,177,5 script Jiu Lian Bu#1-1 819,{
+lou_fild01,195,177,5 script Jiu Lian Bu#1-1 4_M_CHN8GUEK,{
//Remove outdated variables and attempt to preserve prior quest progress.
if (QL_ACCEPTSOUP) set ch_tre,1;
if (QL_GOTDRAGONSOUP) set ch_tre,2;
@@ -606,7 +606,7 @@ lou_fild01,195,177,5 script Jiu Lian Bu#1-1 819,{
close;
}
-lou_fild01,175,173,3 script Jiu Lian Bu#1-2 819,{
+lou_fild01,175,173,3 script Jiu Lian Bu#1-2 4_M_CHN8GUEK,{
emotion e_heh;
if (ch_tre == 4) {
mes "[Jiu Lian Bu]";
@@ -710,7 +710,7 @@ lou_fild01,175,173,3 script Jiu Lian Bu#1-2 819,{
end;
}
-lou_in02,50,185,5 script Pot#1 111,{
+lou_in02,50,185,5 script Pot#1 HIDDEN_NPC,{
if (ch_tre == 1) {
mes "^3131FFBeneath the shadows,";
mes "you find a large pot filled with dark, red liquid. What do you";
@@ -782,7 +782,7 @@ lou_in02,50,185,5 script Pot#1 111,{
close;
}
-lou_in02,49,185,5 script Pot#2 111,{
+lou_in02,49,185,5 script Pot#2 HIDDEN_NPC,{
if (ch_tre == 1) {
mes "^3131FFBeneath the shadows,";
mes "you find a large pot filled with dark, red liquid. What do you";
@@ -854,7 +854,7 @@ lou_in02,49,185,5 script Pot#2 111,{
close;
}
-lou_in02,58,183,5 script Chef Assistant#lou1 823,5,5,{
+lou_in02,58,183,5 script Chef Assistant#lou1 4_M_CHNMONK,5,5,{
mes "[Jin Wei Ling]";
mes "I used to be";
mes "an enthusiastic";
@@ -940,7 +940,7 @@ OnTouch:
end;
}
-lou_in02,80,173,3 script Li Min#lou 746,{
+lou_in02,80,173,3 script Li Min#lou 4_F_MONK,{
if (ch_tre == 5) {
mes "[Li Min]";
mes "^666666*Sigh*^000000 I am so disappointed. I came all the way down here to taste the food! I can't believe they don't sell it anymore!";
@@ -977,7 +977,7 @@ lou_in02,80,173,3 script Li Min#lou 746,{
close;
}
-lou_in02,42,186,5 script Liu Jia Lim#lou 816,{
+lou_in02,42,186,5 script Liu Jia Lim#lou 4_F_CHNDRESS2,{
if (ch_tre == 5) {
mes "[Liu Jia Lim]";
mes "Do you know what was this restaurant's best dish throughout all of its history? Dragon Soup!";
@@ -1005,7 +1005,7 @@ lou_in02,42,186,5 script Liu Jia Lim#lou 816,{
close;
}
-lou_in02,43,169,1 script Jiang Rong#lou 827,{
+lou_in02,43,169,1 script Jiang Rong#lou 4_M_GRANDMONK,{
mes "[Jiang Rong]";
mes "Dragon Soup is known for its spicy, yet sweet and refreshing taste.";
next;
@@ -1022,7 +1022,7 @@ lou_in02,43,169,1 script Jiang Rong#lou 827,{
close;
}
-louyang,261,123,3 script Chi Wu Ping#lou 824,{
+louyang,261,123,3 script Chi Wu Ping#lou 4_M_CHNOLD,{
mes "[Chi Wu Ping]";
mes "I don't feel good...";
mes "So... Totally out of it...";
@@ -1056,7 +1056,7 @@ louyang,261,123,3 script Chi Wu Ping#lou 824,{
close;
}
-louyang,174,150,5 script Jiu Chi Ling#lou 815,{
+louyang,174,150,5 script Jiu Chi Ling#lou 4_F_CHNDRESS1,{
if (ch_tre == 5) {
mes "[Jiu Chi Ling]";
mes "There's a strange rumor going around that the restaurant is no longer selling Dragon Soup...";
@@ -1088,7 +1088,7 @@ louyang,174,150,5 script Jiu Chi Ling#lou 815,{
// Doctor Quest :: dr_china
//============================================================
-lou_in02,265,69,5 script Doctor#lyang 814,{
+lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a minute! Right now, you're over weight, so you cannot receive more items. Please store some of your things in Kafra Storage and try again.^000000";
close;
@@ -1499,7 +1499,7 @@ lou_in02,265,69,5 script Doctor#lyang 814,{
close;
}
-lou_in02,272,55,0 script Familiar-Looking Patient 798,{
+lou_in02,272,55,0 script Familiar-Looking Patient 4_M_NFMAN,{
if (ch_par == 0 ) {
mes "[??????]";
mes "Awwww.....";
@@ -1526,7 +1526,7 @@ lou_in02,272,55,0 script Familiar-Looking Patient 798,{
}
}
-lou_in02,248,166,2 script Tool Shop Master#lou 824,{
+lou_in02,248,166,2 script Tool Shop Master#lou 4_M_CHNOLD,{
if (ch_par < 2) {
mes "[Wang Chuiyi]";
mes "My business hasn't been doing";
@@ -1589,7 +1589,7 @@ lou_in02,248,166,2 script Tool Shop Master#lou 824,{
}
}
-lou_in02,201,166,4 script Storage Keeper#lou 819,{
+lou_in02,201,166,4 script Storage Keeper#lou 4_M_CHN8GUEK,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FF * Wait a moment!! *";
mes "Currently you're over weight, so you cannot receive more items into your inventory. Please store some of your items into Kafra Storage and try again.^000000";
@@ -1827,7 +1827,7 @@ lou_in02,201,166,4 script Storage Keeper#lou 819,{
close;
}
-lou_in02,210,47,0 script City Hall Officer#lou 825,{
+lou_in02,210,47,0 script City Hall Officer#lou 4_M_CHNSOLDIER,{
if (ch_par < 5) {
mes "[Jin Chiyuan]";
mes "^666666*Yawn~*^000000";
@@ -1982,7 +1982,7 @@ lou_in02,210,47,0 script City Hall Officer#lou 825,{
close;
}
-lou_in02,156,38,0 script Studying Officer#lou 822,{
+lou_in02,156,38,0 script Studying Officer#lou 4_M_CHNMAN,{
if (ch_par < 5) {
mes "[Huang Zhishu]";
mes ".....";
@@ -2153,7 +2153,7 @@ lou_in02,156,38,0 script Studying Officer#lou 822,{
close;
}
-lou_in02,204,169,0 script Supply Stack#1lou 111,{
+lou_in02,204,169,0 script Supply Stack#1lou HIDDEN_NPC,{
if (MaxWeight - Weight < 2000) {
mes "^3355FF* Wait a minute! *";
mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again. ^000000";
@@ -2203,7 +2203,7 @@ lou_in02,204,169,0 script Supply Stack#1lou 111,{
close;
}
-lou_in02,207,168,0 script Supply Stack#5lou 111,{
+lou_in02,207,168,0 script Supply Stack#5lou HIDDEN_NPC,{
if (MaxWeight - Weight < 2000) {
mes "^3355FF* Wait a minute !! *";
mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
@@ -2255,7 +2255,7 @@ lou_in02,207,168,0 script Supply Stack#5lou 111,{
close;
}
-lou_in02,206,163,0 script Supply Stack#4lou 111,{
+lou_in02,206,163,0 script Supply Stack#4lou HIDDEN_NPC,{
if (MaxWeight - Weight < 2000) {
mes "^3355FF* Wait a minute !! *";
mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
@@ -2307,7 +2307,7 @@ lou_in02,206,163,0 script Supply Stack#4lou 111,{
close;
}
-lou_in02,198,170,0 script Supply Stack#3lou 111,{
+lou_in02,198,170,0 script Supply Stack#3lou HIDDEN_NPC,{
if (MaxWeight - Weight < 2000) {
mes "^3355FF* Wait a minute !! *";
mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
@@ -2359,7 +2359,7 @@ lou_in02,198,170,0 script Supply Stack#3lou 111,{
close;
}
-lou_in02,192,170,0 script Supply Stack#2 111,{
+lou_in02,192,170,0 script Supply Stack#2 HIDDEN_NPC,{
if (MaxWeight - Weight < 2000) {
mes "^3355FF* Wait a minute !! *";
mes "You're carrying too many items with you. Please put some of your items into your Kafra Storage and try again.^000000";
@@ -2414,7 +2414,7 @@ lou_in02,203,159,0 warp Storage Warp#4 1,1,louyang,129,118
// Poison King Quest :: poison_king
//============================================================
-lou_in02,123,39,4 script Poison King#lou 824,{
+lou_in02,123,39,4 script Poison King#lou 4_M_CHNOLD,{
// Attempt to preserve prior quest progress.
if (ch_poison == 0 && CL_POISONKING != 0) {
if (QL_POISONKING <= 12) set ch_poison,QL_POISONKING;
@@ -3406,7 +3406,7 @@ lou_in02,123,39,4 script Poison King#lou 824,{
}
}
-lou_in02,253,45,0 script Employee#poison 822,{
+lou_in02,253,45,0 script Employee#poison 4_M_CHNMAN,{
if (checkweight(1201,1) == 0) {
mes "^3355FF * Wait a minute! *";
mes "You're carrying too many items with you right now. Please put some of your things into Kafra Storage and try again.^000000";
@@ -4096,7 +4096,7 @@ lou_in02,253,45,0 script Employee#poison 822,{
close;
}
-lou_fild01,224,348,0 script Lady#delivery 817,{
+lou_fild01,224,348,0 script Lady#delivery 4_F_CHNDRESS3,{
if (checkweight(1201,1) == 0) {
mes "^3355FF * Wait a minute! *";
mes "Currently, you're carrying too many items. Please put some of your things into Kafra Storage and try again.^000000";
@@ -4247,7 +4247,7 @@ lou_fild01,224,348,0 script Lady#delivery 817,{
}
}
-lou_fild01,225,350,0 script #fire 139,{
+lou_fild01,225,350,0 script #fire HIDDEN_WARP_NPC,{
end;
}
@@ -4325,7 +4325,7 @@ OnTouch:
end;
}
-louyang,217,278,0 script #lou_path 111,{
+louyang,217,278,0 script #lou_path HIDDEN_NPC,{
if (ch_poison == 12 || ch_poison == 16) {
mes "["+strcharinfo(0)+"]";
mes "What's this?";
@@ -4341,7 +4341,7 @@ louyang,217,278,0 script #lou_path 111,{
end;
}
-lou_in01,107,163,0 script #lou_drink1 111,{
+lou_in01,107,163,0 script #lou_drink1 HIDDEN_NPC,{
if (ch_poison == 12) {
mes "^3355FFYou found a drink bottle that's possibly owned by Bai Long, lord of Louyang.^00000";
next;
@@ -4373,7 +4373,7 @@ lou_in01,107,163,0 script #lou_drink1 111,{
close;
}
-lou_in01,118,167,0 script #lou_drink2 111,{
+lou_in01,118,167,0 script #lou_drink2 HIDDEN_NPC,{
if (ch_poison == 12) {
mes "^3355FFYou squeeze through the crack as quickly as you can.^000000";
close2;
@@ -4389,7 +4389,7 @@ lou_in01,118,167,0 script #lou_drink2 111,{
end;
}
-lou_in01,99,158,4 script Lord#bailong 821,{
+lou_in01,99,158,4 script Lord#bailong 4_M_CHNGENERL,{
if (checkweight(1201,1) == 0) {
mes "^3355FF * Wait a minute! *";
mes "Right now you're carrying too many items. Please put some of your things into Kafra Storage and try again.^000000";
@@ -4483,7 +4483,7 @@ lou_in01,99,158,4 script Lord#bailong 821,{
}
}
-lou_in01,111,151,4 script Soldier#bailong1 825,{
+lou_in01,111,151,4 script Soldier#bailong1 4_M_CHNSOLDIER,{
if (ch_poison == 12 || ch_poison == 16) {
mes "[Soldier]";
mes "Hey...";
@@ -4505,7 +4505,7 @@ lou_in01,111,151,4 script Soldier#bailong1 825,{
close;
}
-lou_in01,91,151,4 script Soldier#bailong2 825,{
+lou_in01,91,151,4 script Soldier#bailong2 4_M_CHNSOLDIER,{
if (ch_poison == 12 || ch_poison == 16) {
mes "[Soldier]";
mes "Huh...?";
@@ -4538,7 +4538,7 @@ lou_in01,91,151,4 script Soldier#bailong2 825,{
close;
}
-lou_in01,102,144,4 script Soldier#bailong3 825,{
+lou_in01,102,144,4 script Soldier#bailong3 4_M_CHNSOLDIER,{
if (ch_poison == 12 || ch_poison == 16) {
mes "[Soldier]";
mes "Huh...?";
@@ -4564,7 +4564,7 @@ lou_in01,102,144,4 script Soldier#bailong3 825,{
close;
}
-lou_in01,99,144,4 script Soldier#bailong4 825,{
+lou_in01,99,144,4 script Soldier#bailong4 4_M_CHNSOLDIER,{
if (ch_poison == 12 || ch_poison == 16) {
mes "[Soldier]";
mes "Who goes there?!";
@@ -4588,7 +4588,7 @@ lou_in01,99,144,4 script Soldier#bailong4 825,{
// Revolution Quest :: lou_zero
//============================================================
-lou_in02,77,37,7 script Hermit 824,{
+lou_in02,77,37,7 script Hermit 4_M_CHNOLD,{
if (!QL_REVOL) {
mes "[Sun Mao]";
mes "Where there's a will,";
@@ -4864,7 +4864,7 @@ lou_in02,77,37,7 script Hermit 824,{
}
}
-lou_in01,43,147,3 script Gunpowder Expert 750,{
+lou_in01,43,147,3 script Gunpowder Expert 4_M_ALCHE_C,{
if (ch_make == 0) {
getpartymember(getcharid(1));
set @partymember,$@partymembercount;
@@ -4953,7 +4953,7 @@ lou_in01,43,147,3 script Gunpowder Expert 750,{
}
}
-lou_in01,45,138,3 script Soldier#1 825,{
+lou_in01,45,138,3 script Soldier#1 4_M_CHNSOLDIER,{
if (countitem(7204)) {
mes "[Soldier]";
mes "Hold on there!";
@@ -4971,7 +4971,7 @@ lou_in01,45,138,3 script Soldier#1 825,{
end;
}
-lou_in01,82,139,7 script Soldier#2 825,{
+lou_in01,82,139,7 script Soldier#2 4_M_CHNSOLDIER,{
if (countitem(7068) || countitem(7096) || countitem(7004)) {
mes "[Soldier]";
mes "I am sorry, but it is prohibited to enter with some of the products";
diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt
index 5d0c7b099..8036e9471 100644
--- a/npc/quests/quests_lutie.txt
+++ b/npc/quests/quests_lutie.txt
@@ -16,7 +16,7 @@
//= 1.4 Updated NPCs once again. [L0ne_W0lf]
//============================================================
-xmas,117,295,4 script Vending Machine Man 704,{
+xmas,117,295,4 script Vending Machine Man 4_M_BIBI,{
mes "[Titicupe]";
mes "Hmm...?";
mes "I, Titicupe, esteemed manager of the Toy Factory and genius inventor, has done it again! I've just created the world's most sophisticated vending machine!";
@@ -138,7 +138,7 @@ xmas,117,295,4 script Vending Machine Man 704,{
}
}
-xmas,115,297,4 script Vending Machine 111,{
+xmas,115,297,4 script Vending Machine HIDDEN_NPC,{
mes "[Audi]";
mes "^555555Exciting item vending machine. Invented by great Titicupe. Select the desired item and place required items into snowmouth receptacle.^000000";
next;
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index ea37258d5..6a5f452cf 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -48,7 +48,7 @@
// Stop Post Quest
// ============================================================
-moc_ruins,113,181,4 script William 89,{
+moc_ruins,113,181,4 script William 4_M_ORIENT02,{
mes "[William]";
mes "Welcome to";
mes "MacMillan's ^3355FFPost^000000 Workshop.";
@@ -93,7 +93,7 @@ moc_ruins,113,181,4 script William 89,{
// Binoculars Quest
// ============================================================
-moc_ruins,118,176,4 script Alchemist 64,{
+moc_ruins,118,176,4 script Alchemist 1_M_WIZARD,{
mes "[Marius]";
mes "Howdy, new customer!!";
mes "I know what you're gonna talk about. You want the Magic Glasses from me, riiiiight?";
@@ -166,7 +166,7 @@ moc_ruins,118,176,4 script Alchemist 64,{
// Morroc Assassin Guild Bar [Disabled]
// ============================================================
/*
-morocc,43,108,5 script Sharp-Looking Kid#dan_07 82,{
+morocc,43,108,5 script Sharp-Looking Kid#dan_07 4_KID01,{
if (BaseClass == Job_Assassin) {
mes "[Jack]";
mes "In spite of the chaotic mess in their town, ";
@@ -191,7 +191,7 @@ morocc,43,108,5 script Sharp-Looking Kid#dan_07 82,{
}
}
-morocc,45,110,0 script que_job01#01 45,2,2,{
+morocc,45,110,0 script que_job01#01 WARPNPC,2,2,{
OnTouch:
if (BaseClass == Job_Assassin) {
warp "que_job01",9,94;
@@ -216,7 +216,7 @@ que_job01,6,94,0 warp morocc#01 2,2,morocc,45,103
que_job01,17,48,0 warp que_job01#02 2,2,que_job01,68,92
que_job01,68,96,0 warp que_job01#03 2,2,que_job01,17,53
-que_job01,80,77,0 script que_job01#04 45,2,2,{
+que_job01,80,77,0 script que_job01#04 WARPNPC,2,2,{
OnTouch:
if (BaseClass == Job_Assassin) {
warp "que_job01",61,50;
@@ -317,7 +317,7 @@ OnTouch:
que_job01,65,50,0 warp que_job01#05 2,2,que_job01,84,77
-que_job01,81,79,5 script Idle Knight#dan_08 733,{
+que_job01,81,79,5 script Idle Knight#dan_08 4_M_JOB_KNIGHT1,{
mes "[Litheron]";
mes "What's the matter?";
mes "Oh, I see... You're";
@@ -334,7 +334,7 @@ que_job01,81,79,5 script Idle Knight#dan_08 733,{
close;
}
-que_job01,82,95,3 script Bar Master#moc_main01 46,{
+que_job01,82,95,3 script Bar Master#moc_main01 1_ETC_01,{
if (checkweight(908,200) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -582,7 +582,7 @@ que_job01,82,95,3 script Bar Master#moc_main01 46,{
}
}
-que_job01,49,49,5 script Tao#dan_09 877,{
+que_job01,49,49,5 script Tao#dan_09 4_F_YUNYANG,{
if (BaseClass == Job_Assassin) {
mes "[Tao]";
mes "Welcome, meow~";
@@ -663,7 +663,7 @@ que_job01,49,49,5 script Tao#dan_09 877,{
}
}
-que_job01,51,55,0 script que_job01#room_1 45,1,1,{
+que_job01,51,55,0 script que_job01#room_1 WARPNPC,1,1,{
OnReset:
set $@maobar_room,0;
@@ -733,7 +733,7 @@ OnTouch:
}
}
-que_job01,1,1,0 script #room1timer 844,{
+que_job01,1,1,0 script #room1timer CLEAR_NPC,{
OnEnable:
initnpctimer;
mapannounce "que_job01","You will now enter the Master Zone, Area 1.",bc_map,"0x70DBDB";
@@ -785,7 +785,7 @@ OnTouch:
que_job01,51,44,0 warp que_job01#room_2 1,1,que_job01,80,23
-que_job01,11,4,0 script que_job01#room1_out 45,1,1,{
+que_job01,11,4,0 script que_job01#room1_out WARPNPC,1,1,{
OnTouch:
warp "que_job01",52,50;
donpcevent " #room1timer::OnStop";
@@ -794,7 +794,7 @@ OnTouch:
que_job01,80,27,0 warp que_job01#room2_1_out 1,1,que_job01,52,50
-que_job01,16,21,5 script Valdes#moc_master_1 55,{
+que_job01,16,21,5 script Valdes#moc_master_1 1_M_JOBTESTER,{
if (BaseClass == Job_Assassin) {
mes "[Valdes]";
mes "What is it? I have nothing to ask you to do.";
@@ -835,7 +835,7 @@ OnDisable:
}
*/
-yuno_in04,180,106,3 script Reading Girl#moc_girl1 73,{
+yuno_in04,180,106,3 script Reading Girl#moc_girl1 1_F_MERCHANT_01,{
mes "[" + strcharinfo(0) + "]";
mes "Excuse me, but may I ask";
mes "you a question?";
@@ -863,7 +863,7 @@ yuno_in04,180,106,3 script Reading Girl#moc_girl1 73,{
close;
}
-morocc_in,46,125,5 script Assistant#moc_ex1 729,{
+morocc_in,46,125,5 script Assistant#moc_ex1 4_F_NOVICE,{
mes "[Sephit]";
mes "I've always believed in Satan..";
mes "Haah... Guess it's good to be living, after all.";
@@ -873,7 +873,7 @@ morocc_in,46,125,5 script Assistant#moc_ex1 729,{
close;
}
-que_job01,70,84,1 script Girl#moc_ex002 882,{
+que_job01,70,84,1 script Girl#moc_ex002 4_F_SITDOWN,{
mes "[Girl]";
mes "Oh, the world.. the world is doomed..";
mes "-sobbing-";
@@ -888,7 +888,7 @@ que_job01,70,84,1 script Girl#moc_ex002 882,{
// Resurrection of Satan Morroc
// ============================================================
-moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{
+moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 4_M_MOC_SOLDIER,3,3,{
if ((rebirth_moc_edq == 0) && (rebirth_moc_edq < 4)) {
mes "[Continental Guard]";
mes "No commoners are allowed in the area beyond this point.";
@@ -1108,15 +1108,15 @@ OnTouch:
end;
}
-moc_fild20,354,174,3 duplicate(MocConGuard) Continental Guard#02 707,3,3
-moc_fild20,38,174,5 duplicate(MocConGuard) Continental Guard#03 707,3,3
-moc_fild20,38,183,5 duplicate(MocConGuard) Continental Guard#04 707,3,3
-moc_fild20,189,21,7 duplicate(MocConGuard) Continental Guard#05 707,3,3
-moc_fild20,200,21,7 duplicate(MocConGuard) Continental Guard#06 707,3,3
-moc_fild20,203,336,5 duplicate(MocConGuard) Continental Guard#07 707,3,3
-moc_fild20,215,336,3 duplicate(MocConGuard) Continental Guard#08 707,3,3
+moc_fild20,354,174,3 duplicate(MocConGuard) Continental Guard#02 4_M_MOC_SOLDIER,3,3
+moc_fild20,38,174,5 duplicate(MocConGuard) Continental Guard#03 4_M_MOC_SOLDIER,3,3
+moc_fild20,38,183,5 duplicate(MocConGuard) Continental Guard#04 4_M_MOC_SOLDIER,3,3
+moc_fild20,189,21,7 duplicate(MocConGuard) Continental Guard#05 4_M_MOC_SOLDIER,3,3
+moc_fild20,200,21,7 duplicate(MocConGuard) Continental Guard#06 4_M_MOC_SOLDIER,3,3
+moc_fild20,203,336,5 duplicate(MocConGuard) Continental Guard#07 4_M_MOC_SOLDIER,3,3
+moc_fild20,215,336,3 duplicate(MocConGuard) Continental Guard#08 4_M_MOC_SOLDIER,3,3
-- script Continental Messenger#00::ConMessenger 997,3,3,{
+- script Continental Messenger#00::ConMessenger 4_M_MOCASS1,3,3,{
set .@area$,strnpcinfo(2);
if (.@area$ == "01") { set .@area$,"Prontera"; }
else if (.@area$ == "02") { set .@area$,"Geffen"; }
@@ -1201,13 +1201,13 @@ OnTouch:
end;
}
-prontera,164,304,3 duplicate(ConMessenger) Continental Messenger#01 997,3,3
-geffen,128,90,3 duplicate(ConMessenger) Continental Messenger#02 997,3,3
-payon,200,113,3 duplicate(ConMessenger) Continental Messenger#03 997,3,3
-alberta,127,64,3 duplicate(ConMessenger) Continental Messenger#04 998,3,3
-aldebaran,135,128,3 duplicate(ConMessenger) Continental Messenger#05 998,3,3
+prontera,164,304,3 duplicate(ConMessenger) Continental Messenger#01 4_M_MOCASS1,3,3
+geffen,128,90,3 duplicate(ConMessenger) Continental Messenger#02 4_M_MOCASS1,3,3
+payon,200,113,3 duplicate(ConMessenger) Continental Messenger#03 4_M_MOCASS1,3,3
+alberta,127,64,3 duplicate(ConMessenger) Continental Messenger#04 4_M_MOCASS2,3,3
+aldebaran,135,128,3 duplicate(ConMessenger) Continental Messenger#05 4_M_MOCASS2,3,3
-morocc,176,103,3 script Continental Official 754,{
+morocc,176,103,3 script Continental Official 4_M_SAGE_A,{
if (rebirth_moc_edq > 3) {
mes "[Continental Guard Official]";
mes "On behalf of the Continental Guard, I thank you for your efforts. Now, let me see if I've received any news from Headquarters that you should know...";
@@ -1281,7 +1281,7 @@ morocc,176,103,3 script Continental Official 754,{
}
}
-morocc,159,113,3 script Chief Balrog 752,{
+morocc,159,113,3 script Chief Balrog 4_M_CRU_OLD,{
if (rebirth_moc_edq == 0) {
mes "[Chief Balrog]";
mes "You've come here at a bad time, but it's nice to meet you. I'm Continental Guard Chief Balrog. We've been dispatched to Morroc in order to suppress Satan Morroc... We'll need all the strength and luck we can gather.";
@@ -1871,7 +1871,7 @@ OnTouch:
end;
}
-moc_fild21,1,1,0 script Satan Broadcast#edq 844,{
+moc_fild21,1,1,0 script Satan Broadcast#edq CLEAR_NPC,{
OnInit:
disablenpc "Satan Broadcast#edq";
end;
@@ -1899,7 +1899,7 @@ OnDisable:
end;
}
-moc_fild21,178,239,0 script Group of Evil#edq 844,1,1,{
+moc_fild21,178,239,0 script Group of Evil#edq CLEAR_NPC,1,1,{
if (((rebirth_moc_edq == 4) || (rebirth_moc_edq == 7)) && ($@re_moc == 1)) {
mes "Awed by the time-space gap where darkness is given life, you instinctively step back.";
next;
@@ -1936,7 +1936,7 @@ OnDisable:
end;
}
-moc_fild21,177,239,0 script Time-Space Gap#edq 844,1,1,{
+moc_fild21,177,239,0 script Time-Space Gap#edq CLEAR_NPC,1,1,{
if ((rebirth_moc_edq == 4) && ($@re_moc == 3)) {
mes "The time-space gap's frightening darkness seems to dissipate as Satan Morroc fades away.";
next;
@@ -1982,7 +1982,7 @@ OnTimer21600000:
end;
}
-moc_fild21,3,1,0 script Satan Summon#edq 844,{
+moc_fild21,3,1,0 script Satan Summon#edq CLEAR_NPC,{
OnInit:
disablenpc "Satan Summon#edq";
end;
@@ -2023,7 +2023,7 @@ OnTimer5415000:
end;
}
-sec_in02,14,43,5 script Morroc GlobalVar Admin::MorrocAdmin_sec 971,{
+sec_in02,14,43,5 script Morroc GlobalVar Admin::MorrocAdmin_sec 4_F_RUSGREEN,{
callfunc "F_GM_NPC";
mes "[Helper]";
mes "Please enter the password and # button.";
@@ -2099,11 +2099,11 @@ sec_in02,14,43,5 script Morroc GlobalVar Admin::MorrocAdmin_sec 971,{
}
}
}
-moc_fild21,5,5,5 duplicate(MorrocAdmin_sec) Morroc GlobalVar Admin::MorrocAdmin_moc 971
+moc_fild21,5,5,5 duplicate(MorrocAdmin_sec) Morroc GlobalVar Admin::MorrocAdmin_moc 4_F_RUSGREEN
// The Crow of the Fate
// ============================================================
-moc_ruins,137,70,3 script Book-Touching Man#garas 48,{
+moc_ruins,137,70,3 script Book-Touching Man#garas 1_M_02,{
if (BaseLevel > 59) {
if (checkweight(703,3) == 0) {
mes "- You have too many items in your inventory to proceed with this quest. -";
@@ -2425,7 +2425,7 @@ moc_ruins,137,70,3 script Book-Touching Man#garas 48,{
}
}
-prt_in,179,92,3 script Library Curator#garas 57,{
+prt_in,179,92,3 script Library Curator#garas 1_M_LIBRARYMASTER,{
if (barmunt_crow == 0) {
mes "[Curator Guys]";
mes "Our library's Monster Encyclopedia has every monster in the Rune-Midgart Kingdom categorized by dungeon, to help our readers find them easily.";
@@ -2556,7 +2556,7 @@ prt_in,179,92,3 script Library Curator#garas 57,{
}
}
-yuno,333,210,5 script Library Master#garas 57,{
+yuno,333,210,5 script Library Master#garas 1_M_LIBRARYMASTER,{
if (barmunt_crow == 2) {
mes "[Dog]";
mes "Bowwow!";
@@ -2654,7 +2654,7 @@ yuno,333,210,5 script Library Master#garas 57,{
}
}
-yuno,336,203,0 script #garas_catch 139,3,3,{
+yuno,336,203,0 script #garas_catch HIDDEN_WARP_NPC,3,3,{
//OnTouch2:
OnTouch:
if (barmunt_crow == 2) {
@@ -2750,17 +2750,17 @@ OnTouch:
end;
}
-yuno,343,204,1 script #garas_eff 111,{
+yuno,343,204,1 script #garas_eff HIDDEN_NPC,{
end;
}
-yuno,335,208,5 script Dog#garas 81,{
+yuno,335,208,5 script Dog#garas 4_DOG01,{
mes "[Dog]";
mes "Bowwow!";
close;
}
-yuno_in04,111,57,3 script Library Part-Timer#garas 862,{
+yuno_in04,111,57,3 script Library Part-Timer#garas 4_F_LGTGIRL,{
if (barmunt_crow == 3) {
mes "[Library Part-Timer]";
mes "People should learn to put away books after pulling them out.";
@@ -2845,7 +2845,7 @@ yuno_in04,111,57,3 script Library Part-Timer#garas 862,{
end;
}
-yuno_in04,100,5,3 script Hot Bestseller Corner 111,{
+yuno_in04,100,5,3 script Hot Bestseller Corner HIDDEN_NPC,{
if (barmunt_crow == 3) {
mes "^660000The countless number of books filling this room tell you why this place is called the Greatest Library of Juno, the City of Scholars.^000000";
next;
@@ -2919,7 +2919,7 @@ yuno_in04,100,5,3 script Hot Bestseller Corner 111,{
end;
}
-yuno_in04,100,3,0 script #garas_path 139,1,1,{
+yuno_in04,100,3,0 script #garas_path HIDDEN_WARP_NPC,1,1,{
//OnTouch2:
OnTouch2:
if (barmunt_crow == 6) {
@@ -2981,7 +2981,7 @@ OnTouch2:
end;
}
-yuno_in04,117,102,3 script Old News Scrapbook 844,{
+yuno_in04,117,102,3 script Old News Scrapbook CLEAR_NPC,{
if (barmunt_crow == 7) {
mes "^660000It is a folder with an wooden frame holding a thick pile of old newspapers.^000000";
next;
@@ -3120,7 +3120,7 @@ yuno_in04,117,102,3 script Old News Scrapbook 844,{
}
}
-yuno_in04,169,123,3 script Suspicious Man#oliver_h 407,{
+yuno_in04,169,123,3 script Suspicious Man#oliver_h 4_M_ATEIL,{
if (checkweight(617,3) == 0) {
mes "- You have too many items in your inventory to proceed with this quest. -";
close;
@@ -3333,7 +3333,7 @@ yuno_in04,169,123,3 script Suspicious Man#oliver_h 407,{
}
}
-yuno_in04,167,120,3 script Worn-out Book#garas 111,{
+yuno_in04,167,120,3 script Worn-out Book#garas HIDDEN_NPC,{
if (checkweight(617,3) == 0) {
mes "- You have too many items in your inventory to proceed with this quest. -";
close;
@@ -3599,7 +3599,7 @@ OnTouch:
}
}
-que_ba,257,39,3 script Female Researcher#bpast 744,{
+que_ba,257,39,3 script Female Researcher#bpast 4_F_ALCHE,{
if (barmunt_crow < 4) {
warp "ama_dun03",119,110;
}
@@ -3628,7 +3628,7 @@ que_ba,257,39,3 script Female Researcher#bpast 744,{
que_ba,265,34,0 warp #bpast_1to2 1,1,que_ba,156,37
-que_ba,176,43,7 script Researcher#bpast_2_1 402,{
+que_ba,176,43,7 script Researcher#bpast_2_1 4_M_SCIENCE,{
specialeffect EF_CLOAKING;
mes "[Researcher]";
mes "Fire!";
@@ -3636,7 +3636,7 @@ que_ba,176,43,7 script Researcher#bpast_2_1 402,{
close;
}
-que_ba,181,14,7 script Researcher#bpast_2_2 865,{
+que_ba,181,14,7 script Researcher#bpast_2_2 4_LGTSCIENCE,{
specialeffect EF_CLOAKING;
mes "[Researcher]";
mes "Cough, cough!";
@@ -3709,17 +3709,17 @@ OnTouch:
end;
}
-que_ba,104,55,3 script Grotesque Woman#eva1 980,{
+que_ba,104,55,3 script Grotesque Woman#eva1 4_F_MUT1,{
specialeffect EF_CLOAKING;
end;
}
-que_ba,99,51,7 script Grotesque Man#zid1 999,{
+que_ba,99,51,7 script Grotesque Man#zid1 4_M_MUT1,{
specialeffect EF_CLOAKING;
end;
}
-que_ba,53,232,0 script #garas_f_yume 139,1,1,{
+que_ba,53,232,0 script #garas_f_yume HIDDEN_WARP_NPC,1,1,{
//OnTouch2:
OnTouch:
if (barmunt_crow == 5) {
@@ -3754,17 +3754,17 @@ OnTouch:
end;
}
-que_ba,50,238,1 script Grotesque Woman#eva2 980,{
+que_ba,50,238,1 script Grotesque Woman#eva2 4_F_MUT1,{
specialeffect EF_CLOAKING;
end;
}
-que_ba,48,227,7 script Grotesque Man#zid2 999,{
+que_ba,48,227,7 script Grotesque Man#zid2 4_M_MUT1,{
specialeffect EF_CLOAKING;
end;
}
-que_ba,264,186,0 script #barmut_room1 139,2,2,{
+que_ba,264,186,0 script #barmut_room1 HIDDEN_WARP_NPC,2,2,{
//OnTouch2:
OnTouch:
if (barmunt_crow == 11) {
@@ -3800,11 +3800,11 @@ OnTouch:
end;
}
-que_ba,270,181,3 script #barmunt_fire 755,{
+que_ba,270,181,3 script #barmunt_fire 4_M_SAGE_C,{
end;
}
-que_ba,270,270,0 script #barmunt_living 139,1,1,{
+que_ba,270,270,0 script #barmunt_living HIDDEN_WARP_NPC,1,1,{
//OnTouch2:
OnTouch:
mes "..................";
@@ -3884,17 +3884,17 @@ OnTouch:
end;
}
-que_ba,263,276,3 script #barmut_room2 755,{
+que_ba,263,276,3 script #barmut_room2 4_M_SAGE_C,{
end;
}
-que_ba,266,268,3 script #barmut_onna 982,{
+que_ba,266,268,3 script #barmut_onna 4_F_SCIENCE,{
OnInit:
disablenpc "#barmut_onna";
end;
}
-cave,82,97,3 script Cave Settler#g1 996,3,3,{
+cave,82,97,3 script Cave Settler#g1 4_M_CAVE1,3,3,{
if (barmunt_crow == 8) {
mes "[Cave Settler]";
mes "No outsiders are allowed beyond this point.";
@@ -4066,7 +4066,7 @@ OnTouch:
end;
}
-cave,85,101,3 script Jaeda#garas1 401,{
+cave,85,101,3 script Jaeda#garas1 4_M_MUT2,{
OnInit:
disablenpc "Jaeda#garas1";
end;
@@ -4078,7 +4078,7 @@ cave,97,21,0 warp case_out1 1,1,ein_fild01,28,255
cave,86,167,0 warp zid_in 1,1,cave,77,185
cave,79,180,0 warp zid_out 3,3,cave,90,162
-cave,22,186,3 script Monsterous Man#zid 999,{
+cave,22,186,3 script Monsterous Man#zid 4_M_MUT1,{
if (barmunt_crow == 9) {
mes "^660000You are looking at a man who appears as hideous as a monster.";
mes "He was the man with Eva that you saw in your dream. Of course, he's older now, and his age is showing in his face and skin.^000000";
@@ -4263,7 +4263,7 @@ cave,22,186,3 script Monsterous Man#zid 999,{
}
}
-cave,91,43,3 script Cave Settler#f_cave1 870,{
+cave,91,43,3 script Cave Settler#f_cave1 4_M_LGTPOOR,{
mes "[Cave Settler]";
mes "(Startled)";
next;
@@ -4272,7 +4272,7 @@ cave,91,43,3 script Cave Settler#f_cave1 870,{
close;
}
-cave,72,71,5 script Cave Settler#m_cave2 981,{
+cave,72,71,5 script Cave Settler#m_cave2 4_F_MUT2,{
mes "[Cave Settler]";
mes "Heh...";
mes "You want... This?";
@@ -4281,7 +4281,7 @@ cave,72,71,5 script Cave Settler#m_cave2 981,{
close;
}
-cave,134,62,1 script Cave Settler#m_cave3 981,{
+cave,134,62,1 script Cave Settler#m_cave3 4_F_MUT2,{
mes "[Cave Settler]";
mes "Accessory!";
mes "My pretty accessory!";
@@ -4290,7 +4290,7 @@ cave,134,62,1 script Cave Settler#m_cave3 981,{
close;
}
-cave,113,74,5 script Cave Settler#f_cave4 401,{
+cave,113,74,5 script Cave Settler#f_cave4 4_M_MUT2,{
mes "[Cave Settler]";
mes "No one in this village welcomes you. Go back.";
next;
@@ -4299,9 +4299,9 @@ cave,113,74,5 script Cave Settler#f_cave4 401,{
close;
}
-cave,76,39,5 shop Cave Girl#f_cave5 62,712:-1
+cave,76,39,5 shop Cave Girl#f_cave5 1_M_SIZ,712:-1
-cave,108,34,3 script Cave Settler#f_cave6 979,{
+cave,108,34,3 script Cave Settler#f_cave6 4_F_CAVE1,{
mes "[Cave Settler]";
mes "Hoho, did he really say that yesterday...?";
mes "Wah!";
@@ -4314,7 +4314,7 @@ cave,108,34,3 script Cave Settler#f_cave6 979,{
close;
}
-cave,105,32,7 script Cave Settler#f_cave7 979,{
+cave,105,32,7 script Cave Settler#f_cave7 4_F_CAVE1,{
mes "[Cave Settler]";
mes "Hoho, did he really say that yesterday...?";
mes "Wah!";
@@ -4329,7 +4329,7 @@ cave,105,32,7 script Cave Settler#f_cave7 979,{
// Succession of the Prince
// ============================================================
-prontera,153,353,4 script Messenger#prince1 105,{
+prontera,153,353,4 script Messenger#prince1 8W_SOLDIER,{
if (nk_prince == 0) {
if (rebirth_moc_edq > 1) {
mes "[Messenger]";
@@ -4452,7 +4452,7 @@ prontera,153,353,4 script Messenger#prince1 105,{
}
}
-prt_castle,117,163,5 script Inspector#prince 755,{
+prt_castle,117,163,5 script Inspector#prince 4_M_SAGE_C,{
if (checkquest(10004) == 0 || checkquest(10004) == 1) {
mes "[Inspector]";
mes "Judge!";
@@ -5349,7 +5349,7 @@ prt_castle,117,163,5 script Inspector#prince 755,{
}
}
-prt_castle,272,375,4 script Prince 881,{
+prt_castle,272,375,4 script Prince 4_M_SITDOWN,{
if (nk_prince > 6) {
mes "-Obssessed with making";
mes "lock and key.-";
@@ -5416,7 +5416,7 @@ prt_castle,272,375,4 script Prince 881,{
}
}
-prt_castle,274,372,4 script Servant#hans 48,{
+prt_castle,274,372,4 script Servant#hans 1_M_02,{
if (checkquest(10020) == 2) {
mes "[Hans]";
mes "Ahh... mmm... I...";
@@ -5500,7 +5500,7 @@ prt_castle,274,372,4 script Servant#hans 48,{
}
}
-prt_castle,339,202,3 script Prince#urgen 989,{
+prt_castle,339,202,3 script Prince#urgen 4_M_4THPRIN1,{
if (nk_prince > 6) {
mes "[Urugen]";
mes "...It is not beautiful.";
@@ -5603,7 +5603,7 @@ prt_castle,339,202,3 script Prince#urgen 989,{
}
}
-prt_castle,289,201,3 script Prince#helmut 991,{
+prt_castle,289,201,3 script Prince#helmut 4_M_5THPRIN1,{
if (nk_prince > 6) {
mes "[Helmut]";
mes "Such an idiot. I should have killed him earlier. Now I feel relieved.";
@@ -5784,7 +5784,7 @@ prt_castle,289,201,3 script Prince#helmut 991,{
}
}
-prt_castle,288,208,4 script Calbern 962,{
+prt_castle,288,208,4 script Calbern 4_M_RUSCHILD,{
mes "[Calbern]";
mes "How are you doing, sir?";
mes "I am the servant of Prince Helmut...";
@@ -5800,7 +5800,7 @@ prt_castle,288,208,4 script Calbern 962,{
close;
}
-prt_castle,391,205,3 script Prince#poe 993,{
+prt_castle,391,205,3 script Prince#poe 4_M_6THPRIN1,{
if (nk_prince > 6) {
mes "[Poe]";
mes "Whatever the condition is, he is just a loser in the match of life.";
@@ -6024,7 +6024,7 @@ prt_castle,391,205,3 script Prince#poe 993,{
}
}
-prt_castle,364,375,4 script Prince#peter 987,{
+prt_castle,364,375,4 script Prince#peter 4_M_3RDPRIN1,{
if (nk_prince > 6) {
mes "[Peter]";
mes "Appraiser.";
@@ -6207,7 +6207,7 @@ prt_castle,364,375,4 script Prince#peter 987,{
}
}
-aldebaran,132,184,3 script Girl#prince 96,{
+aldebaran,132,184,3 script Girl#prince 4W_KID,{
if (checkquest(10013) == 0 || checkquest(10013) == 1) {
if (countitem(744) > 0) {
mes "[Girl]";
@@ -6243,7 +6243,7 @@ aldebaran,132,184,3 script Girl#prince 96,{
}
}
-prt_castle,314,373,4 script Prince#eisen 983,{
+prt_castle,314,373,4 script Prince#eisen 4_M_1STPRIN1,{
if (nkprince_eisen > 2) {
if (nkprince_eisen == 3) {
mes "[Ahrum]";
@@ -6697,7 +6697,7 @@ prt_castle,314,373,4 script Prince#eisen 983,{
}
}
-prt_castle,368,312,4 script Prince#ern 985,{
+prt_castle,368,312,4 script Prince#ern 4_M_2NDPRIN1,{
if (checkquest(10024) == 2) {
mes "[Ernst]";
mes "...brother, if you want...";
@@ -6965,7 +6965,7 @@ OnTouch:
}
}
-prt_castle,156,325,4 script Young Noble#valter 86,{
+prt_castle,156,325,4 script Young Noble#valter 4_M_04,{
mes "[Young Noble Walter]";
mes "Step aside.";
mes "How dare you talk to him.";
@@ -6984,7 +6984,7 @@ OnDisable:
end;
}
-prt_castle,157,323,3 script Aged Noble#rihart 880,{
+prt_castle,157,323,3 script Aged Noble#rihart 4_M_MASKMAN,{
mes "[Aged Noble Richard]";
mes "Hmm-hmm.";
mes "What an indecorous person!";
@@ -7003,7 +7003,7 @@ OnDisable:
end;
}
-prt_castle,314,371,0 script Prince#another_ern 985,{
+prt_castle,314,371,0 script Prince#another_ern 4_M_2NDPRIN1,{
if (nkprince_eisen == 13) {
mes "[Ahrum]";
mes "I told you that I don't want to be king, and I don't have any intention to change my mind!";
@@ -7152,7 +7152,7 @@ OnDisable:
end;
}
-prt_castle,314,372,0 script Prince#another_ern1 985,{
+prt_castle,314,372,0 script Prince#another_ern1 4_M_2NDPRIN1,{
if (nkprince_eisen == 14) {
mes "[Ernst]";
mes "Bbb... Brother?... You... told me you would kill me... You just wanted to be killed by me??... Bbb...brother?...";
@@ -7257,7 +7257,7 @@ OnDisable:
end;
}
-prt_castle,272,372,1 script Prince#eisen1 983,{
+prt_castle,272,372,1 script Prince#eisen1 4_M_1STPRIN1,{
mes "[Ahrum]";
mes "Moron. You'll never be a king. All throughout your life... Don't you know it? Such a junk addict!!";
next;
@@ -7315,7 +7315,7 @@ OnDisable:
end;
}
-prt_castle,336,202,7 script Prince#eisen2 983,{
+prt_castle,336,202,7 script Prince#eisen2 4_M_1STPRIN1,{
mes "[Urugen]";
mes "What did you say? Ahrum?";
mes "Hey! What did you just say to me? Ahrum?!";
@@ -7373,7 +7373,7 @@ OnDisable:
end;
}
-prt_castle,286,201,7 script Prince#eisen3 983,{
+prt_castle,286,201,7 script Prince#eisen3 4_M_1STPRIN1,{
mes "[Ahrum]";
mes "Military maniac! Jerk! Do you think power can solve everything? In all situations, do you think people can live peacefully?!";
next;
@@ -7428,7 +7428,7 @@ OnDisable:
end;
}
-prt_castle,388,205,6 script Prince#eisen4 983,{
+prt_castle,388,205,6 script Prince#eisen4 4_M_1STPRIN1,{
mes "[Ahrum]";
mes "You always care about gambling. But, why don't you care about your surrondings first, eh? Young master of Richard?";
next;
@@ -7492,7 +7492,7 @@ OnDisable:
end;
}
-prt_castle,364,372,1 script Prince#eisen5 983,{
+prt_castle,364,372,1 script Prince#eisen5 4_M_1STPRIN1,{
mes "[Ahrum]";
mes "Peter, what will you do if your work doesn't mean anything?";
next;
@@ -7556,7 +7556,7 @@ OnDisable:
end;
}
-prt_castle,368,310,1 script Prince#eisen6 983,{
+prt_castle,368,310,1 script Prince#eisen6 4_M_1STPRIN1,{
mes "[Ernst]";
mes "Bro, tell me again. You just said something?";
next;
@@ -7643,7 +7643,7 @@ OnDisable:
end;
}
-prt_castle,318,276,0 script #eisen 45,1,1,{
+prt_castle,318,276,0 script #eisen WARPNPC,1,1,{
OnTouch:
if ((nkprince_eisen == 4) || (nkprince_eisen == 5)) {
donpcevent "Prince#another_ern::OnEnable";
@@ -7735,7 +7735,7 @@ OnTouch:
end;
}
-prt_castle,336,276,0 script #ern 45,1,1,{
+prt_castle,336,276,0 script #ern WARPNPC,1,1,{
OnTouch:
if (checkquest(10023) == 0 || checkquest(10023) == 1) {
donpcevent "Prince#eisen6::OnEnable";
@@ -7744,7 +7744,7 @@ OnTouch:
end;
}
-prt_castle,300,276,0 script #erich 45,1,1,{
+prt_castle,300,276,0 script #erich WARPNPC,1,1,{
OnTouch:
if (checkquest(10020) == 0 || checkquest(10020) == 1) {
donpcevent "Prince#eisen1::OnEnable";
@@ -7753,7 +7753,7 @@ OnTouch:
end;
}
-prt_castle,330,271,0 script #helmut 45,1,1,{
+prt_castle,330,271,0 script #helmut WARPNPC,1,1,{
OnTouch:
if (checkquest(10022) == 0 || checkquest(10022) == 1) {
donpcevent "Prince#eisen3::OnEnable";
@@ -7762,7 +7762,7 @@ OnTouch:
end;
}
-prt_castle,348,271,0 script #poe 45,1,1,{
+prt_castle,348,271,0 script #poe WARPNPC,1,1,{
OnTouch:
if (checkquest(10018) == 0 || checkquest(10018) == 1) {
donpcevent "Prince#eisen4::OnEnable";
@@ -7771,7 +7771,7 @@ OnTouch:
end;
}
-prt_castle,354,276,0 script #peter 45,1,1,{
+prt_castle,354,276,0 script #peter WARPNPC,1,1,{
OnTouch:;
if (checkquest(10019) == 0 || checkquest(10019) == 1) {
donpcevent "Prince#eisen5::OnEnable";
@@ -7780,7 +7780,7 @@ OnTouch:;
end;
}
-prt_castle,310,271,0 script #urgen 45,1,1,{
+prt_castle,310,271,0 script #urgen WARPNPC,1,1,{
OnTouch:
if (checkquest(10021) == 0 || checkquest(10021) == 1) {
donpcevent "Prince#eisen2::OnEnable";
@@ -7805,7 +7805,7 @@ prt_castle,225,318,0 warp #room12 1,1,prt_castle,276,263
prt_castle,273,264,0 warp #room22 1,1,prt_castle,221,318
prt_castle,221,308,0 warp #princeout 1,1,prt_castle,176,167
-prt_castle,176,170,5 script Guard#princein 105,{
+prt_castle,176,170,5 script Guard#princein 8W_SOLDIER,{
if (nk_prince > 4) {
mes "[Guard of a strange place]";
mes "You can go to the room where princes gather, through the hidden door. For security reasons, it is totally guarded and hidden.";
@@ -7823,7 +7823,7 @@ prt_castle,176,170,5 script Guard#princein 105,{
}
}
-prt_castle,121,168,0 script #arm 111,4,4,{
+prt_castle,121,168,0 script #arm HIDDEN_NPC,4,4,{
//OnTouch2:
OnTouch:
if (nk_prince == 8) {
@@ -7844,7 +7844,7 @@ OnTouch:
}
}
-prt_castle,316,313,0 script #arm1 111,3,3,{
+prt_castle,316,313,0 script #arm1 HIDDEN_NPC,3,3,{
//OnTouch2:
OnTouch:
if (nkprince_eisen > 14) {
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 4530757b1..6f00c6e7c 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -33,7 +33,7 @@
//----------------------------------------------------------------------------
// Berbayeff - Starting Point
//----------------------------------------------------------------------------
-moscovia,171,71,3 script Berbayeff#npc 968,{
+moscovia,171,71,3 script Berbayeff#npc 4_M_RUSMAN2,{
if (!mos_whale_edq) {
emotion e_an;
mes "[Berbayeff]";
@@ -249,7 +249,7 @@ moscovia,171,71,3 script Berbayeff#npc 968,{
//----------------------------------------------------------------------------
// Bulletin Board - List Tide Times
//----------------------------------------------------------------------------
-moscovia,135,52,0 script Bulletin Board#npc 837,{
+moscovia,135,52,0 script Bulletin Board#npc 2_BULLETIN_BOARD,{
mes "[Charabel Schedule]";
mes "NOTICE, due to the varying";
mes "tides here in Moscovia,";
@@ -269,7 +269,7 @@ moscovia,135,52,0 script Bulletin Board#npc 837,{
//----------------------------------------------------------------------------
// Mr. Ibanoff - Docks
//----------------------------------------------------------------------------
-moscovia,135,49,5 script Mr. Ibanoff#npc 964,{
+moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{
if (mos_whale_edq == 0) {
mes "[Mr. Ibanoff]";
mes "You are also an adventurer from another province. I also was a great adventurer.";
@@ -778,7 +778,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 964,{
//----------------------------------------------------------------------------
// Mr. Ibanoff - Ship
//----------------------------------------------------------------------------
-mosk_ship,98,110,3 script Mr. Ibanoff#npc2 964,{
+mosk_ship,98,110,3 script Mr. Ibanoff#npc2 4_M_RUSBALD,{
if (mos_whale_edq == 4) {
mes "[Mr. Ibanoff]";
mes "What a time for sailing!";
@@ -981,7 +981,7 @@ S_D_2:
//----------------------------------------------------------------------------
// Rudder
//----------------------------------------------------------------------------
-mosk_ship,101,111,4 script rudder#ship 111,{
+mosk_ship,101,111,4 script rudder#ship HIDDEN_NPC,{
if (mos_whale_edq == 5) {
callsub S_Rud1,1,0;
} else if (mos_whale_edq == 4) {
@@ -1170,7 +1170,7 @@ S_Rud1:
//----------------------------------------------------------------------------
// Aged Stranger - Whale Island
//----------------------------------------------------------------------------
-mosk_fild01,86,104,3 script Aged Stranger#npc 963,{
+mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{
if ((MaxWeight-Weight) < 2000) {
mes "[Aged Stranger]";
mes "You're carrying too many items.";
@@ -1806,7 +1806,7 @@ S_AS_3:
//----------------------------------------------------------------------------
// Csar Alexsay III - Moscovia Palace
//----------------------------------------------------------------------------
-mosk_in,131,92,3 script Csar Alexsay III#npc 965,{
+mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{
if ((MaxWeight-Weight) < 2000) {
mes "[Csar Alexsay III]";
mes "You're carrying too many items.";
@@ -2341,7 +2341,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 965,{
//----------------------------------------------------------------------------
// Prime Minister Dmitree - Moscovia Palace
//----------------------------------------------------------------------------
-mosk_in,127,89,3 script Prime Minister Dmitree#m 967,{
+mosk_in,127,89,3 script Prime Minister Dmitree#m 4_M_RUSMAN1,{
if (mos_nowinter > 11 && mos_nowinter < 14) {
mes "[Prime Minister Dmitree]";
mes "You are in trouble if";
@@ -2465,7 +2465,7 @@ mosk_in,127,89,3 script Prime Minister Dmitree#m 967,{
//----------------------------------------------------------------------------
// Island Trigger - Docks
//----------------------------------------------------------------------------
-moscovia,136,46,4 script Find#ship 844,4,4,{
+moscovia,136,46,4 script Find#ship CLEAR_NPC,4,4,{
end;
OnTouch:
@@ -2524,7 +2524,7 @@ OnInit:
end;
}
-mosk_ship,81,110,0 script #findship 844,5,5,{
+mosk_ship,81,110,0 script #findship CLEAR_NPC,5,5,{
OnInit:
disablenpc "#findship";
stopnpctimer;
@@ -2703,7 +2703,7 @@ function script F_MOS_1 {
close;
}
-mosk_in,144,279,5 script Gallina#mos 959,{
+mosk_in,144,279,5 script Gallina#mos 4_F_RUSWOMAN1,{
if (!mos_swan) {
callfunc("F_MOS_1");
} else if (mos_swan == 1) {
@@ -2767,7 +2767,7 @@ mosk_in,144,279,5 script Gallina#mos 959,{
//----------------------------------------------------------------------------
// Anna - Sister
//----------------------------------------------------------------------------
-mosk_in,148,274,1 script Anna#mos 958,{
+mosk_in,148,274,1 script Anna#mos 4_F_RUSCHILD,{
if (!mos_swan) {
callfunc("F_MOS_1");
} else if (mos_swan == 1) {
@@ -2949,7 +2949,7 @@ mosk_in,148,274,1 script Anna#mos 958,{
//----------------------------------------------------------------------------
// Bed
//----------------------------------------------------------------------------
-mosk_in,136,279,3 script Bed#mos1 111,{
+mosk_in,136,279,3 script Bed#mos1 HIDDEN_NPC,{
mes "- There are sheets and a pillow which seem so neat and soft that I'll probably fall asleep as soon as I lie down on them. -";
if (mos_swan != 11) close;
next;
@@ -2969,12 +2969,12 @@ mosk_in,136,279,3 script Bed#mos1 111,{
close;
}
-mosk_in,161,279,3 duplicate(Bed#mos1) Bed#mos2 111
+mosk_in,161,279,3 duplicate(Bed#mos1) Bed#mos2 HIDDEN_NPC
//----------------------------------------------------------------------------
// Fire pot + Mikhail
//----------------------------------------------------------------------------
-mosk_in,205,268,3 script Fire pot#mos 111,{
+mosk_in,205,268,3 script Fire pot#mos HIDDEN_NPC,{
if (!mos_swan) {
mes "- It's a fire pot to heat the room or bake something -";
close;
@@ -3155,7 +3155,7 @@ mosk_in,205,268,3 script Fire pot#mos 111,{
close;
}
-mosk_in,202,269,5 script Mikhail#mos 962,{
+mosk_in,202,269,5 script Mikhail#mos 4_M_RUSCHILD,{
end;
OnInit:
OnEnable:
@@ -3166,7 +3166,7 @@ OnEnable:
//----------------------------------------------------------------------------
// Sticky Herb Tree Inn NPCs
//----------------------------------------------------------------------------
-mosk_in,135,191,5 script Landlord#mos 961,{
+mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{
mes "[Landlord]";
mes "Oh, welcome to the Inn 'Sticky Herb Tree'.";
mes "It is the most comfortable and calmest place in all of Moscovia.";
@@ -3343,7 +3343,7 @@ mosk_in,135,191,5 script Landlord#mos 961,{
close;
}
-mosk_in,141,212,3 script Pub Owner#mos 964,{
+mosk_in,141,212,3 script Pub Owner#mos 4_M_RUSBALD,{
if ((MaxWeight-Weight) < 2000) {
mes "- Please stop here!! -";
mes "- You're carrying too many items -";
@@ -3505,7 +3505,7 @@ mosk_in,141,212,3 script Pub Owner#mos 964,{
close;
}
-mosk_in,147,202,3 script Victor#mos 968,{
+mosk_in,147,202,3 script Victor#mos 4_M_RUSMAN2,{
if ((MaxWeight-Weight) < 2000) {
mes "- Please stop here!! -";
mes "- You're carrying too many items -";
@@ -3725,7 +3725,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Swamp
//----------------------------------------------------------------------------
-mosk_dun03,153,90,3 script Bubbling Swamp#mos1 844,{
+mosk_dun03,153,90,3 script Bubbling Swamp#mos1 CLEAR_NPC,{
if ((MaxWeight-Weight) < 2000) {
mes "- Your bag is very heavy today -";
close;
@@ -3775,7 +3775,7 @@ mosk_dun03,153,90,3 script Bubbling Swamp#mos1 844,{
//----------------------------------------------------------------------------
// Larissa - Hotcake Quests
//----------------------------------------------------------------------------
-mosk_in,211,259,5 script Larissa#mos_01 960,{
+mosk_in,211,259,5 script Larissa#mos_01 4_F_RUSWOMAN2,{
if ((MaxWeight-Weight) < 2000) {
mes "- Please stop here !! -";
mes "- You're carrying too many items -";
@@ -3944,7 +3944,7 @@ mosk_in,211,259,5 script Larissa#mos_01 960,{
//----------------------------------------------------------------------------
// Acorn Dealer - Sells Acorns
//----------------------------------------------------------------------------
-moscovia,208,182,7 script Acorn Dealer#mos 967,{
+moscovia,208,182,7 script Acorn Dealer#mos 4_M_RUSMAN1,{
mes "[Acorn Dealer]";
mes "We have very fresh acorns. Everyone will like them!";
mes "You can buy one acorn for 100zeny!";
@@ -4117,7 +4117,7 @@ S_BS_1:
else if (.@stworld < 90) getitem 729,1;
return;
}
-mosk_fild01,113,108,3 duplicate(Squirrel#mos_main) Big Squirrel#mos 111
+mosk_fild01,113,108,3 duplicate(Squirrel#mos_main) Big Squirrel#mos HIDDEN_NPC
mosk_fild01,113,108,5 duplicate(Squirrel#mos_main) #mos_sq 1104,2,2
// Banish Winter :: mos_nowinter
@@ -4217,7 +4217,7 @@ OnTouch:
end;
}
-mosk_in,215,46,5 script Baba Yaga, the Horrible 970,{
+mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{
if (!mos_nowinter || mos_nowinter == 1) {
mes "[Baba Yaga, the Horrible]";
mes "Hohoho";
@@ -4960,7 +4960,7 @@ S_BY_1:
//----------------------------------------------------------------------------
// Book
//----------------------------------------------------------------------------
-mosk_in,217,45,0 script #book_russia 111,{
+mosk_in,217,45,0 script #book_russia HIDDEN_NPC,{
if (mos_nowinter == 15) {
mes "-Beside the pot,";
mes "There is an unusually large book.";
@@ -5207,7 +5207,7 @@ mosk_in,217,45,0 script #book_russia 111,{
//----------------------------------------------------------------------------
// Mixing Pot
//----------------------------------------------------------------------------
-mosk_in,221,43,0 script #bowl 111,{
+mosk_in,221,43,0 script #bowl HIDDEN_NPC,{
if (mos_nowinter != 16) end;
mes "-It is a very dirty pot.";
mes "Something is boiling";
@@ -5481,7 +5481,7 @@ mosk_in,221,43,0 script #bowl 111,{
//----------------------------------------------------------------------------
// Center of Town
//----------------------------------------------------------------------------
-moscovia,224,190,0 script #nowinterplz 844,{
+moscovia,224,190,0 script #nowinterplz CLEAR_NPC,{
if (mos_nowinter != 19) end;
if (countitem(7765)) {
mes "["+strcharinfo(0)+"]";
@@ -5521,7 +5521,7 @@ moscovia,224,190,0 script #nowinterplz 844,{
//----------------------------------------------------------------------------
// Villagers
//----------------------------------------------------------------------------
-moscovia,252,203,5 script A Little Girl#mos1 958,{
+moscovia,252,203,5 script A Little Girl#mos1 4_F_RUSCHILD,{
if (mos_nowinter == 10) {
if (mos_kid == 1) {
mes "[Yosefina]";
@@ -5564,7 +5564,7 @@ moscovia,252,203,5 script A Little Girl#mos1 958,{
close;
}
-moscovia,233,204,3 script A Young Man#mos2 968,{
+moscovia,233,204,3 script A Young Man#mos2 4_M_RUSMAN2,{
if (mos_nowinter == 10) {
if (mos_middle == 1) {
mes "[Fedor]";
@@ -5601,7 +5601,7 @@ moscovia,233,204,3 script A Young Man#mos2 968,{
close;
}
-moscovia,219,229,5 script A Middle-Aged Man#mos3 964,{
+moscovia,219,229,5 script A Middle-Aged Man#mos3 4_M_RUSBALD,{
if (mos_nowinter == 10) {
if (mos_elder == 1) {
mes "[Viktor]";
@@ -5644,7 +5644,7 @@ moscovia,219,229,5 script A Middle-Aged Man#mos3 964,{
close;
}
-moscovia,255,203,3 script A Little Boy#mos4 962,{
+moscovia,255,203,3 script A Little Boy#mos4 4_M_RUSCHILD,{
if (mos_nowinter == 10) {
if (mos_kid == 1) {
mes "[Vasili]";
@@ -5713,7 +5713,7 @@ moscovia,255,203,3 script A Little Boy#mos4 962,{
close;
}
-moscovia,204,188,5 script A Lady#mos5 959,{
+moscovia,204,188,5 script A Lady#mos5 4_F_RUSWOMAN1,{
if (mos_nowinter == 10) {
if (mos_middle == 1) {
mes "[Katya]";
@@ -5754,7 +5754,7 @@ moscovia,204,188,5 script A Lady#mos5 959,{
close;
}
-moscovia,167,97,3 script A Lady#mos6 961,{
+moscovia,167,97,3 script A Lady#mos6 4_F_RUSWOMAN3,{
if (mos_nowinter == 10) {
if (mos_elder == 1) {
mes "[Roza]";
@@ -5801,7 +5801,7 @@ moscovia,167,97,3 script A Lady#mos6 961,{
close;
}
-moscovia,202,102,3 script A Little Boy#mos7 962,{
+moscovia,202,102,3 script A Little Boy#mos7 4_M_RUSCHILD,{
if (mos_nowinter == 10) {
if (mos_kid == 1) {
mes "[Feliks]";
@@ -5865,7 +5865,7 @@ moscovia,202,102,3 script A Little Boy#mos7 962,{
close;
}
-moscovia,220,172,3 script A Young Man#mos8 968,{
+moscovia,220,172,3 script A Young Man#mos8 4_M_RUSMAN2,{
if (mos_nowinter == 10) {
if (mos_middle == 1) {
mes "[Ilyav]";
@@ -5909,7 +5909,7 @@ moscovia,220,172,3 script A Young Man#mos8 968,{
close;
}
-moscovia,253,175,3 script A Man#mos9 964,{
+moscovia,253,175,3 script A Man#mos9 4_M_RUSBALD,{
if (mos_nowinter == 10) {
if (mos_elder == 1) {
mes "[Orek]";
@@ -5954,7 +5954,7 @@ moscovia,253,175,3 script A Man#mos9 964,{
close;
}
-moscovia,168,135,3 script A Lady#mos10 961,{
+moscovia,168,135,3 script A Lady#mos10 4_F_RUSWOMAN3,{
if (mos_nowinter == 10) {
if (mos_elder == 1) {
mes "[Kyra]";
@@ -6008,7 +6008,7 @@ moscovia,168,135,3 script A Lady#mos10 961,{
close;
}
-moscovia,192,80,3 script A Lady#mos11 959,{
+moscovia,192,80,3 script A Lady#mos11 4_F_RUSWOMAN1,{
if (mos_nowinter == 10) {
if (mos_middle == 1) {
mes "[Sabina]";
@@ -6056,7 +6056,7 @@ moscovia,192,80,3 script A Lady#mos11 959,{
close;
}
-moscovia,211,215,5 script A Young Man#mos12 967,{
+moscovia,211,215,5 script A Young Man#mos12 4_M_RUSMAN1,{
if (mos_nowinter == 10) {
if (mos_middle == 1) {
mes "[Izlof]";
@@ -6114,7 +6114,7 @@ moscovia,211,215,5 script A Young Man#mos12 967,{
close;
}
-moscovia,149,112,3 script A Man#mos13 964,{
+moscovia,149,112,3 script A Man#mos13 4_M_RUSBALD,{
if (mos_nowinter == 10) {
if (mos_elder == 1) {
mes "[Lev]";
@@ -6163,7 +6163,7 @@ moscovia,149,112,3 script A Man#mos13 964,{
close;
}
-moscovia,196,71,3 script A Young Man#mos14 968,{
+moscovia,196,71,3 script A Young Man#mos14 4_M_RUSMAN2,{
if (mos_nowinter == 10) {
if (mos_middle == 1) {
mes "[Fredek]";
@@ -6213,7 +6213,7 @@ moscovia,196,71,3 script A Young Man#mos14 968,{
close;
}
-moscovia,234,168,5 script A Man#mos15 964,{
+moscovia,234,168,5 script A Man#mos15 4_M_RUSBALD,{
if (mos_nowinter == 10) {
if (mos_elder == 1) {
mes "[Gavrel]";
@@ -6260,7 +6260,7 @@ moscovia,234,168,5 script A Man#mos15 964,{
}
-moscovia,228,80,3 script A Little Boy#mos16 962,{
+moscovia,228,80,3 script A Little Boy#mos16 4_M_RUSCHILD,{
if (mos_nowinter == 10) {
if (mos_kid == 1) {
mes "[Rurik]";
@@ -6319,7 +6319,7 @@ moscovia,228,80,3 script A Little Boy#mos16 962,{
//----------------------------------------------------------------------------
// Magic Bottle
//----------------------------------------------------------------------------
-mosk_dun03,225,233,0 script Pile of skeletons#mosk 111,{
+mosk_dun03,225,233,0 script Pile of skeletons#mosk HIDDEN_NPC,{
if (mos_nowinter == 8) {
mes "-There are ugly skulls";
mes "all over here but, ";
@@ -6479,7 +6479,7 @@ mosk_in,131,92,3 script #Csar -1,7,7,{
// Shafka Hat :: mos_whale_edq
//============================================================
-moscovia,211,93,3 script Irina#edq 958,{
+moscovia,211,93,3 script Irina#edq 4_F_RUSCHILD,{
if (!checkweight(1201,1)) {
mes "Wait a moment!!";
mes "You have too many items.";
@@ -6592,7 +6592,7 @@ moscovia,211,93,3 script Irina#edq 958,{
//----------------------------------------------------------------------------
// Sage - Starting Point
//----------------------------------------------------------------------------
-mosk_fild02,198,252,3 script Sage#rus01 755,{
+mosk_fild02,198,252,3 script Sage#rus01 4_M_SAGE_C,{
if (!rhea_rus_main) {
mes "[Sage]";
mes "Ah, a foreigner,";
@@ -6680,7 +6680,7 @@ mosk_fild02,198,252,3 script Sage#rus01 755,{
//----------------------------------------------------------------------------
// Mysterious Stone
//----------------------------------------------------------------------------
-mosk_dun01,169,162,0 script Mysterious Stone#rus02 111,{
+mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{
if (!rhea_rus_main) {
mes "- The road forks here -";
close;
@@ -6778,7 +6778,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 111,{
//----------------------------------------------------------------------------
// Gray Wolf
//----------------------------------------------------------------------------
-mosk_dun01,167,160,3 script Gray Wolf#rus03 972,{
+mosk_dun01,167,160,3 script Gray Wolf#rus03 4_RUS_DWOLF,{
if (rhea_rus_main < 2) {
mes "[Gray Wolf]";
mes "... Turn back, adventurer...";
@@ -6901,7 +6901,7 @@ OnTimer120000:
//----------------------------------------------------------------------------
// Wall (Maria Morebna, Gray Wolf, Koshei)
//----------------------------------------------------------------------------
-mosk_dun01,45,259,0 script Wall#rus04 111,{
+mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{
if (rhea_rus_main < 5) {
mes "["+ strcharinfo(0) +"]";
mes "...?!";
@@ -7435,13 +7435,13 @@ OnTimer120000:
donpcevent strnpcinfo(0)+"::OnDisable";
end;
}
-mosk_dun01,50,256,3 duplicate(mos_rus#main) Gray Wolf#rus05 972
-mosk_dun01,46,256,3 duplicate(mos_rus#main) Maria Morebna#rus46 958
+mosk_dun01,50,256,3 duplicate(mos_rus#main) Gray Wolf#rus05 4_RUS_DWOLF
+mosk_dun01,46,256,3 duplicate(mos_rus#main) Maria Morebna#rus46 4_F_RUSCHILD
//----------------------------------------------------------------------------
// The Blacksmith (Golden Key)
//----------------------------------------------------------------------------
-moscovia,178,127,0 script The Blacksmith#rus06 63,{
+moscovia,178,127,0 script The Blacksmith#rus06 1_M_SMITH,{
if ((MaxWeight-Weight) < 3500) {
mes "[The Blacksmith]";
mes "Why are you carrying that much?";
@@ -7715,7 +7715,7 @@ moscovia,178,127,0 script The Blacksmith#rus06 63,{
//----------------------------------------------------------------------------
// Vassili Grandpapa (Red Ring)
//----------------------------------------------------------------------------
-moscovia,206,81,0 script Vassili Grandpapa#rus07 712,{
+moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{
if ((MaxWeight-Weight) < 3500) {
mes "[Vassili Grandpapa]";
mes "Why are you carring that much?";
@@ -7983,7 +7983,7 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 712,{
//----------------------------------------------------------------------------
// Ryubaba (Red Ring)
//----------------------------------------------------------------------------
-moscovia,213,216,3 script Ryubaba#rus08 960,{
+moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{
if ((MaxWeight-Weight) < 3500) {
mes "[Ryubaba]";
mes "What on earth do you have in your bag?";
@@ -8312,7 +8312,7 @@ moscovia,213,216,3 script Ryubaba#rus08 960,{
//----------------------------------------------------------------------------
// Little Boy (Ryubaba Info)
//----------------------------------------------------------------------------
-moscovia,223,210,3 script Little Boy#rus09 962,{
+moscovia,223,210,3 script Little Boy#rus09 4_M_RUSCHILD,{
if (rhea_rus_main < 8) {
mes "[Little Boy]";
mes "I will be an adventer and will marry the most beautiful bride!";
@@ -8377,7 +8377,7 @@ moscovia,223,210,3 script Little Boy#rus09 962,{
//----------------------------------------------------------------------------
// Shepherdess (Wooden Flute for Red Ring)
//----------------------------------------------------------------------------
-mosk_fild02,157,233,0 script Shepherdess#rus10 69,{
+mosk_fild02,157,233,0 script Shepherdess#rus10 1_F_04,{
if (rhea_rus_main < 8) {
mes "[Shepherdess]";
mes "Haaaa, boring, boring! Herding sheep is really boring!";
@@ -8541,19 +8541,19 @@ OnTimer60000:
donpcevent "Pointed Tree#rus11::OnEnable";
end;
}
-mosk_fild02,151,188,0 duplicate(PTree#rusmain) Pointed Tree#rus11 111
-mosk_fild02,160,227,0 duplicate(PTree#rusmain) Pointed Tree#rus12 111
-mosk_fild02,160,179,0 duplicate(PTree#rusmain) Pointed Tree#rus13 111
-mosk_fild02,142,247,0 duplicate(PTree#rusmain) Pointed Tree#rus14 111
-mosk_fild02,149,223,0 duplicate(PTree#rusmain) Pointed Tree#rus15 111
-mosk_fild02,114,223,0 duplicate(PTree#rusmain) Pointed Tree#rus16 111
-mosk_fild02,101,197,0 duplicate(PTree#rusmain) Pointed Tree#rus17 111
-mosk_fild02,125,182,0 duplicate(PTree#rusmain) Pointed Tree#rus18 111
+mosk_fild02,151,188,0 duplicate(PTree#rusmain) Pointed Tree#rus11 HIDDEN_NPC
+mosk_fild02,160,227,0 duplicate(PTree#rusmain) Pointed Tree#rus12 HIDDEN_NPC
+mosk_fild02,160,179,0 duplicate(PTree#rusmain) Pointed Tree#rus13 HIDDEN_NPC
+mosk_fild02,142,247,0 duplicate(PTree#rusmain) Pointed Tree#rus14 HIDDEN_NPC
+mosk_fild02,149,223,0 duplicate(PTree#rusmain) Pointed Tree#rus15 HIDDEN_NPC
+mosk_fild02,114,223,0 duplicate(PTree#rusmain) Pointed Tree#rus16 HIDDEN_NPC
+mosk_fild02,101,197,0 duplicate(PTree#rusmain) Pointed Tree#rus17 HIDDEN_NPC
+mosk_fild02,125,182,0 duplicate(PTree#rusmain) Pointed Tree#rus18 HIDDEN_NPC
//----------------------------------------------------------------------------
// Worried Mother (Lusalka's Hair)
//----------------------------------------------------------------------------
-moscovia,166,145,1 script Worried Mother#rus19 961,{
+moscovia,166,145,1 script Worried Mother#rus19 4_F_RUSWOMAN3,{
if (rhea_rus_main < 8) {
mes "[Worried Mother]";
mes "Where is she...";
@@ -8656,13 +8656,13 @@ moscovia,166,145,1 script Worried Mother#rus19 961,{
//----------------------------------------------------------------------------
// Marsh Warning Signs
//----------------------------------------------------------------------------
-- script Caution#07rus::NoSwim 837,{
+- script Caution#07rus::NoSwim 2_BULLETIN_BOARD,{
mes " WARNING !! ";
mes "No Swimming";
close;
}
-mosk_fild02,101,204,0 duplicate(NoSwim) Caution#rus01 837
-mosk_fild02,101,200,0 duplicate(NoSwim) Caution#rus02 837
+mosk_fild02,101,204,0 duplicate(NoSwim) Caution#rus01 2_BULLETIN_BOARD
+mosk_fild02,101,200,0 duplicate(NoSwim) Caution#rus02 2_BULLETIN_BOARD
//----------------------------------------------------------------------------
// Lusalka Trigger (Lusalka's Hair)
@@ -8750,7 +8750,7 @@ OnTouch:
//----------------------------------------------------------------------------
// Lusalka (Lusalka's Hair)
//----------------------------------------------------------------------------
-mosk_fild02,124,202,3 script Lusalka#rus23 971,{
+mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{
if (countitem(523)) {
if (rhea_rus_main < 8) {
mes "[Lusalka]";
@@ -8977,7 +8977,7 @@ OnTimer300000:
//----------------------------------------------------------------------------
// Wanderer (Lusalka's Hair)
//----------------------------------------------------------------------------
-prontera,228,279,3 script Wanderer#rus24 968,{
+prontera,228,279,3 script Wanderer#rus24 4_M_RUSMAN2,{
if (rhea_rus_main < 8) {
mes "[A Wanderer from a strange land]";
mes "Hey, there are so many adventurers around here. I can see why this is the capital of the Rune Midgarts Kingdom!";
@@ -9082,7 +9082,7 @@ prontera,228,279,3 script Wanderer#rus24 968,{
//----------------------------------------------------------------------------
// Morroc Villager (Lusalka's Hair)
//----------------------------------------------------------------------------
-morocc,165,82,0 script Morroc Villager#rus25 48,{
+morocc,165,82,0 script Morroc Villager#rus25 1_M_02,{
if (rhea_rus_main < 8) {
mes "[Morroc Villager]";
mes "Huh, more and more adventurers are settling here recently, so it's hard to tell who is a villager or an adventurer.";
@@ -9155,7 +9155,7 @@ morocc,165,82,0 script Morroc Villager#rus25 48,{
//----------------------------------------------------------------------------
// Soldier/Igor (Lusalka's Hair)
//----------------------------------------------------------------------------
-moc_pryd04,126,120,0 script Soldier#rus26 967,{
+moc_pryd04,126,120,0 script Soldier#rus26 4_M_RUSMAN1,{
if (rhea_rus_main < 8) {
mes "[A gloomy looking soldier]";
mes "............................";
@@ -9370,7 +9370,7 @@ OnTouch:
close;
}
-mosk_que,45,131,0 script Stone Furnace#rus28 111,{
+mosk_que,45,131,0 script Stone Furnace#rus28 HIDDEN_NPC,{
if (rhea_rus_main == 8) {
if (rhea_rus_quiz == 1) {
if (getequipid(EQI_SHOES) != 2429) {
@@ -9441,7 +9441,7 @@ OnTimer300000:
end;
}
-mosk_que,56,202,0 script Occult Apple Tree#rus29 111,{
+mosk_que,56,202,0 script Occult Apple Tree#rus29 HIDDEN_NPC,{
if (rhea_rus_main == 8) {
if (rhea_rus_quiz == 2) {
if (getequipid(EQI_SHOES) != 2429) {
@@ -9484,7 +9484,7 @@ mosk_que,47,217,0 warp Escape#rus30 1,1,mosk_fild02,237,266
//----------------------------------------------------------------------------
// Marozka (Golden Thread)
//----------------------------------------------------------------------------
-mosk_fild02,243,270,0 script Marozka#rus31 866,{
+mosk_fild02,243,270,0 script Marozka#rus31 4_M_LGTGRAND,{
if (rhea_rus_main < 8) {
mes "[Marozka]";
mes "...........................";
@@ -9642,7 +9642,7 @@ mosk_fild02,243,270,0 script Marozka#rus31 866,{
//----------------------------------------------------------------------------
// Baba Yaga (Golden Key)
//----------------------------------------------------------------------------
-mosk_dun02,48,214,5 script Baba Yaga#rus32 970,{
+mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{
if (rhea_rus_main < 9) {
mes "[Baba Yaga]";
mes "...........................";
@@ -10376,7 +10376,7 @@ OnMyMobDead:
//----------------------------------------------------------------------------
// Baba Yaga's Tasks (Golden Key)
//----------------------------------------------------------------------------
-mosk_dun02,257,193,0 script Cow#rus33 889,3,3,{
+mosk_dun02,257,193,0 script Cow#rus33 4_BULL,3,3,{
end;
OnInit:
enablenpc "Cow#rus33";
@@ -10474,7 +10474,7 @@ OnTouch:
close;
}
-mosk_dun02,257,193,0 script Cow#rus34 889,3,3,{
+mosk_dun02,257,193,0 script Cow#rus34 4_BULL,3,3,{
end;
OnInit:
enablenpc "Cow#rus34";
@@ -10573,7 +10573,7 @@ OnTouch:
close;
}
-mosk_dun02,257,193,0 script Cow#rus35 889,3,3,{
+mosk_dun02,257,193,0 script Cow#rus35 4_BULL,3,3,{
end;
OnInit:
enablenpc "Cow#rus35";
@@ -10661,7 +10661,7 @@ OnTouch:
close;
}
-mosk_dun02,65,232,0 script Noisy Coffin#rus36 801,{
+mosk_dun02,65,232,0 script Noisy Coffin#rus36 4_NFCOFFIN,{
if (rhea_rus_main < 16) {
mes "[Noisy Coffin]";
mes "Isn't it good to be alive? Isn't it good to live?";
@@ -10871,7 +10871,7 @@ mosk_dun02,65,232,0 script Noisy Coffin#rus36 801,{
close;
}
-treasure01,165,58,0 script Old Treasure Box#rus37 111,{
+treasure01,165,58,0 script Old Treasure Box#rus37 HIDDEN_NPC,{
if ((MaxWeight-Weight) < 3500) {
mes "You are carrying too much!";
mes "Lose some weight and try again.";
@@ -10956,7 +10956,7 @@ OnTimer180000:
end;
}
-treasure01,24,39,0 script Old Bed#rus38 111,{
+treasure01,24,39,0 script Old Bed#rus38 HIDDEN_NPC,{
if (rhea_rus_main == 21) {
mes "- An old bed covered with dust and must -";
next;
@@ -11041,7 +11041,7 @@ treasure01,24,39,0 script Old Bed#rus38 111,{
end;
}
-treasure01,98,119,0 script Dirty Wall#rus39 111,{
+treasure01,98,119,0 script Dirty Wall#rus39 HIDDEN_NPC,{
if (rhea_rus_main == 22 || (rhea_rus_main > 22 && rhea_rus_main < 26)) {
mes "- Something is engraved on the wall -";
next;
@@ -11055,7 +11055,7 @@ treasure01,98,119,0 script Dirty Wall#rus39 111,{
end;
}
-treasure01,61,183,0 script Old_Wooden_Box#rus40 111,{
+treasure01,61,183,0 script Old_Wooden_Box#rus40 HIDDEN_NPC,{
if (rhea_rus_main == 23) {
mes "- Something is glimmering inside of the box -";
next;
@@ -11078,7 +11078,7 @@ treasure01,61,183,0 script Old_Wooden_Box#rus40 111,{
end;
}
-treasure01,27,115,0 script Opened Treasure Chest#41 111,{
+treasure01,27,115,0 script Opened Treasure Chest#41 HIDDEN_NPC,{
if (rhea_rus_main == 24) {
mes "- You open the box, junk is in it -";
next;
@@ -11122,7 +11122,7 @@ treasure01,27,115,0 script Opened Treasure Chest#41 111,{
end;
}
-amatsu,233,234,3 script Momotoro Publisher#rus42 757,{
+amatsu,233,234,3 script Momotoro Publisher#rus42 4_F_JPN2,{
if ((MaxWeight-Weight) < 3500) {
mes "[Momotoro Publisher]";
mes "What on earth do you have in your bag?";
@@ -11201,7 +11201,7 @@ amatsu,233,234,3 script Momotoro Publisher#rus42 757,{
close;
}
-mosk_dun02,57,220,0 script House Ghost Jar#rus43 111,{
+mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{
if (rhea_rus_main == 31) {
mes "["+ strcharinfo(0) +"]";
mes "... Is it in here..? Hey, hey...";
@@ -11492,7 +11492,7 @@ OnMyMobDead:
end;
}
-payon,65,119,0 script Broom Grandma#rus44 78,{
+payon,65,119,0 script Broom Grandma#rus44 1_F_ORIENT_04,{
if (rhea_rus_main < 36) {
mes "[Broom Grandma]";
mes "A broom from Payon is the best!";
@@ -11549,7 +11549,7 @@ payon,65,119,0 script Broom Grandma#rus44 78,{
close;
}
-pay_dun04,163,186,0 script Ghost Tree#rus45 111,{
+pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{
if (rhea_rus_main == 37) {
mes "[Ghost Tree]";
mes "Errr, a human? What are you doing here? Do you want to play with me?";
@@ -11850,7 +11850,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 111,{
end;
}
-mosk_dun01,3,3,3 script Koshei GlobalVar#admin 958,{
+mosk_dun01,3,3,3 script Koshei GlobalVar#admin 4_F_RUSCHILD,{
callfunc "F_GM_NPC";
mes "[Koshei GlobalVar]";
mes "Please enter the password";
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 1fc4858b5..1c60feaee 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -86,7 +86,7 @@ OnTouch:
end;
}
-airplane_01,95,61,3 script Agent#pc1 899,{
+airplane_01,95,61,3 script Agent#pc1 4_M_HUMAN_02,{
end;
OnInit:
@@ -94,7 +94,7 @@ OnInit:
end;
}
-cmd_in02,174,89,7 script Ordinary Man#pc1 97,{
+cmd_in02,174,89,7 script Ordinary Man#pc1 4W_M_01,{
if (aru_monas < 2) {
mes "[Larjes]";
mes "Damn it, I lost again!";
@@ -145,7 +145,7 @@ cmd_in02,174,89,7 script Ordinary Man#pc1 97,{
}
}
-cmd_in02,111,52,3 script Ordinary Man#pc2 97,{
+cmd_in02,111,52,3 script Ordinary Man#pc2 4W_M_01,{
if (aru_monas < 3) {
mes "[Larjes]";
mes "^666666*Sigh...*^000000";
@@ -207,7 +207,7 @@ cmd_in02,111,52,3 script Ordinary Man#pc2 97,{
}
}
-ra_in01,308,59,1 script Waiter#pc 930,{
+ra_in01,308,59,1 script Waiter#pc 4_M_RACHMAN2,{
if (aru_monas < 7) {
mes "[Waiter]";
mes "Welcome to";
@@ -258,7 +258,7 @@ ra_in01,308,59,1 script Waiter#pc 930,{
close;
}
-ra_in01,301,50,3 script Normal-Looking Man 927,{
+ra_in01,301,50,3 script Normal-Looking Man 4_M_MASK,{
mes "[Normal-Looking Man]";
mes "Mmm-Mmm!";
mes "I love the food in";
@@ -269,7 +269,7 @@ ra_in01,301,50,3 script Normal-Looking Man 927,{
close;
}
-ra_in01,301,52,3 script Common-Looking Man 927,{
+ra_in01,301,52,3 script Common-Looking Man 4_M_MASK,{
mes "[Common-Looking Man]";
mes "The food here isn't bad,";
mes "but my favorite restaurants";
@@ -278,7 +278,7 @@ ra_in01,301,52,3 script Common-Looking Man 927,{
close;
}
-ra_in01,297,50,7 script Suspicious-Looking Man 926,{
+ra_in01,297,50,7 script Suspicious-Looking Man 4_M_MASK1,{
mes "[Suspicious-Looking Man]";
mes "Each dish has its own";
mes "unique taste that you must";
@@ -445,7 +445,7 @@ OnTouch:
end;
}
-ve_in,78,314,5 script Magistrate#Aru 945,{
+ve_in,78,314,5 script Magistrate#Aru 4_M_DST_GRAND,{
if (aru_monas < 8) {
mes "[Al Hamad]";
mes "Argh! Why must this";
@@ -640,7 +640,7 @@ ve_in,78,314,5 script Magistrate#Aru 945,{
}
}
-ve_in,81,296,3 script Soldier#Aru 946,{
+ve_in,81,296,3 script Soldier#Aru 4_M_DST_MASTER,{
if (aru_monas < 9) {
mes "[Himus]";
mes "Huh. The magistrate";
@@ -702,7 +702,7 @@ ve_in,81,296,3 script Soldier#Aru 946,{
}
}
-ve_in,239,115,0 script Drunkard#Aru 943,{
+ve_in,239,115,0 script Drunkard#Aru 4_M_DESERT,{
if (aru_monas < 14) {
mes "[Drunkard]";
mes "Man, I feel great! Hah hah!";
@@ -751,7 +751,7 @@ ve_in,239,115,0 script Drunkard#Aru 943,{
}
}
-ve_in,238,120,4 script Drunkard#Aru1 940,{
+ve_in,238,120,4 script Drunkard#Aru1 4_F_DESERT,{
mes "[Drunkard]";
mes "Hohohoho~";
mes "Oh~ Hohohoho~";
@@ -761,7 +761,7 @@ ve_in,238,120,4 script Drunkard#Aru1 940,{
close;
}
-ve_fild07,125,128,0 script Boat#Aru 111,{
+ve_fild07,125,128,0 script Boat#Aru HIDDEN_NPC,{
if (aru_monas < 16) {
mes "^3355FFThis boat seems to ";
mes "be in decent condition.";
@@ -885,7 +885,7 @@ ve_fild07,125,128,0 script Boat#Aru 111,{
}
}
-ve_fild07,128,130,1 script Secret Agent#Aru 97,{
+ve_fild07,128,130,1 script Secret Agent#Aru 4W_M_01,{
if (aru_monas == 16) {
mes "[Larjes]";
mes "Are you ready to go";
@@ -972,7 +972,7 @@ OnTouch:
end;
}
-nameless_i,127,207,0 script Dead Crow#Aru 111,{
+nameless_i,127,207,0 script Dead Crow#Aru HIDDEN_NPC,{
if (aru_monas < 17) {
mes "^3355FFThere is a dead crow on the ground.";
close;
@@ -1098,7 +1098,7 @@ OnTouch:
}
}
-nameless_in,13,58,6 script Larjes#Monastery 97,{
+nameless_in,13,58,6 script Larjes#Monastery 4W_M_01,{
mes "[Larjes]";
mes "Be careful. That guy";
mes "looks pretty dangerous.";
@@ -1132,7 +1132,7 @@ OnMyMobDead:
end;
}
-nameless_in,12,37,0 script Out_from_Monastery 45,1,1,{
+nameless_in,12,37,0 script Out_from_Monastery WARPNPC,1,1,{
end;
OnTouch:
@@ -1149,7 +1149,7 @@ OnInit:
-nameless_i,168,257,0 script outtoin_01#mo 45,1,1,{
+nameless_i,168,257,0 script outtoin_01#mo WARPNPC,1,1,{
end;
OnTouch:
@@ -1189,7 +1189,7 @@ OnTouch:
end;
}
-nameless_n,166,254,0 script Larjes#Monastery2 97,{
+nameless_n,166,254,0 script Larjes#Monastery2 4W_M_01,{
end;
OnInit:
@@ -1197,7 +1197,7 @@ OnInit:
end;
}
-nameless_i,259,218,3 script Larjes#Aru 97,{
+nameless_i,259,218,3 script Larjes#Aru 4W_M_01,{
if (aru_monas < 18) {
mes "[Larjes]";
mes "I don't like this place.";
@@ -1248,7 +1248,7 @@ nameless_i,259,218,3 script Larjes#Aru 97,{
}
}
-nameless_n,259,218,3 script Larjes#Boat1 97,{
+nameless_n,259,218,3 script Larjes#Boat1 4W_M_01,{
if (aru_monas == 24) {
if (countitem(7726) < 1) {
mes "[Larjes]";
@@ -1320,7 +1320,7 @@ nameless_n,259,218,3 script Larjes#Boat1 97,{
}
}
-abbey02,224,70,0 script Books#Mona1 111,{
+abbey02,224,70,0 script Books#Mona1 HIDDEN_NPC,{
if (checkweight(7766,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -1358,7 +1358,7 @@ abbey02,224,70,0 script Books#Mona1 111,{
}
}
-abbey03,232,233,4 script Man#King 956,{
+abbey03,232,233,4 script Man#King 4_M_TRISTAN,{
if (aru_monas < 22) {
mes "^3355FFYou find a man lying on";
mes "the floor, wearing torn";
@@ -1418,7 +1418,7 @@ OnTimer300000:
end;
}
-abbey03,232,232,4 script Dead Man#King 956,{
+abbey03,232,232,4 script Dead Man#King 4_M_TRISTAN,{
if (checkweight(7766,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -1465,7 +1465,7 @@ OnTimer150000:
end;
}
-nameless_n,145,162,0 script AideAmi#Aru 139,2,2,{
+nameless_n,145,162,0 script AideAmi#Aru HIDDEN_WARP_NPC,2,2,{
end;
OnTouch:
if (aru_monas == 26) {
@@ -1487,7 +1487,7 @@ OnTouch:
}
}
-sec_in02,15,15,4 script boss::boss_aru_monas 809,{
+sec_in02,15,15,4 script boss::boss_aru_monas 1_M_SIGNMONK,{
callfunc "F_GM_NPC";
mes "[Patch]";
mes "Input.";
@@ -1520,7 +1520,7 @@ sec_in02,15,15,4 script boss::boss_aru_monas 809,{
// Rachel Addition :: aruna_nir
//============================================================
-ra_temple,165,57,5 script Niren#ss 915,{
+ra_temple,165,57,5 script Niren#ss 4_F_MADAME,{
if (checkweight(907,200) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -2208,7 +2208,7 @@ ra_temple,165,57,5 script Niren#ss 915,{
end;
}
-ra_temple,168,54,3 script Sippie#ss 917,{
+ra_temple,168,54,3 script Sippie#ss 4_F_MASK,{
mes "[Sippie]";
mes "Now I finally have some";
mes "time to take a break.";
@@ -2257,7 +2257,7 @@ ra_temple,168,54,3 script Sippie#ss 917,{
// Peace to the Arunafeltz :: aruna_em
//============================================================
-moc_ruins,77,167,4 script Foreign Merchant#aru1 880,5,5,{
+moc_ruins,77,167,4 script Foreign Merchant#aru1 4_M_MASKMAN,5,5,{
if (aru_vol == 27) {
if (aru_em == 0) {
emotion e_dots;
@@ -2487,7 +2487,7 @@ OnTouch:
end;
}
-moc_ruins,101,133,7 script Foreign Merchant#aru2 929,{
+moc_ruins,101,133,7 script Foreign Merchant#aru2 4_M_MIDDLE,{
if ((aru_em > 1) && (aru_em < 7)) {
mes "["+ strcharinfo(0) +"]";
mes "Excuse me, but I heard";
@@ -2571,7 +2571,7 @@ OnInit:
end;
}
-ra_temin,103,151,7 script Female Follower#em 917,{
+ra_temin,103,151,7 script Female Follower#em 4_F_MASK,{
if (aru_em < 9) {
mes "[Sappie]";
mes "I work really hard to keep";
@@ -2666,7 +2666,7 @@ ra_temin,103,151,7 script Female Follower#em 917,{
}
}
-ra_fild03,139,355,5 script Ishmael#em 914,{
+ra_fild03,139,355,5 script Ishmael#em 4_F_CHILD,{
if (checkweight(907,200) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -2858,13 +2858,13 @@ ra_fild03,139,355,5 script Ishmael#em 914,{
}
}
-que_temsky,101,93,1 script Niren#em_sky 915,{
+que_temsky,101,93,1 script Niren#em_sky 4_F_MADAME,{
end;
}
-que_temsky,98,93,7 script Zhed#em_sky 932,{
+que_temsky,98,93,7 script Zhed#em_sky 4_M_RACHOLD1,{
end;
}
-que_temsky,99,100,6 script Pope#rachel2 936,{
+que_temsky,99,100,6 script Pope#rachel2 4_F_ARUNA_POP,{
end;
}
@@ -3213,7 +3213,7 @@ que_temsky,99,7,0 warp quetemskyout 1,1,ra_temin,276,231
// Muff's Loan :: zdan_total_edq
//============================================================
-comodo,224,187,3 script Muff 86,{
+comodo,224,187,3 script Muff 4_M_04,{
if (checkweight(907,200) == 0) {
mes "[Muff]";
mes "You're carrying way too";
@@ -3594,7 +3594,7 @@ comodo,224,187,3 script Muff 86,{
close;
}
-alberta,127,143,3 script Belder 85,{
+alberta,127,143,3 script Belder 4_M_03,{
if (diamond_edq == 0) {
mes "[Belder]";
mes "I ought to hire some";
@@ -3704,7 +3704,7 @@ OnTouch:
end;
}
-cmd_fild01,55,160,0 script Heap of Earth 844,{
+cmd_fild01,55,160,0 script Heap of Earth CLEAR_NPC,{
if (diamond_edq == 1) {
mes "^3355FFIt looks like someone";
mes "dug a hole in the ground,";
@@ -4282,7 +4282,7 @@ OnTouch:
end;
}
-izlude_in,113,66,0 script Strange Machine 111,{
+izlude_in,113,66,0 script Strange Machine HIDDEN_NPC,{
if (checkweight(907,200) == 0) {
mes "[Dorian]";
mes "Ugh, just like a member";
@@ -4660,7 +4660,7 @@ izlude_in,113,66,0 script Strange Machine 111,{
// Broken Diamond
//============================================================
-moc_ruins,152,147,5 script Ibrahim 732,3,3,{
+moc_ruins,152,147,5 script Ibrahim 4_M_JOB_HUNTER,3,3,{
if (checkweight(907,200) == 0) {
mes "[Ibrahim]";
mes "You're carrying too much";
@@ -5186,7 +5186,7 @@ if ((diamond_edq == 14) && (BaseLevel > 65)) {
end;
}
-alberta,102,80,3 script Jhonnita 86,{
+alberta,102,80,3 script Jhonnita 4_M_04,{
if ((diamond_edq == 15) || (diamond_edq == 16)) {
mes "[Jhonnita]";
mes "Oh, it's always nice";
@@ -5347,7 +5347,7 @@ alberta,102,80,3 script Jhonnita 86,{
}
}
-payon,69,65,5 script Kimeunbang 89,{
+payon,69,65,5 script Kimeunbang 4_M_ORIENT02,{
if (diamond_edq == 15) {
mes "[Kimeunbang]";
mes "Zzzz... Huh?";
@@ -5480,7 +5480,7 @@ payon,69,65,5 script Kimeunbang 89,{
}
}
-geffen,128,153,3 script Leblo 883,{
+geffen,128,153,3 script Leblo 4_M_ALCHE_D,{
if ((diamond_edq == 15) || (diamond_edq == 16)) {
mes "[Leblo]";
mes "Oh, I've heard about";
@@ -5692,7 +5692,7 @@ geffen,128,153,3 script Leblo 883,{
close;
}
-payon_in03,167,149,3 script Wola 75,2,2,{
+payon_in03,167,149,3 script Wola 1_F_ORIENT_01,2,2,{
if (checkweight(907,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -6034,7 +6034,7 @@ OnTouch:
end;
}
-in_rogue,366,46,3 script Rogue Investigator 828,{
+in_rogue,366,46,3 script Rogue Investigator 4_M_ROGUE,{
if ((diamond_edq == 22) && (BaseJob == Job_Rogue)) {
mes "[Investigator]";
mes "Oh, remember me?";
@@ -6233,7 +6233,7 @@ in_rogue,366,46,3 script Rogue Investigator 828,{
close;
}
-cmd_in02,94,208,5 script Investigator 828,{
+cmd_in02,94,208,5 script Investigator 4_M_ROGUE,{
if ((diamond_edq == 22) || (diamond_edq == 23)) {
if (BaseJob == Job_Rogue) {
mes "[Investigator]";
@@ -6272,7 +6272,7 @@ cmd_in02,94,208,5 script Investigator 828,{
}
}
-cmd_in02,69,188,1 script Small Safe 844,{
+cmd_in02,69,188,1 script Small Safe CLEAR_NPC,{
if ((diamond_edq == 22) || (diamond_edq == 23)) {
mes "^3355FFThere is a small";
mes "safe hidden under the";
@@ -6330,7 +6330,7 @@ cmd_in02,69,188,1 script Small Safe 844,{
close;
}
-cmd_in02,69,196,0 script Odd Switch#Switch1 844,{
+cmd_in02,69,196,0 script Odd Switch#Switch1 CLEAR_NPC,{
if ((diamond_edq == 22) || (diamond_edq == 23)) {
mes "^3355FFThere is a tiny";
mes "switch on the ground";
@@ -6358,7 +6358,7 @@ OnInit:
end;
}
-cmd_in02,80,189,0 script Odd Switch#Switch2 844,{
+cmd_in02,80,189,0 script Odd Switch#Switch2 CLEAR_NPC,{
if ((diamond_edq == 22) || (diamond_edq == 23)) {
mes "^3355FFThere is a tiny";
mes "switch on the ground";
@@ -6390,7 +6390,7 @@ OnInit:
// Z-Gang Quest
//============================================================
-prontera,150,326,0 script Wanted Notice#edq 111,{
+prontera,150,326,0 script Wanted Notice#edq HIDDEN_NPC,{
if (zdan_edq == 0) {
mes "====National Wanted Notice====";
mes "Please report any information";
@@ -6478,7 +6478,7 @@ OnDisable:
end;
}
-prontera,148,326,3 script Chief Officer#edq 734,{
+prontera,148,326,3 script Chief Officer#edq 4_M_JOB_KNIGHT2,{
if (checkweight(907,200) == 0) {
mes "[Chief Officer]";
mes "You're carrying far too";
@@ -6699,7 +6699,7 @@ prontera,148,326,3 script Chief Officer#edq 734,{
close;
}
-prt_in,168,18,1 script Valdes 65,2,2,{
+prt_in,168,18,1 script Valdes 1_M_YOUNGKNIGHT,2,2,{
if (checkweight(907,100) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -6886,7 +6886,7 @@ OnTouch:
end;
}
-in_rogue,359,116,3 script Marybell 747,{
+in_rogue,359,116,3 script Marybell 4_F_ROGUE,{
if (zdan_edq == 4) {
mes "[Marybell]";
mes "Hey. What do you want?";
@@ -7287,7 +7287,7 @@ in_rogue,359,116,3 script Marybell 747,{
}
}
-payon,244,62,3 script Moonho Ahn 897,{
+payon,244,62,3 script Moonho Ahn 4_M_HUGRANFA,{
if (zdan_edq == 5) {
mes "[Moonho Ahn]";
mes "Hahaha, now what brings";
@@ -7836,7 +7836,7 @@ payon,244,62,3 script Moonho Ahn 897,{
close;
}
-payon,192,176,3 script Gooho Ahn 903,{
+payon,192,176,3 script Gooho Ahn 4_M_KHKYEL,{
if (zdan_edq == 12) {
mes "[Gooho Ahn]";
mes "Oh, hello";
@@ -8044,7 +8044,7 @@ payon,192,176,3 script Gooho Ahn 903,{
close;
}
-moc_ruins,90,67,3 script Suspicious Man#1 99,2,2,{
+moc_ruins,90,67,3 script Suspicious Man#1 4W_M_03,2,2,{
if ((zdan_edq == 9) && ($@zdan == 0)) {
set $@zdan,1;
initnpctimer;
@@ -8291,7 +8291,7 @@ OnTouch:
}
//Incorrect position.
-moc_ruins,78,167,3 script Suspicious Man#2 99,2,2,{
+moc_ruins,78,167,3 script Suspicious Man#2 4W_M_03,2,2,{
if ((zdan_edq == 9) && ($@zdan == 0)) {
set $@zdan,1;
initnpctimer;
@@ -8539,7 +8539,7 @@ OnTouch:
end;
}
-moc_fild17,209,235,0 script Odd Slab 111,4,4,{
+moc_fild17,209,235,0 script Odd Slab HIDDEN_NPC,4,4,{
if (((zdan_edq == 15) || (zdan_edq == 16) || (zdan_edq == 17)) && ($@door2 == 0)) {
mes "[Odd Slab]";
mes "^FF0000*Creak Creak*";
@@ -8785,7 +8785,7 @@ OnTouch:
end;
}
-z_agit,1,1,0 script #zdan_broad 111,{
+z_agit,1,1,0 script #zdan_broad HIDDEN_NPC,{
OnInit:
disablenpc "#zdan_broad";
stopnpctimer;
@@ -8930,7 +8930,7 @@ OnTimer300000:
end;
}
-z_agit,97,101,3 script Louis 931,{
+z_agit,97,101,3 script Louis 4_M_RACHMAN1,{
if (checkweight(907,200) == 0) {
mes "[Louis]";
mes "You mess with the";
@@ -9050,7 +9050,7 @@ OnInit:
end;
}
-z_agit,99,101,3 script Martha 101,{
+z_agit,99,101,3 script Martha 4W_F_01,{
if (checkweight(907,200) == 0) {
mes "[Martha]";
mes "Hey, you're carrying";
@@ -9174,7 +9174,7 @@ OnInit:
end;
}
-z_agit,95,101,3 script Catfoii 876,{
+z_agit,95,101,3 script Catfoii 4_CAT,{
if (checkweight(907,200) == 0) {
mes "[Catfoii]";
mes "You're carrying too";
@@ -9296,7 +9296,7 @@ OnInit:
// Unlucky Emerald
//============================================================
-morocc,143,63,3 script Ragged Man#nd 929,{
+morocc,143,63,3 script Ragged Man#nd 4_M_MIDDLE,{
if (treasure_nd == 0) {
mes "[Ragged Man]";
mes "H-hello? Would you help me?";
@@ -9537,7 +9537,7 @@ morocc,143,63,3 script Ragged Man#nd 929,{
}
}
-morocc,102,298,3 script Man#zgang 98,{
+morocc,102,298,3 script Man#zgang 4W_M_02,{
if (treasure_nd < 2) {
mes "[Man]";
mes "What do you want?";
@@ -9933,7 +9933,7 @@ morocc,102,298,3 script Man#zgang 98,{
}
}
-comodo,339,224,3 script Man in Hiding#nd 881,{
+comodo,339,224,3 script Man in Hiding#nd 4_M_SITDOWN,{
if (treasure_nd < 7) {
mes "[Man in Hiding]";
mes "Whoa, don't get so close!";
@@ -10136,7 +10136,7 @@ comodo,339,224,3 script Man in Hiding#nd 881,{
}
}
-moc_fild18,108,116,0 script #treasure 844,{
+moc_fild18,108,116,0 script #treasure CLEAR_NPC,{
if (checkweight(907,300) == 0) {
mes "^3355FFYou're carrying too many";
mes "items: there's no way you";
@@ -10248,7 +10248,7 @@ moc_fild18,108,116,0 script #treasure 844,{
}
}
-comodo,139,184,3 script Scholar#zgang 742,{
+comodo,139,184,3 script Scholar#zgang 2_M_SAGE_B,{
if (jewel_nd < 9) {
mes "[Scholar]";
mes "I'm an antique appraiser.";
@@ -10409,7 +10409,7 @@ comodo,139,184,3 script Scholar#zgang 742,{
}
}
-alberta_in,70,109,5 script Shaman 788,{
+alberta_in,70,109,5 script Shaman 4_M_UMOLDMAN,{
if (jewel_nd == 0) {
mes "[Shaman]";
mes "The spiritual realm is";
@@ -10826,7 +10826,7 @@ alberta_in,70,109,5 script Shaman 788,{
}
}
-yuno_in04,38,48,3 script Archeologist 55,{
+yuno_in04,38,48,3 script Archeologist 1_M_JOBTESTER,{
if (jewel_nd < 18) {
mes "[Archeologist]";
mes "There's so much to do!";
@@ -11025,7 +11025,7 @@ yuno_in04,38,48,3 script Archeologist 55,{
}
}
-prontera,140,304,5 script Old Soldier 901,{
+prontera,140,304,5 script Old Soldier 4_M_HUOLDARMY,{
if (checkweight(907,200) == 0) {
mes "[Retired Soldier]";
mes "Why are you carrying";
@@ -11322,7 +11322,7 @@ prontera,140,304,5 script Old Soldier 901,{
}
}
-gef_fild08,182,185,0 script The Wanderer 739,{
+gef_fild08,182,185,0 script The Wanderer 8_DOPPEL,{
if (jewel_nd < 21) {
mes "[The Wanderer]";
mes "I'm just a wanderer";
@@ -11687,7 +11687,7 @@ OnTouch:
// Rogue Guild Investigation
//============================================================
-prontera,163,204,3 script Man from Morroc 99,{
+prontera,163,204,3 script Man from Morroc 4W_M_03,{
if (rumour_nd == 0) {
mes "[Morroc Traveler]";
mes "Ah, it's very nice and";
@@ -11753,7 +11753,7 @@ prontera,163,204,3 script Man from Morroc 99,{
}
}
-in_rogue,355,28,5 script Rogue Agent 118,{
+in_rogue,355,28,5 script Rogue Agent 2_M_THIEFMASTER,{
if (checkweight(907,200) == 0) {
mes "[Guildsman]";
mes "You're carrying too";
@@ -11956,7 +11956,7 @@ in_rogue,355,28,5 script Rogue Agent 118,{
}
}
-aldebaran,114,56,5 script Rogue Agent#nd0 828,{
+aldebaran,114,56,5 script Rogue Agent#nd0 4_M_ROGUE,{
if (rumour_nd < 3) {
mes "[Agent]";
mes "Listen, I'm working on";
@@ -12088,7 +12088,7 @@ aldebaran,114,56,5 script Rogue Agent#nd0 828,{
}
}
-geffen,91,36,5 script Rogue Guild Agent#nd1 828,{
+geffen,91,36,5 script Rogue Guild Agent#nd1 4_M_ROGUE,{
if (rumour_nd < 4) {
if (zdan_edq > 12) {
mes "[Rogue Guild Agent]";
@@ -12465,7 +12465,7 @@ geffen,91,36,5 script Rogue Guild Agent#nd1 828,{
}
}
-payon,209,44,5 script Rogue Guild Agent#nd2 828,{
+payon,209,44,5 script Rogue Guild Agent#nd2 4_M_ROGUE,{
if (rumour_nd < 3) {
mes "[Agent]";
mes "What? You want somethin'?";
@@ -12947,7 +12947,7 @@ payon,209,44,5 script Rogue Guild Agent#nd2 828,{
}
}
-comodo,233,199,5 script Rogue Guild Agent#nd3 810,{
+comodo,233,199,5 script Rogue Guild Agent#nd3 1_M_SIGNROGUE,{
if (checkweight(907,200) == 0) {
mes "[Agent]";
mes "You've got too many";
@@ -13229,7 +13229,7 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 810,{
}
}
-morocc,116,39,3 script Rogue Guild Agent#nd4 779,{
+morocc,116,39,3 script Rogue Guild Agent#nd4 4_M_YOYOROGUE,{
if (rumour_nd == 1) {
mes "[Agent]";
mes "A case? What are you...?";
diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt
index 94bf2d25e..6bb2c08ba 100644
--- a/npc/quests/quests_niflheim.txt
+++ b/npc/quests/quests_niflheim.txt
@@ -29,7 +29,7 @@
// Piano Quest :: nif_ryu
//============================================================
-niflheim,224,243,3 script Alreg#nif 795,{
+niflheim,224,243,3 script Alreg#nif 4_M_NFDEADMAN,{
if (nif_piano) set nif_piano,0;
mes "[Alreg]";
mes "Me like meat, muheh.";
@@ -67,7 +67,7 @@ niflheim,224,243,3 script Alreg#nif 795,{
close;
}
-nif_in,105,81,3 script Crayu#nif 794,{
+nif_in,105,81,3 script Crayu#nif 4_M_NFDEADMAN2,{
mes "[Crayu]";
mes "Living one...";
mes "Listen to this song...";
@@ -140,7 +140,7 @@ nif_in,105,81,3 script Crayu#nif 794,{
close;
}
-nif_in,31,20,3 script Kuzkahina#nif 794,{
+nif_in,31,20,3 script Kuzkahina#nif 4_M_NFDEADMAN2,{
if (nif_esc == 2 || nif_esc == 3) {
mes "[Kuzkahina]";
mes "I don't understand";
@@ -173,7 +173,7 @@ nif_in,31,20,3 script Kuzkahina#nif 794,{
close;
}
-niflheim,208,103,1 script #Graveyard1 111,1,1,{
+niflheim,208,103,1 script #Graveyard1 HIDDEN_NPC,1,1,{
end;
OnTouch:
@@ -195,7 +195,7 @@ OnTouch:
end;
}
-niflheim,169,71,1 script #Graveyard2 111,1,1,{
+niflheim,169,71,1 script #Graveyard2 HIDDEN_NPC,1,1,{
end;
OnTouch:
@@ -214,7 +214,7 @@ OnTouch:
end;
}
-nif_in,115,181,0 script #Piano 111,1,1,{
+nif_in,115,181,0 script #Piano HIDDEN_NPC,1,1,{
end;
OnTouch:
@@ -247,7 +247,7 @@ OnTouch:
end;
}
-nif_in,114,181,0 script #Piano3 111,1,1,{
+nif_in,114,181,0 script #Piano3 HIDDEN_NPC,1,1,{
end;
OnTouch:
@@ -273,7 +273,7 @@ OnTouch:
end;
}
-nif_in,188,168,3 script Witch#nif 792,{
+nif_in,188,168,3 script Witch#nif 4_F_NFDEADMGCIAN,{
mes "[Kirkena]";
mes "Huh? ...You're alive, aren't you?";
mes "I'm not sure how more of you are";
@@ -295,7 +295,7 @@ nif_in,188,168,3 script Witch#nif 792,{
// Message Delivery Quest :: nif_npc_lackee
//============================================================
-prt_in,161,20,3 script Erious#nif 92,{
+prt_in,161,20,3 script Erious#nif 4_F_03,{
if (MISC_QUEST & 16384) {
mes "[Erious]";
mes "I wish you safety from harm";
@@ -505,7 +505,7 @@ prt_in,161,20,3 script Erious#nif 92,{
end;
}
-umbala,215,181,3 script Billik 733,{
+umbala,215,181,3 script Billik 4_M_JOB_KNIGHT1,{
if (nif_revive > 1 || MISC_QUEST & 16384) {
mes "[Billik]";
mes "Well, long time no see.";
@@ -570,7 +570,7 @@ umbala,215,181,3 script Billik 733,{
}
}
-niflheim,153,215,3 script Feylin 794,{
+niflheim,153,215,3 script Feylin 4_M_NFDEADMAN2,{
if (nif_revive == 2) {
mes "[Feylin]";
mes "Poor "+((Sex)?"guy":"girl")+"...";
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index 5872420fa..d412c9615 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -19,7 +19,7 @@
// 'Pretend Murdered' Quest
//============================================================
-payon_in01,99,72,4 script Granny 103,{
+payon_in01,99,72,4 script Granny 8_F_GRANDMOTHER,{
if (checkweight(908,1) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
@@ -71,7 +71,7 @@ payon_in01,99,72,4 script Granny 103,{
// 'Ear Muffs' Quest
//============================================================
-payon_in01,18,10,4 script Mystic Lady 76,{
+payon_in01,18,10,4 script Mystic Lady 1_F_ORIENT_02,{
mes "[Mystic Lady]";
mes "My family has produced and sold the special Winter product ^3355FFEar Muffs^000000 for many years. We just moved here, but the weather is always warm so we can hardly make a living.";
next;
@@ -119,7 +119,7 @@ payon_in01,18,10,4 script Mystic Lady 76,{
// 'Oxygen Mask' Quest
//============================================================
-payon_in02,25,71,4 script Boy 86,{
+payon_in02,25,71,4 script Boy 4_M_04,{
if (countitem(701) > 4) {
mes "[Young Man]";
mes "ArrrGggghh!";
@@ -214,7 +214,7 @@ payon_in02,25,71,4 script Boy 86,{
// 'Helm of Angel' and 'Deviruchi Cap' Quest
//============================================================
-payon_in01,56,12,7 script Young man#12 89,{
+payon_in01,56,12,7 script Young man#12 4_M_ORIENT02,{
mes "[Young man]";
mes "...What is it?";
next;
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index 9d207c088..59a16deb6 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -51,7 +51,7 @@
// Prontera Culvert :: prt_npc
//============================================================
-prt_in,88,105,2 script Recruiter 105,{
+prt_in,88,105,2 script Recruiter 8W_SOLDIER,{
if (MISC_QUEST & 8) {
mes "[Recruiter]";
mes "Ah...";
@@ -143,7 +143,7 @@ S_Volunteer:
return;
}
-prt_fild05,270,212,5 script Culvert Guardian 105,{
+prt_fild05,270,212,5 script Culvert Guardian 8W_SOLDIER,{
if (MISC_QUEST & 8) {
mes "[Culvert Guardian]";
mes "Ah, you're one of our volunteers. This is the entrance of the Prontera Culvert.";
@@ -166,7 +166,7 @@ prt_fild05,270,212,5 script Culvert Guardian 105,{
// Ph.D Hat Quest :: npc_6cript
//============================================================
-prt_in,38,108,4 script Teacher 53,{
+prt_in,38,108,4 script Teacher 1_M_INNKEEPER,{
if ((countitem(710) > 0) && (countitem(703) > 0) && (countitem(704) > 0) && (countitem(708) > 0)) {
mes "[Teacher]";
mes "Oh...";
@@ -250,7 +250,7 @@ prt_in,38,108,4 script Teacher 53,{
// Gaebolg Family Curse :: prt_curse
//============================================================
-prontera,248,212,3 script Busy Boy#prt 706,3,3,{
+prontera,248,212,3 script Busy Boy#prt 4_M_KID1,3,3,{
callsub S_CheckWeight; //Check Player's weight
if (BaseLevel > 59) {
if (prt_curse == 0) {
@@ -581,7 +581,7 @@ S_CheckWeight:
return;
}
-yuno,311,195,3 script Historian#prt01 754,{
+yuno,311,195,3 script Historian#prt01 4_M_SAGE_A,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -932,7 +932,7 @@ yuno,311,195,3 script Historian#prt01 754,{
}
}
-morocc_in,45,126,3 script Historian#prt02 702,{
+morocc_in,45,126,3 script Historian#prt02 4_F_GON,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -1366,7 +1366,7 @@ S_GiveName:
close;
}
-mjolnir_01,135,168,3 script Historian#prt03 754,{
+mjolnir_01,135,168,3 script Historian#prt03 4_M_SAGE_A,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -1603,13 +1603,13 @@ OnTouch:
end;
}
-mjolnir_01,312,269,5 script Dog#prt 81,{
+mjolnir_01,312,269,5 script Dog#prt 4_DOG01,{
mes "[Dog]";
mes "Bow Wow!";
close;
}
-mjolnir_01,313,269,5 script Dazed Boy#prt 706,{
+mjolnir_01,313,269,5 script Dazed Boy#prt 4_M_KID1,{
if (prt_curse == 11) {
mes "[Absent-Minded Boy]";
mes "The great serpent";
@@ -1757,7 +1757,7 @@ mjolnir_01,313,269,5 script Dazed Boy#prt 706,{
}
}
-mjolnir_01,316,268,3 script Exhausted-Looking Woman 879,{
+mjolnir_01,316,268,3 script Exhausted-Looking Woman 4_F_CAPEGIRL,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -2174,7 +2174,7 @@ mjolnir_01,316,268,3 script Exhausted-Looking Woman 879,{
prt_church,115,122,0 warp #sazekan 1,1,prt_church,168,106
prt_church,166,106,0 warp #prtchhall 1,1,prt_church,112,122
-prt_church,185,106,3 script Father Bamph 60,{
+prt_church,185,106,3 script Father Bamph 1_M_PASTOR,{
if (prt_curse == 13) {
mes "[Father Bamph]";
mes "Welcome to";
@@ -2960,7 +2960,7 @@ prt_church,185,106,3 script Father Bamph 60,{
}
}
-prt_church,184,110,3 script Father Biscuss 60,{
+prt_church,184,110,3 script Father Biscuss 1_M_PASTOR,{
if (prt_curse == 54) {
mes "[Father Biscuss]";
mes "Hmm, I still suspect that";
@@ -3041,14 +3041,14 @@ prt_church,184,110,3 script Father Biscuss 60,{
}
}
-prt_church,177,113,3 script #gototomb 111,{
+prt_church,177,113,3 script #gototomb HIDDEN_NPC,{
if (prt_curse > 17 && prt_curse < 23 || prt_curse > 31 && prt_curse < 35 || prt_curse == 41 || prt_curse == 42 || prt_curse == 44 || prt_curse == 51 || prt_curse == 52) {
warp "prt_church",21,91;
}
end;
}
-prt_church,23,89,3 script Father Biscuss#tomb 60,{
+prt_church,23,89,3 script Father Biscuss#tomb 1_M_PASTOR,{
mes "[Father Biscuss]";
mes "Hm...?";
mes "Are you ready to";
@@ -3068,7 +3068,7 @@ prt_church,23,89,3 script Father Biscuss#tomb 60,{
close;
}
-prt_church,16,114,4 script Father Bamph#tomb 60,{
+prt_church,16,114,4 script Father Bamph#tomb 1_M_PASTOR,{
if (prt_curse == 18) {
mes "[Father Bamph]";
mes "There are the bodies";
@@ -3153,7 +3153,7 @@ prt_church,16,114,4 script Father Bamph#tomb 60,{
end;
}
-prt_church,19,111,5 script #prince1 887,{
+prt_church,19,111,5 script #prince1 4_M_LIEMAN,{
if (prt_curse == 19) {
mes "[Father Bamph]";
mes "This is the body of";
@@ -3190,7 +3190,7 @@ prt_church,19,111,5 script #prince1 887,{
}
}
-prt_church,21,111,5 script #prince2 887,{
+prt_church,21,111,5 script #prince2 4_M_LIEMAN,{
if (prt_curse == 20) {
mes "[Father Bamph]";
mes "This is the body of the";
@@ -3255,7 +3255,7 @@ prt_church,21,111,5 script #prince2 887,{
}
}
-prt_church,24,111,5 script #prince3 887,{
+prt_church,24,111,5 script #prince3 4_M_LIEMAN,{
if (prt_curse == 21) {
mes "^3355FFYou and Father Bamph";
mes "hurriedly inspect the third";
@@ -3370,7 +3370,7 @@ prt_church,24,111,5 script #prince3 887,{
}
}
-moc_fild16,201,295,5 script Assassin Guildsman#poiso 884,{
+moc_fild16,201,295,5 script Assassin Guildsman#poiso 4_M_ACROSS,{
if (prt_curse == 23) {
mes "[Assassin Guildsman]";
mes "What business";
@@ -3424,7 +3424,7 @@ moc_fild16,201,295,5 script Assassin Guildsman#poiso 884,{
}
}
-que_job01,10,16,5 script Marjana#poison 885,{
+que_job01,10,16,5 script Marjana#poison 4_F_ACROSS,{
if (prt_curse == 24) {
mes "[Marjana]";
mes "What business brings";
@@ -3604,7 +3604,7 @@ OnTouch:
}
}
-prt_in,162,99,4 script Librarian#curse 67,{
+prt_in,162,99,4 script Librarian#curse 1_F_02,{
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index a7615a9e2..cf2e62dcb 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -40,7 +40,7 @@
// Lost Child Quest (Prerequisite to High Priest quest) :: rachel_wonjumin
//============================================================
-ra_in01,384,246,3 script Vincent#ra_in01 47,{
+ra_in01,384,246,3 script Vincent#ra_in01 1_M_01,{
if (BaseLevel < 60) {
mes "[Vincent]";
mes "You're inside Sir Zhed's";
@@ -436,7 +436,7 @@ ra_in01,384,246,3 script Vincent#ra_in01 47,{
}
}
-rachel,114,232,3 script Logan#ra_in01 869,{
+rachel,114,232,3 script Logan#ra_in01 4_M_LGTMAN,{
if ((lost_boy < 1) || (lost_boy >= 3)) {
mes "[Logan]";
mes "I'm just Logan, one";
@@ -507,7 +507,7 @@ rachel,114,232,3 script Logan#ra_in01 869,{
}
}
-ra_in01,372,200,3 script Manson#ra_in01 929,{
+ra_in01,372,200,3 script Manson#ra_in01 4_M_MIDDLE,{
if (lost_boy < 1) {
mes "[Manson]";
mes "I am Manson, one of the";
@@ -614,7 +614,7 @@ ra_in01,372,200,3 script Manson#ra_in01 929,{
}
}
-rachel,48,237,3 script Jenny#ra_in01 894,{
+rachel,48,237,3 script Jenny#ra_in01 4_F_KHELLISIA,{
if (lost_boy < 3) {
mes "[Jenny]";
mes "These grounds are owned by";
@@ -786,7 +786,7 @@ rachel,48,237,3 script Jenny#ra_in01 894,{
end;
}
-rachel,138,73,5 script Idle Merchant#ra_in01 85,{
+rachel,138,73,5 script Idle Merchant#ra_in01 4_M_03,{
if ((lost_boy < 4) || (lost_boy >= 6)) {
mes "[Idle Merchant]";
mes "Man! Business is going";
@@ -888,7 +888,7 @@ rachel,138,73,5 script Idle Merchant#ra_in01 85,{
}
}
-rachel,120,47,3 script Idle Merchant#ra_in01_2 85,{
+rachel,120,47,3 script Idle Merchant#ra_in01_2 4_M_03,{
if ((lost_boy < 5) || (lost_boy > 6)) {
mes "[Idle Merchant]";
mes "I'm thinking of quitting";
@@ -982,7 +982,7 @@ rachel,120,47,3 script Idle Merchant#ra_in01_2 85,{
}
}
-ra_fild01,245,325,3 script Suspicious Man#ra_in01 934,{
+ra_fild01,245,325,3 script Suspicious Man#ra_in01 4_M_RASWORD,{
if ((lost_boy < 6) || (lost_boy > 7)) {
mes "[Suspicious Man]";
mes "Th-there's not enough";
@@ -1093,7 +1093,7 @@ ra_fild01,245,325,3 script Suspicious Man#ra_in01 934,{
}
}
-rachel,263,32,3 script Kid#ra_in01 931,{
+rachel,263,32,3 script Kid#ra_in01 4_M_RACHMAN1,{
if (lost_boy < 7) {
mes "[Kid]";
mes "Leave me alone!";
@@ -1228,7 +1228,7 @@ rachel,263,32,3 script Kid#ra_in01 931,{
// Bruspetti Quest (Perequisite: Lighthalzen "Friendship" quest) :: rachel_ryu
//============================================================
-ra_in01,235,194,5 script Katinshuell 931,{
+ra_in01,235,194,5 script Katinshuell 4_M_RACHMAN1,{
if (rach_vice > 21) {
mes "[Katinshuell]";
mes "If I had only turned";
@@ -1935,7 +1935,7 @@ ra_in01,235,194,5 script Katinshuell 931,{
close;
}
-ra_in01,250,19,3 script Mr. Shendar 929,{
+ra_in01,250,19,3 script Mr. Shendar 4_M_MIDDLE,{
if (rach_vice > 21) {
mes "[Mr. Shendar]";
mes "When will my precious";
@@ -2192,7 +2192,7 @@ ra_in01,250,19,3 script Mr. Shendar 929,{
close;
}
-rachel,73,244,3 script Lachellen 919,{
+rachel,73,244,3 script Lachellen 4_F_SHABBY,{
if (rach_vice > 21) {
mes "[Lachellen]";
mes "If you happen to see";
@@ -2356,7 +2356,7 @@ rachel,73,244,3 script Lachellen 919,{
close;
}
-rachel,196,77,3 script Kid#1rachel 921,{
+rachel,196,77,3 script Kid#1rachel 4_M_CHILD1,{
mes "[Kid]";
mes "Hey, have you seen";
mes "Bruspetti? She's really";
@@ -2372,7 +2372,7 @@ rachel,196,77,3 script Kid#1rachel 921,{
close;
}
-rachel,151,155,3 script Kid#2rachel 921,{
+rachel,151,155,3 script Kid#2rachel 4_M_CHILD1,{
mes "[Kid]";
mes "Oh wow! I wanna be an";
mes "adventurer like you when";
@@ -2397,7 +2397,7 @@ rachel,151,155,3 script Kid#2rachel 921,{
close;
}
-rachel,266,35,3 script Grandma#rachel 918,{
+rachel,266,35,3 script Grandma#rachel 4_F_RACHOLD,{
if (rach_vice > 21) {
mes "[Grandma]";
mes "When you get to be my";
@@ -2470,7 +2470,7 @@ rachel,266,35,3 script Grandma#rachel 918,{
close;
}
-lhz_in02,213,207,0 script #ratrace1 111,4,4,{
+lhz_in02,213,207,0 script #ratrace1 HIDDEN_NPC,4,4,{
OnTouch:
if (rach_vice == 5) {
mes "[" + strcharinfo(0) + "]";
@@ -2491,7 +2491,7 @@ OnTouch:
end;
}
-rachel,265,47,0 script #raevent1 111,2,2,{
+rachel,265,47,0 script #raevent1 HIDDEN_NPC,2,2,{
OnTouch:
if (rach_vice == 23) {
mes "[" + strcharinfo(0) + "]";
@@ -2610,7 +2610,7 @@ OnTouch:
end;
}
-ra_in01,255,25,0 script Book#ra_in 111,{
+ra_in01,255,25,0 script Book#ra_in HIDDEN_NPC,{
if (rach_vice == 15) {
mes "^3355FFThis is where you";
mes "found Bruspetti's diary.";
@@ -2652,8 +2652,8 @@ ra_in01,255,25,0 script Book#ra_in 111,{
//line below (npc header), and comment the line
//under it, and then uncomment the cutin lines.
-//rachel,157,183,3 script Sincere Follower Urstia 917,{
-rachel,157,183,3 script Sincere Follower Urstia 916,{
+//rachel,157,183,3 script Sincere Follower Urstia 4_F_MASK,{
+rachel,157,183,3 script Sincere Follower Urstia 4_F_MASK1,{
cutin "ra_usti1",2;
if (checkweight(908,200) == 0) {
mes "^3355FFWait a second!";
@@ -2866,7 +2866,7 @@ rachel,157,183,3 script Sincere Follower Urstia 916,{
end;
}
-ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{
+ice_dun02,120,105,3 script Man Stuck in Ice#cave 4_M_FROZEN1,5,5,{
if (checkweight(908,200) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -3229,7 +3229,7 @@ OnTimer10800000:
end;
}
-rachel,265,98,3 script Hamion#aru 930,{
+rachel,265,98,3 script Hamion#aru 4_M_RACHMAN2,{
if (checkweight(908,200) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -3382,7 +3382,7 @@ rachel,265,98,3 script Hamion#aru 930,{
}
}
-rachel,113,96,5 script Mohadian 929,10,10,{
+rachel,113,96,5 script Mohadian 4_M_MIDDLE,10,10,{
if (ice_necklace_q == 6) {
mes "[Mohadian]";
mes "I work at the bar around";
@@ -3493,7 +3493,7 @@ OnTouch:
end;
}
-ice_dun03,126,126,3 script Blazing Fire#ice1 802,{
+ice_dun03,126,126,3 script Blazing Fire#ice1 4_NFWISP,{
mes "^3355FFThe flames in this fire";
mes "barrier crackle with magic";
mes "power. There's no way that";
@@ -3530,7 +3530,7 @@ ice_dun03,126,126,3 script Blazing Fire#ice1 802,{
}
-ice_dun03,172,126,0 script Blazing Fire#ice2 802,{
+ice_dun03,172,126,0 script Blazing Fire#ice2 4_NFWISP,{
mes "^3355FFThe flames in this fire";
mes "barrier crackle with magic";
mes "power. There's no way that";
@@ -3566,7 +3566,7 @@ ice_dun03,172,126,0 script Blazing Fire#ice2 802,{
close;
}
-ice_dun03,172,172,0 script Blazing Fire#ice3 802,{
+ice_dun03,172,172,0 script Blazing Fire#ice3 4_NFWISP,{
mes "^3355FFThe flames in this fire";
mes "barrier crackle with magic";
mes "power. There's no way that";
@@ -3602,7 +3602,7 @@ ice_dun03,172,172,0 script Blazing Fire#ice3 802,{
close;
}
-ice_dun03,127,172,0 script Blazing Fire#ice4 802,{
+ice_dun03,127,172,0 script Blazing Fire#ice4 4_NFWISP,{
mes "^3355FFThe flames in this fire";
mes "barrier crackle with magic";
mes "power. There's no way that";
@@ -3729,7 +3729,7 @@ OnTimer60000:
end;
}
-ice_dun03,150,137,0 script #ice_4f_1 45,2,2,{
+ice_dun03,150,137,0 script #ice_4f_1 WARPNPC,2,2,{
OnTouch:
warp "ice_dun04",33,144;
end;
@@ -3739,7 +3739,7 @@ OnInit:
end;
}
-ice_dun03,138,148,0 script #ice_4f_2 45,2,2,{
+ice_dun03,138,148,0 script #ice_4f_2 WARPNPC,2,2,{
OnTouch:
warp "ice_dun04",33,144;
end;
@@ -3749,7 +3749,7 @@ OnInit:
end;
}
-ice_dun03,161,148,0 script #ice_4f_3 45,2,2,{
+ice_dun03,161,148,0 script #ice_4f_3 WARPNPC,2,2,{
OnTouch:
warp "ice_dun04",33,144;
end;
@@ -3759,7 +3759,7 @@ OnInit:
end;
}
-ice_dun03,151,162,0 script #ice_4f_4 45,2,2,{
+ice_dun03,151,162,0 script #ice_4f_4 WARPNPC,2,2,{
OnTouch:
warp "ice_dun04",33,144;
end;
@@ -3771,7 +3771,7 @@ OnInit:
// Donation Lottery Quest/High Priest Quest :: rachel_oz & rachel_ma1
//============================================================
-ra_temple,119,180,0 script Temple Entrance#ra_tem 45,1,1,{
+ra_temple,119,180,0 script Temple Entrance#ra_tem WARPNPC,1,1,{
OnTouch:
if ($rachel_donate >= 10000) {
if (MISC_QUEST & 8192) { warp "ra_temin",169,23; end; }
@@ -3791,7 +3791,7 @@ OnTouch:
end;
}
-ra_temple,116,174,3 script Nemma#ra_temple 920,{
+ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
cutin "ra_nemma02",2;
if ($rachel_donate < 10000) {
if (ra_have_donated == 0) {
@@ -4239,7 +4239,7 @@ S_Donate:
}
}
-rachel,243,37,3 script Kid#Candy Addict 921,{
+rachel,243,37,3 script Kid#Candy Addict 4_M_CHILD1,{
if ((ra_tem_q < 2) || (ra_tem_q > 9) || (MISC_QUEST & 8192)) {
mes "[Kid]";
mes "Hey! What's that";
@@ -4529,7 +4529,7 @@ OnTouch:
end;
}
-que_rachel,63,82,0 script Window#ra_temple 111,{
+que_rachel,63,82,0 script Window#ra_temple HIDDEN_NPC,{
mes "^3355FFThis window is open.^000000";
next;
if(select("Stay:Exit Through Window") == 2) {
@@ -4697,7 +4697,7 @@ que_rachel,180,37,0 duplicate(nemma01) nemma03 -1,5,5
que_rachel,165,37,0 duplicate(nemma01) nemma04 -1,5,5
que_rachel,160,37,0 duplicate(nemma01) nemma05 -1,5,5
-que_rachel,169,18,0 script Quest Temple Exit#ra_tem 45,2,2,{
+que_rachel,169,18,0 script Quest Temple Exit#ra_tem WARPNPC,2,2,{
mes "^3355FFThe gate is closed.^000000";
next;
switch(select("Push Gate:Examine Gate:Kick Gate:Smash Gate with Weapon")) {
@@ -4745,7 +4745,7 @@ que_rachel,169,18,0 script Quest Temple Exit#ra_tem 45,2,2,{
close;
}
-ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
+ra_temin,277,159,3 script High Priest Zhed#rachel 4_M_RACHOLD1,{
if ((ra_tem_q > 14) || (MISC_QUEST&8192)) set lost_boy,14;
if (checkweight(908,200) == 0) {
mes "^3355FFWait a second!";
@@ -6302,7 +6302,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 932,{
end;
}
-ra_temin,170,46,3 script Panno#rachel 920,{
+ra_temin,170,46,3 script Panno#rachel 4_F_TRAINEE,{
cutin "ra_fano03",2;
if (ra_tem_q >= 12 || MISC_QUEST & 8192) {
cutin "ra_fano03",2;
@@ -6734,7 +6734,7 @@ L_End:
end;
}
-ra_temin,134,128,3 script Pope's Office Guard#rac::raofficeguard 926,{
+ra_temin,134,128,3 script Pope's Office Guard#rac::raofficeguard 4_M_MASK1,{
if ((ra_tem_q == 15) && (countitem(7561) > 39)) {
mes "[Pope's Office Guard]";
mes "Hm? What's that you have";
@@ -6785,9 +6785,9 @@ ra_temin,134,128,3 script Pope's Office Guard#rac::raofficeguard 926,{
}
}
-ra_temin,134,134,3 duplicate(raofficeguard) Pope's Office Guard#2ra 926
+ra_temin,134,134,3 duplicate(raofficeguard) Pope's Office Guard#2ra 4_M_MASK1
-ra_temin,134,131,0 script gyoin1#rachel 45,1,1,{
+ra_temin,134,131,0 script gyoin1#rachel WARPNPC,1,1,{
OnTouch:
if (ra_tem_q == 16)
warp "ra_temin",276,239;
@@ -6810,7 +6810,7 @@ OnTouch:
end;
}
-ra_temin,275,226,0 script #rachel33 45,1,1,{
+ra_temin,275,226,0 script #rachel33 WARPNPC,1,1,{
end;
OnTouch:
if (aru_em == 21)
@@ -6820,37 +6820,37 @@ OnTouch:
end;
}
-ra_temsky,95,99,6 script Priest#1rachel 935,{
+ra_temsky,95,99,6 script Priest#1rachel 4_M_TRAINEE,{
mes "[Priest]";
mes "May Freya be with you.";
close;
}
-ra_temsky,93,97,6 script Male Follower#1rachel::ramale 926,{
+ra_temsky,93,97,6 script Male Follower#1rachel::ramale 4_M_MASK1,{
mes "[Male Follower]";
mes "May Freya be with you.";
close;
}
-ra_temsky,90,95,6 duplicate(ramale) Male Follower#2rachel 926
-ra_temsky,98,59,6 duplicate(ramale) Male Follower#3rachel 926
+ra_temsky,90,95,6 duplicate(ramale) Male Follower#2rachel 4_M_MASK1
+ra_temsky,98,59,6 duplicate(ramale) Male Follower#3rachel 4_M_MASK1
-ra_temsky,104,99,4 script Priestess#1rachel 920,{
+ra_temsky,104,99,4 script Priestess#1rachel 4_F_TRAINEE,{
mes "[Priestess]";
mes "May Freya be with you.";
close;
}
-ra_temsky,106,97,4 script Female Follower#1rachel::rafemale 916,{
+ra_temsky,106,97,4 script Female Follower#1rachel::rafemale 4_F_MASK1,{
mes "[Female Follower]";
mes "May Freya be with you.";
close;
}
-ra_temsky,108,95,4 duplicate(rafemale) Female Follower#2rachel 916
-ra_temsky,101,59,4 duplicate(rafemale) Female Follower#3rachel 916
+ra_temsky,108,95,4 duplicate(rafemale) Female Follower#2rachel 4_F_MASK1
+ra_temsky,101,59,4 duplicate(rafemale) Female Follower#3rachel 4_F_MASK1
-ra_temsky,99,99,5 script Pope#rachel 936,{
+ra_temsky,99,99,5 script Pope#rachel 4_F_ARUNA_POP,{
if (ra_tem_q == 16) {
cutin "ra_bishop",2;
mes "^3355FFTh-this little";
@@ -7043,7 +7043,7 @@ ra_temsky,99,99,5 script Pope#rachel 936,{
end;
}
-ra_temin,294,149,0 script High Priestess Niren#ra 915,{
+ra_temin,294,149,0 script High Priestess Niren#ra 4_F_MADAME,{
end;
OnInit:
@@ -7268,7 +7268,7 @@ OnTouch:
end;
}
-ra_temin,28,319,0 script saint1#rachel 45,4,2,{
+ra_temin,28,319,0 script saint1#rachel WARPNPC,4,2,{
OnTouch:
if ((ra_tem_q > 21) || (MISC_QUEST & 8192)) { warp "ra_san01",140,135; end; }
@@ -7394,7 +7394,7 @@ OnTouch:
end;
}
-que_san04,122,200,4 script High Priestess Niren#r2 915,{
+que_san04,122,200,4 script High Priestess Niren#r2 4_F_MADAME,{
end;
OnInit:
@@ -7430,7 +7430,7 @@ OnTouch:
end;
}
-rachel,142,167,5 script Seeking Follower#rachel 916,6,6,{
+rachel,142,167,5 script Seeking Follower#rachel 4_F_MASK1,6,6,{
if ((lost_boy == 13) && (ra_tem_q == 20)) {
L_Mes:
mes "[Arunafeltz Follower]";
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index 54823189b..16537c2e9 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -39,7 +39,7 @@
// Umbalian Language Quest :: um_trans
//============================================================
-um_in,39,122,5 script Utan Chief 784,{
+um_in,39,122,5 script Utan Chief 4_M_UMCHIEF,{
if (event_umbala == 0) {
mes "[Karkatan]";
mes "Huh huh, a Rune-Midgardian.";
@@ -362,7 +362,7 @@ um_in,39,122,5 script Utan Chief 784,{
// Create Essence/Dismantle Stone Quest :: um_npc
//============================================================
-um_in,44,71,2 script Utan Shaman 782,{
+um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{
if (checkweight(908,600) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -821,7 +821,7 @@ um_in,44,71,2 script Utan Shaman 782,{
}
}
-umbala,221,193,1 script #Skulldoor 111,{
+umbala,221,193,1 script #Skulldoor HIDDEN_NPC,{
if (event_umbala >= 7) {
warp "um_in",32,71;
end;
@@ -979,7 +979,7 @@ umbala,221,193,1 script #Skulldoor 111,{
// Umbala Domestic Dispute Quest :: um_npc_ryu
//============================================================
-um_in,139,48,5 script Phrenetan 783,{
+um_in,139,48,5 script Phrenetan 4_F_UMWOMAN,{
if (event_umbala >= 3) {
mes "[Phrenetan]";
mes "I am so sick and tired of";
@@ -1030,7 +1030,7 @@ um_in,139,48,5 script Phrenetan 783,{
end;
}
-um_in,144,45,5 script Umpokoriohtan 789,{
+um_in,144,45,5 script Umpokoriohtan 4_M_UMSOLDIER,{
if (event_umbala >= 3) {
if(rand(1,3) == 2) {
mes "[Umpokoriohtan]";
@@ -1111,7 +1111,7 @@ OnInit:
end;
}
-um_in,101,73,3 script Wainatan 783,{
+um_in,101,73,3 script Wainatan 4_F_UMWOMAN,{
if (event_umbala >= 3) {
mes "[Wainatan]";
mes "I am sick and tired of this guy";
@@ -1158,7 +1158,7 @@ um_in,101,73,3 script Wainatan 783,{
}
}
-um_in,94,123,5 script Bertztan 783,{
+um_in,94,123,5 script Bertztan 4_F_UMWOMAN,{
if (event_umbala >= 3) {
mes "[Bertztan]";
mes "...*Sigh* That sicko";
@@ -1202,7 +1202,7 @@ um_in,94,123,5 script Bertztan 783,{
}
}
-umbala,145,217,3 script Chabimatan 783,{
+umbala,145,217,3 script Chabimatan 4_F_UMWOMAN,{
if (event_umbala >= 3) {
mes "[Chabimatan]";
mes "...*Sigh* Umpokoriohtan seems";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index bfd7f7d51..4b35a132c 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -306,7 +306,7 @@
}
}
-ve_in,169,310,6 script Strange Old Man#ve 121,{
+ve_in,169,310,6 script Strange Old Man#ve 2_M_MOLGENSTEIN,{
if (veins_stone == 0) {
mes "[Absar]";
mes "Bwahahaha!";
@@ -469,7 +469,7 @@ ve_in,169,310,6 script Strange Old Man#ve 121,{
close;
}
-ve_in02,37,28,4 script Factory Manager 898,{
+ve_in02,37,28,4 script Factory Manager 4_M_HUMAN_01,{
if (veins_stone && veins_stone < 5) {
mes "[Mirhen]";
mes "Hey, employees only beyond this point!";
@@ -532,7 +532,7 @@ ve_in02,37,28,4 script Factory Manager 898,{
close;
}
-ve_in02,54,49,2 script Factory Worker#ve1 943,{
+ve_in02,54,49,2 script Factory Worker#ve1 4_M_DESERT,{
if (veins_stone < 6) {
mes "[Bahed]";
mes "lately, I've been feeling so weak...";
@@ -633,7 +633,7 @@ ve_in02,54,49,2 script Factory Worker#ve1 943,{
close;
}
-ve_in02,68,39,7 script Factory Worker#ve2 943,{
+ve_in02,68,39,7 script Factory Worker#ve2 4_M_DESERT,{
mes "[Worker]";
mes "What the heck are these rocks?";
mes "They're ordinary stones, aren't they?";
@@ -643,7 +643,7 @@ ve_in02,68,39,7 script Factory Worker#ve2 943,{
// Spy Quest :: veins_secret
//============================================================
-prontera,202,122,0 script Kid#sch 703,{
+prontera,202,122,0 script Kid#sch 4_F_KID2,{
if (que_sch == 0) {
mes "[Rooney]";
mes "Where the heck";
@@ -731,7 +731,7 @@ prontera,202,122,0 script Kid#sch 703,{
close;
}
-prt_church,89,108,6 script Bard#sch 741,{
+prt_church,89,108,6 script Bard#sch 2_M_BARD_ORIENT,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -990,7 +990,7 @@ prt_church,89,108,6 script Bard#sch 741,{
}
}
-morocc,53,87,7 script Prison Ward#sch 707,{
+morocc,53,87,7 script Prison Ward#sch 4_M_MOC_SOLDIER,{
if (que_sch < 4) {
mes "[Jesse]";
mes "Only authorized";
@@ -1110,7 +1110,7 @@ morocc,53,87,7 script Prison Ward#sch 707,{
close;
}
-morocc_in,79,163,0 script Public Security Officer 748,{
+morocc_in,79,163,0 script Public Security Officer 4_M_ALCHE_A,{
if (que_sch < 7) {
mes "[Krieg]";
mes "I'm in charge of public";
@@ -1194,7 +1194,7 @@ morocc_in,79,163,0 script Public Security Officer 748,{
ra_in01,48,352,0 warp que_sch_jail 1,1,morocc,56,89
-ra_in01,50,387,4 script Upset Looking Bard#sch 51,{
+ra_in01,50,387,4 script Upset Looking Bard#sch 1_M_BARD,{
if (que_sch < 10) {
mes "[Vitre]";
mes ".............";
@@ -1368,7 +1368,7 @@ ra_in01,50,387,4 script Upset Looking Bard#sch 51,{
}
}
-ra_in01,58,389,0 script Jesse#sch 707,{
+ra_in01,58,389,0 script Jesse#sch 4_M_MOC_SOLDIER,{
end;
OnInit:
@@ -1376,7 +1376,7 @@ OnInit:
end;
}
-ra_in01,58,389,0 script Guant Prisoner#sch 929,{
+ra_in01,58,389,0 script Guant Prisoner#sch 4_M_MIDDLE,{
if (que_sch < 11) {
mes "[Ruan]";
mes "This stinks. Why am";
@@ -1442,7 +1442,7 @@ ra_in01,58,389,0 script Guant Prisoner#sch 929,{
}
// Escort Dancers to Schwaltzvalt Republic
-job_duncer,93,106,6 script Dance Instructor#sch 892,{
+job_duncer,93,106,6 script Dance Instructor#sch 4_F_HUGRANMA,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -1652,7 +1652,7 @@ job_duncer,93,106,6 script Dance Instructor#sch 892,{
close;
}
-job_duncer,85,49,0 script Young Dancer#sch1 724,{
+job_duncer,85,49,0 script Young Dancer#sch1 4_F_07,{
if (que_sch < 12) {
mes "[Dancer]";
mes "Hi there~";
@@ -1690,7 +1690,7 @@ job_duncer,85,49,0 script Young Dancer#sch1 724,{
close;
}
-job_duncer,83,52,6 script Cheerful Dancer#sch1 724,{
+job_duncer,83,52,6 script Cheerful Dancer#sch1 4_F_07,{
if (que_sch < 12) {
mes "[Dancer]";
mes "Hi there~";
@@ -1727,7 +1727,7 @@ job_duncer,83,52,6 script Cheerful Dancer#sch1 724,{
close;
}
-job_duncer,87,50,2 script Mature Looking Dancer#s1 724,{
+job_duncer,87,50,2 script Mature Looking Dancer#s1 4_F_07,{
if (que_sch < 12) {
mes "[Dancer]";
mes "Hi there~";
@@ -1764,7 +1764,7 @@ job_duncer,87,50,2 script Mature Looking Dancer#s1 724,{
close;
}
-airplane,76,56,4 script Young Dancer#sch2 724,{
+airplane,76,56,4 script Young Dancer#sch2 4_F_07,{
if (que_sch < 13) {
mes "[Dancer]";
mes "Hi there~";
@@ -1788,7 +1788,7 @@ airplane,76,56,4 script Young Dancer#sch2 724,{
close;
}
-airplane,75,53,0 script Cheerful Dancer#sch2 724,{
+airplane,75,53,0 script Cheerful Dancer#sch2 4_F_07,{
if (que_sch < 13) {
mes "[Dancer]";
mes "Hi there~";
@@ -1813,7 +1813,7 @@ airplane,75,53,0 script Cheerful Dancer#sch2 724,{
close;
}
-airplane,79,55,2 script Mature Looking Dancer#s2 724,{
+airplane,79,55,2 script Mature Looking Dancer#s2 4_F_07,{
if (que_sch < 13) {
mes "[Dancer]";
mes "Hi there~";
@@ -1854,7 +1854,7 @@ airplane,79,55,2 script Mature Looking Dancer#s2 724,{
close;
}
-ein_in01,174,266,0 script Young Dancer#sch3 724,{
+ein_in01,174,266,0 script Young Dancer#sch3 4_F_07,{
if (que_sch < 17) {
mes "[Dancer]";
mes "Oh, the dinner";
@@ -1880,7 +1880,7 @@ ein_in01,174,266,0 script Young Dancer#sch3 724,{
close;
}
-ein_in01,172,266,0 script Cheerful Dancer#sch3 724,{
+ein_in01,172,266,0 script Cheerful Dancer#sch3 4_F_07,{
if (que_sch < 17) {
mes "[Dancer]";
mes "The dinner party isn't";
@@ -1905,7 +1905,7 @@ ein_in01,172,266,0 script Cheerful Dancer#sch3 724,{
close;
}
-ein_in01,170,266,0 script Mature Looking Dancer#s3 724,{
+ein_in01,170,266,0 script Mature Looking Dancer#s3 4_F_07,{
if (que_sch < 17) {
mes "[Dancer]";
mes "Oh, the dinner";
@@ -1933,7 +1933,7 @@ ein_in01,170,266,0 script Mature Looking Dancer#s3 724,{
close;
}
-ein_in01,279,221,0 script Hotel Manager#sch 903,5,5,{
+ein_in01,279,221,0 script Hotel Manager#sch 4_M_KHKYEL,5,5,{
if (que_sch < 15) {
mes "[Manager]";
mes "It'd be a really great";
@@ -1980,7 +1980,7 @@ OnTouch:
end;
}
-ein_in01,166,282,4 script Employee#sch 904,{
+ein_in01,166,282,4 script Employee#sch 4_M_KHMAN,{
if (que_sch < 15) {
mes "[Employee]";
mes "We've been so busy lately!";
@@ -2099,7 +2099,7 @@ OnTouch:
end;
}
-ein_in01,181,284,0 script Corporate Figure 109,{
+ein_in01,181,284,0 script Corporate Figure 4_M_MANAGER,{
end;
OnInit:
@@ -2107,7 +2107,7 @@ OnInit:
end;
}
-ein_in01,181,285,0 script Arunafeltz Figure 920,{
+ein_in01,181,285,0 script Arunafeltz Figure 4_F_TRAINEE,{
end;
OnInit:
@@ -2115,7 +2115,7 @@ OnInit:
end;
}
-ein_in01,168,274,0 script Corporate Figure#sch 109,{
+ein_in01,168,274,0 script Corporate Figure#sch 4_M_MANAGER,{
mes "[????]";
mes "Hmm... Good.";
mes "Everything looks";
@@ -2123,7 +2123,7 @@ ein_in01,168,274,0 script Corporate Figure#sch 109,{
close;
}
-ein_in01,170,284,4 script Arunafeltz Figure#sch 920,{
+ein_in01,170,284,4 script Arunafeltz Figure#sch 4_F_TRAINEE,{
mes "[??????]";
mes "I've got to say, only";
mes "Rekenber can host such";
@@ -2133,7 +2133,7 @@ ein_in01,170,284,4 script Arunafeltz Figure#sch 920,{
close;
}
-morocc,297,154,0 script Thin-Faced Bard#sch 51,{
+morocc,297,154,0 script Thin-Faced Bard#sch 1_M_BARD,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -2400,7 +2400,7 @@ morocc,297,154,0 script Thin-Faced Bard#sch 51,{
close;
}
-morocc,294,152,0 script ????#sch1 899,{
+morocc,294,152,0 script ????#sch1 4_M_HUMAN_02,{
end;
OnInit:
@@ -2408,7 +2408,7 @@ OnInit:
end;
}
-morocc,293,155,6 script ????#sch2 899,{
+morocc,293,155,6 script ????#sch2 4_M_HUMAN_02,{
end;
OnInit:
@@ -2416,7 +2416,7 @@ OnInit:
end;
}
-morocc,298,150,1 script ????#sch3 899,{
+morocc,298,150,1 script ????#sch3 4_M_HUMAN_02,{
end;
OnInit:
@@ -2424,7 +2424,7 @@ OnInit:
end;
}
-prontera,109,161,6 script Young Man#sch 83,{
+prontera,109,161,6 script Young Man#sch 4_M_01,{
if (que_sch < 20) {
mes "[Chada]";
mes "What a boring day...";
@@ -2485,7 +2485,7 @@ prontera,109,161,6 script Young Man#sch 83,{
}
}
-geffen,196,167,4 script Young Woman#sch 101,{
+geffen,196,167,4 script Young Woman#sch 4W_F_01,{
if (que_sch < 21) {
mes "[Ghez]";
mes "When is he going";
@@ -2559,7 +2559,7 @@ geffen,196,167,4 script Young Woman#sch 101,{
}
}
-comodo,135,299,0 script Young Man#sch2 809,{
+comodo,135,299,0 script Young Man#sch2 1_M_SIGNMONK,{
if (que_sch < 22) {
mes "[Nosdan]";
mes "Have you come to hear";
@@ -2648,7 +2648,7 @@ comodo,135,299,0 script Young Man#sch2 809,{
}
}
-sec_in02,10,43,4 script Extra Story Patch 809,{
+sec_in02,10,43,4 script Extra Story Patch 1_M_SIGNMONK,{
callfunc "F_GM_NPC";
mes "[Patch]";
mes "Yeah, you can try.";
@@ -2664,7 +2664,7 @@ sec_in02,10,43,4 script Extra Story Patch 809,{
// Siblings Quest :: veins_camel
//============================================================
-veins,327,185,3 script Kid#camelcamel 944,{
+veins,327,185,3 script Kid#camelcamel 4_M_DST_CHILD,{
if (MISC_QUEST & 8192) {
if (rachel_camel == 0) {
mes "[Kid Karyn]";
@@ -3174,7 +3174,7 @@ veins,327,185,3 script Kid#camelcamel 944,{
}
}
-que_thor,36,66,5 script Little Curdie 941,{
+que_thor,36,66,5 script Little Curdie 4_F_DST_CHILD,{
if (rachel_camel == 1) {
mes "^3355FFYou come across";
mes "a little girl lying on the";
@@ -3515,7 +3515,7 @@ que_thor,36,66,5 script Little Curdie 941,{
}
}
-veins,181,166,3 script Lockenlock 900,{
+veins,181,166,3 script Lockenlock 4_M_HUMERCHANT,{
if (rachel_camel && rachel_camel < 4) {
mes "^3355FFIt's a drunkard...";
mes "The scent of pure";
@@ -4072,7 +4072,7 @@ veins,181,166,3 script Lockenlock 900,{
}
}
-veins,227,127,5 script Ivory 940,{
+veins,227,127,5 script Ivory 4_F_DESERT,{
if (rachel_camel && rachel_camel < 5) {
mes "[Organic Soap Maker Ivory]";
mes "I need to make more of";
@@ -4395,7 +4395,7 @@ veins,227,127,5 script Ivory 940,{
}
}
-veins,115,59,5 script Saraman 847,{
+veins,115,59,5 script Saraman 4_M_EINOLD,{
if (rachel_camel && rachel_camel < 7) {
mes "[Saraman]";
mes "Zzzzz...";
@@ -4743,7 +4743,7 @@ veins,115,59,5 script Saraman 847,{
}
}
-veins,78,226,5 script Camel#camelcc1::VeinsCamel 938,{
+veins,78,226,5 script Camel#camelcc1::VeinsCamel 4_DST_CAMEL,{
if (rachel_camel == 9) {
mes "^3355FFThe camel sniffed the";
mes "appetite stimulant, but";
@@ -4770,13 +4770,13 @@ veins,78,226,5 script Camel#camelcc1::VeinsCamel 938,{
}
}
-veins,72,227,3 duplicate(VeinsCamel) Camel#camelcc3 938
-veins,81,222,1 duplicate(VeinsCamel) Camel#camelcc4 938
-veins,77,219,5 duplicate(VeinsCamel) Camel#camelcc5 938
-veins,73,215,8 duplicate(VeinsCamel) Camel#camelcc6 938
-veins,68,215,5 duplicate(VeinsCamel) Camel#camelcc7 938
+veins,72,227,3 duplicate(VeinsCamel) Camel#camelcc3 4_DST_CAMEL
+veins,81,222,1 duplicate(VeinsCamel) Camel#camelcc4 4_DST_CAMEL
+veins,77,219,5 duplicate(VeinsCamel) Camel#camelcc5 4_DST_CAMEL
+veins,73,215,8 duplicate(VeinsCamel) Camel#camelcc6 4_DST_CAMEL
+veins,68,215,5 duplicate(VeinsCamel) Camel#camelcc7 4_DST_CAMEL
-ve_fild07,235,42,3 script Silk Sand Camel 938,{
+ve_fild07,235,42,3 script Silk Sand Camel 4_DST_CAMEL,{
if (rachel_camel == 11) {
mes "^3355FFThis camel's leg is";
mes "wounded. Although it";
@@ -4978,7 +4978,7 @@ ve_fild07,235,42,3 script Silk Sand Camel 938,{
}
}
-veins,221,120,5 script Young Town Native 943,{
+veins,221,120,5 script Young Town Native 4_M_DESERT,{
if (rachel_camel == 3) {
mes "[Native Young Man]";
mes "My name is Toby.";
@@ -5073,7 +5073,7 @@ veins,221,120,5 script Young Town Native 943,{
// Thor Volcano Base Quest :: veins_camp
//============================================================
-ra_temin,87,133,1 script Rachel Guard#vol1 934,5,2,{
+ra_temin,87,133,1 script Rachel Guard#vol1 4_M_RASWORD,5,2,{
if (aru_vol == 2) {
mes "[Guard Karlum]";
mes "High Priest Vildt isn't";
@@ -5214,7 +5214,7 @@ OnTouch:
end;
}
-ra_temin,82,133,7 script Rachel Guard#vol2 934,5,2,{
+ra_temin,82,133,7 script Rachel Guard#vol2 4_M_RASWORD,5,2,{
mes "[Guard Krodger]";
mes "High Priest Vildt isn't";
mes "here right now. Please";
@@ -5231,7 +5231,7 @@ OnTouch:
close;
}
-ra_temin,115,140,1 script Flower Vase#vol 111,{
+ra_temin,115,140,1 script Flower Vase#vol HIDDEN_NPC,{
if ((aru_vol > 2) && (aru_vol < 5)) {
mes "^3355FFYou find a giant";
mes "vase full of beautiful";
@@ -5297,7 +5297,7 @@ OnTouch:
end;
}
-ra_temin,40,124,3 script Female Follower#vol 920,{
+ra_temin,40,124,3 script Female Follower#vol 4_F_TRAINEE,{
mes "[Lamir]";
mes "^333333*Sigh*^000000 High Priest Vildt";
mes "left over so much food after";
@@ -5334,7 +5334,7 @@ ra_temin,40,124,3 script Female Follower#vol 920,{
close;
}
-ra_temin,42,124,3 script Rachel Guard#vol1_1 934,{
+ra_temin,42,124,3 script Rachel Guard#vol1_1 4_M_RASWORD,{
end;
OnInit:
@@ -5342,7 +5342,7 @@ OnInit:
end;
}
-ra_temin,5,5,3 script vol_time 844,{
+ra_temin,5,5,3 script vol_time CLEAR_NPC,{
OnInit:
stopnpctimer;
end;
@@ -5392,7 +5392,7 @@ OnTimer55000:
end;
}
-ra_temin,113,140,1 script Rachel Guard#vol2_1 934,{
+ra_temin,113,140,1 script Rachel Guard#vol2_1 4_M_RASWORD,{
mes "[Guard Krodger]";
mes "What's with this vase?";
mes "They always send me out";
@@ -5407,7 +5407,7 @@ OnInit:
end;
}
-ra_temin,5,5,1 script vol_time2 844,{
+ra_temin,5,5,1 script vol_time2 CLEAR_NPC,{
OnInit:
stopnpctimer;
end;
@@ -5425,7 +5425,7 @@ OnTimer30000:
end;
}
-ra_temin,87,118,3 script Drawer#vol1::VeinsDrawer 111,{
+ra_temin,87,118,3 script Drawer#vol1::VeinsDrawer HIDDEN_NPC,{
mes "^3355FFThere are some neatly";
mes "printed and organized";
mes "documents inside";
@@ -5433,9 +5433,9 @@ ra_temin,87,118,3 script Drawer#vol1::VeinsDrawer 111,{
close;
}
-ra_temin,83,118,3 duplicate(VeinsDrawer) Drawer#vol2 111
+ra_temin,83,118,3 duplicate(VeinsDrawer) Drawer#vol2 HIDDEN_NPC
-ra_temin,85,118,3 script Drawer#vol3 111,{
+ra_temin,85,118,3 script Drawer#vol3 HIDDEN_NPC,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -5507,14 +5507,14 @@ ra_temin,85,118,3 script Drawer#vol3 111,{
close;
}
-ra_temin,88,117,3 script Goddess Statue#vol1 111,{
+ra_temin,88,117,3 script Goddess Statue#vol1 HIDDEN_NPC,{
mes "^3355FFIt's a statue of Freya,";
mes "a goddess revered for her";
mes "clemency and wisdom.^000000";
close;
}
-ra_temin,73,126,1 script Ladder#vol1 111,{
+ra_temin,73,126,1 script Ladder#vol1 HIDDEN_NPC,{
if (aru_vol == 5) {
mes "["+strcharinfo(0)+"]";
mes "Wait, I can use this";
@@ -5579,7 +5579,7 @@ OnTouch:
end;
}
-veins,159,171,3 script Towner#vol 945,{
+veins,159,171,3 script Towner#vol 4_M_DST_GRAND,{
mes "[Towner]";
mes "The small office on the";
mes "2nd floor of this weapon";
@@ -5597,7 +5597,7 @@ veins,159,171,3 script Towner#vol 945,{
close;
}
-ve_in,233,116,3 script Drunken Man#vol 901,{
+ve_in,233,116,3 script Drunken Man#vol 4_M_HUOLDARMY,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -5994,7 +5994,7 @@ ve_in,233,116,3 script Drunken Man#vol 901,{
close;
}
-ve_in,232,117,5 script Drunken Lady#1 940,{
+ve_in,232,117,5 script Drunken Lady#1 4_F_DESERT,{
mes "[Drunken Lady]";
mes "This guys' actually";
mes "pretty boring, but...";
@@ -6003,7 +6003,7 @@ ve_in,232,117,5 script Drunken Lady#1 940,{
close;
}
-ve_in,234,115,3 script Drunken Lady#2 940,{
+ve_in,234,115,3 script Drunken Lady#2 4_F_DESERT,{
mes "[Drunken Lady]";
mes "This tavern might look";
mes "luxurious and gorgeous,";
@@ -6013,7 +6013,7 @@ ve_in,234,115,3 script Drunken Lady#2 940,{
close;
}
-ve_in,277,229,3 script Wall Closet#vol 111,{
+ve_in,277,229,3 script Wall Closet#vol HIDDEN_NPC,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -6040,7 +6040,7 @@ ve_in,277,229,3 script Wall Closet#vol 111,{
close;
}
-ve_in,281,214,3 script Bookshelf#vol 111,{
+ve_in,281,214,3 script Bookshelf#vol HIDDEN_NPC,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -6114,7 +6114,7 @@ ve_in,281,214,3 script Bookshelf#vol 111,{
close;
}
-thor_v01,37,234,3 script Hot Land Surface#1 111,{
+thor_v01,37,234,3 script Hot Land Surface#1 HIDDEN_NPC,{
if (aru_vol == 8) {
if ((countitem(7704) > 0) && (countitem(7342) > 0)) {
mes "^3355FFYou use the pyrometer";
@@ -6152,7 +6152,7 @@ thor_v01,37,234,3 script Hot Land Surface#1 111,{
close;
}
-thor_v02,165,37,3 script Hot Land Surface#2 111,{
+thor_v02,165,37,3 script Hot Land Surface#2 HIDDEN_NPC,{
if (aru_vol == 9) {
if ((countitem(7704) > 0) && (countitem(7342) > 0)) {
mes "^3355FFYou use the pyrometer";
@@ -6184,7 +6184,7 @@ thor_v02,165,37,3 script Hot Land Surface#2 111,{
close;
}
-thor_v02,170,100,3 script Hot Land Surface#3 111,{
+thor_v02,170,100,3 script Hot Land Surface#3 HIDDEN_NPC,{
if (aru_vol == 10) {
if ((countitem(7704) > 0) && (countitem(7342) > 0)) {
mes "^3355FFYou use the pyrometer";
@@ -6230,7 +6230,7 @@ thor_v02,170,100,3 script Hot Land Surface#3 111,{
close;
}
-que_thor,145,66,3 script Guard#vol::VeinsGuard 939,{
+que_thor,145,66,3 script Guard#vol::VeinsGuard 4_DST_SOLDIER,{
if (aru_vol == 11) {
mes "[Guard]";
mes "Only authorized";
@@ -6285,10 +6285,10 @@ que_thor,145,66,3 script Guard#vol::VeinsGuard 939,{
close;
}
-que_thor,136,66,3 duplicate(VeinsGuard) Guard#vol2 939
-que_thor,127,60,5 duplicate(VeinsGuard) Guard#vol3 939
+que_thor,136,66,3 duplicate(VeinsGuard) Guard#vol2 4_DST_SOLDIER
+que_thor,127,60,5 duplicate(VeinsGuard) Guard#vol3 4_DST_SOLDIER
-thor_camp,250,104,3 script Sahedi#vol 934,{
+thor_camp,250,104,3 script Sahedi#vol 4_M_RASWORD,{
if ((MaxWeight-Weight) < 2000 || checkweight(1201,1) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -6601,7 +6601,7 @@ OnTouch:
end;
}
-thor_camp,187,228,5 script Colonel Vito#1 946,{
+thor_camp,187,228,5 script Colonel Vito#1 4_M_DST_MASTER,{
end;
OnInit:
@@ -6609,7 +6609,7 @@ OnInit:
end;
}
-thor_camp,155,175,7 script Colonel Vito#2 946,{
+thor_camp,155,175,7 script Colonel Vito#2 4_M_DST_MASTER,{
end;
OnInit:
@@ -6617,7 +6617,7 @@ OnInit:
end;
}
-thor_camp,159,74,3 script Colonel Vito#3 946,{
+thor_camp,159,74,3 script Colonel Vito#3 4_M_DST_MASTER,{
if (aru_vol == 14) {
mes "[Colonel Vito]";
mes "I am Colonel Vito,";
@@ -6985,7 +6985,7 @@ OnTouch:
end;
}
-thor_camp,124,314,1 script Soldier#vol1 939,{
+thor_camp,124,314,1 script Soldier#vol1 4_DST_SOLDIER,{
mes "[Thor Volcano Camp Soldier]";
mes "Freya, I'm so exhausted!";
mes "I'm starving to death too!";
@@ -6993,7 +6993,7 @@ thor_camp,124,314,1 script Soldier#vol1 939,{
close;
}
-thor_camp,134,309,5 script Soldier#vol2 939,{
+thor_camp,134,309,5 script Soldier#vol2 4_DST_SOLDIER,{
mes "[Thor Volcano Camp Soldier]";
mes "I hear we'll be eating";
mes "chicken salad, fried chicken,";
@@ -7008,7 +7008,7 @@ thor_camp,134,309,5 script Soldier#vol2 939,{
close;
}
-thor_camp,109,167,3 script Control Panel#vol 111,{
+thor_camp,109,167,3 script Control Panel#vol HIDDEN_NPC,{
if (aru_vol == 17) {
mes "^3355FFThis control panel";
mes "controls the main power";
@@ -7041,7 +7041,7 @@ thor_camp,109,167,3 script Control Panel#vol 111,{
end;
}
-thor_camp,150,65,3 script Dummy#1::VeinsDummy 111,{
+thor_camp,150,65,3 script Dummy#1::VeinsDummy HIDDEN_NPC,{
if (aru_vol == 19) {
mes "^3355FFIt's a training dummy";
mes "that looks like it can";
@@ -7140,20 +7140,20 @@ thor_camp,150,65,3 script Dummy#1::VeinsDummy 111,{
}
}
-thor_camp,156,65,3 duplicate(VeinsDummy) Dummy#2 111
-thor_camp,162,65,3 duplicate(VeinsDummy) Dummy#3 111
-thor_camp,150,57,3 duplicate(VeinsDummy) Dummy#4 111
-thor_camp,156,57,3 duplicate(VeinsDummy) Dummy#5 111
-thor_camp,162,57,3 duplicate(VeinsDummy) Dummy#6 111
+thor_camp,156,65,3 duplicate(VeinsDummy) Dummy#2 HIDDEN_NPC
+thor_camp,162,65,3 duplicate(VeinsDummy) Dummy#3 HIDDEN_NPC
+thor_camp,150,57,3 duplicate(VeinsDummy) Dummy#4 HIDDEN_NPC
+thor_camp,156,57,3 duplicate(VeinsDummy) Dummy#5 HIDDEN_NPC
+thor_camp,162,57,3 duplicate(VeinsDummy) Dummy#6 HIDDEN_NPC
-thor_camp,248,104,5 script Aitra#vol 939,{
+thor_camp,248,104,5 script Aitra#vol 4_DST_SOLDIER,{
end;
OnInit:
disablenpc "Aitra#vol";
end;
}
-thor_camp,49,97,3 script High Priest#vol 933,{
+thor_camp,49,97,3 script High Priest#vol 4_M_RACHOLD,{
mes "^3355FFYou'd better not";
mes "do anything too";
mes "conspicuous in";
@@ -7161,7 +7161,7 @@ thor_camp,49,97,3 script High Priest#vol 933,{
close;
}
-thor_camp,49,122,1 script Thor Volcano Soldier#vo1 939,{
+thor_camp,49,122,1 script Thor Volcano Soldier#vo1 4_DST_SOLDIER,{
mes "^3355FFYou'd better not";
mes "do anything too";
mes "conspicuous in";
@@ -7169,7 +7169,7 @@ thor_camp,49,122,1 script Thor Volcano Soldier#vo1 939,{
close;
}
-thor_camp,31,93,1 script Thor Volcano Soldier#vo2 939,{
+thor_camp,31,93,1 script Thor Volcano Soldier#vo2 4_DST_SOLDIER,{
mes "^3355FFYou'd better not";
mes "do anything too";
mes "conspicuous in";
@@ -7177,7 +7177,7 @@ thor_camp,31,93,1 script Thor Volcano Soldier#vo2 939,{
close;
}
-thor_camp,59,79,1 script Thor Volcano Soldier#vo3 939,{
+thor_camp,59,79,1 script Thor Volcano Soldier#vo3 4_DST_SOLDIER,{
mes "^3355FFYou'd better not";
mes "do anything too";
mes "conspicuous in";
@@ -7185,7 +7185,7 @@ thor_camp,59,79,1 script Thor Volcano Soldier#vo3 939,{
close;
}
-thor_camp,143,114,1 script Thor Volcano Soldier#vo4 939,{
+thor_camp,143,114,1 script Thor Volcano Soldier#vo4 4_DST_SOLDIER,{
emotion e_sob;
mes "[Soldier]";
mes "Oh Freya...";
@@ -7196,7 +7196,7 @@ thor_camp,143,114,1 script Thor Volcano Soldier#vo4 939,{
close;
}
-thor_camp,206,92,3 script Thor Volcano Soldier#vo5 939,{
+thor_camp,206,92,3 script Thor Volcano Soldier#vo5 4_DST_SOLDIER,{
mes "[Soldier]";
mes "Ah, time to";
mes "go to work.";
@@ -7209,13 +7209,13 @@ thor_camp,206,92,3 script Thor Volcano Soldier#vo5 939,{
close;
}
-thor_camp,201,321,1 script Thor Volcano Soldier#vo6 939,{
+thor_camp,201,321,1 script Thor Volcano Soldier#vo6 4_DST_SOLDIER,{
mes "[Soldier]";
mes "Yo-ho! Yo-ho!";
close;
}
-thor_camp,196,315,7 script Thor Volcano Soldier#vo7 939,{
+thor_camp,196,315,7 script Thor Volcano Soldier#vo7 4_DST_SOLDIER,{
mes "[Soldier]";
mes "I guess I need to go";
mes "on Guardian polishing";
@@ -7225,7 +7225,7 @@ thor_camp,196,315,7 script Thor Volcano Soldier#vo7 939,{
close;
}
-thor_camp,181,231,0 script Guardian#vol_7 111,{
+thor_camp,181,231,0 script Guardian#vol_7 HIDDEN_NPC,{
mes "^3355FFThere are many guardians";
mes "here in different stages";
mes "of disassembly. It looks";
@@ -7234,7 +7234,7 @@ thor_camp,181,231,0 script Guardian#vol_7 111,{
close;
}
-thor_camp,98,213,5 script Thor Volcano Soldier#vo8 939,{
+thor_camp,98,213,5 script Thor Volcano Soldier#vo8 4_DST_SOLDIER,{
mes "[Soldier]";
mes "Aren't you the one from";
mes "the geological research";
@@ -7245,7 +7245,7 @@ thor_camp,98,213,5 script Thor Volcano Soldier#vo8 939,{
close;
}
-thor_camp,98,209,5 script Thor Volcano Soldier#vo9 939,{
+thor_camp,98,209,5 script Thor Volcano Soldier#vo9 4_DST_SOLDIER,{
mes "[Soldier]";
mes "Why am I always";
mes "stationed here?!";
@@ -7254,7 +7254,7 @@ thor_camp,98,209,5 script Thor Volcano Soldier#vo9 939,{
close;
}
-thor_v02,143,78,0 script #totcamp 45,2,2,{
+thor_v02,143,78,0 script #totcamp WARPNPC,2,2,{
OnTouch_:
if (rachel_camel < 24) {
warp "que_thor",65,55;
@@ -7264,13 +7264,13 @@ OnTouch_:
end;
}
-que_thor,69,56,0 script #tov_1 45,2,2,{
+que_thor,69,56,0 script #tov_1 WARPNPC,2,2,{
OnTouch_:
warp "thor_v02",146,84;
end;
}
-que_thor,187,56,0 script #tov_2 45,2,2,{
+que_thor,187,56,0 script #tov_2 WARPNPC,2,2,{
OnTouch_:
warp "thor_v02",146,84;
end;
@@ -7289,7 +7289,7 @@ OnTouch:
close;
}
-thor_camp,246,191,3 script Guard#goto 939,{
+thor_camp,246,191,3 script Guard#goto 4_DST_SOLDIER,{
mes "[Guard]";
mes "What now?";
mes "Can't you see I'm busy?";
@@ -7321,7 +7321,7 @@ OnTouch_:
close;
}
-ve_in,235,135,5 script Bartender#ve 947,{
+ve_in,235,135,5 script Bartender#ve 4_M_DST_TOUGH,{
mes "[Bartender]";
mes "Welcome to our tavern.";
mes "Please, have a seat.";
@@ -7330,7 +7330,7 @@ ve_in,235,135,5 script Bartender#ve 947,{
close;
}
-ve_in,237,131,1 script Female Customer#ve1 940,{
+ve_in,237,131,1 script Female Customer#ve1 4_F_DESERT,{
mes "[Female Customer]";
mes "Bartender, aren't any of";
mes "your regulars nice young";
@@ -7371,7 +7371,7 @@ ve_in,237,131,1 script Female Customer#ve1 940,{
close;
}
-ve_in,239,107,1 script Male Customer#ve2 943,{
+ve_in,239,107,1 script Male Customer#ve2 4_M_DESERT,{
mes "[Male Customer]";
mes "How can that ugly old";
mes "man have girls hanging";
diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index e03deed5c..50cca4535 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -35,7 +35,7 @@
// Metto Quest :: yuno_ryusei
//============================================================
-yuno_in03,26,39,3 script Metto#juno 709,{
+yuno_in03,26,39,3 script Metto#juno 4_M_SEAMAN,{
mes "[Metto]";
if (metto_q == 0) {
mes "In the Lab today, in the Lab tomorrow! Everyday is filled with research! Even if it takes my entire life, I will not give up until I have made a new Juno...";
@@ -137,7 +137,7 @@ yuno_in03,26,39,3 script Metto#juno 709,{
}
}
-yuno_in01,17,30,5 script Wagan#juno 85,{
+yuno_in01,17,30,5 script Wagan#juno 4_M_03,{
mes "[Wagan]";
if (metto_q == 0) {
mes "I'm sure that you know our city has been living off our research for many years.";
@@ -255,7 +255,7 @@ yuno_in01,17,30,5 script Wagan#juno 85,{
}
}
-yuno_in01,17,95,5 script Stangckle#juno 99,{
+yuno_in01,17,95,5 script Stangckle#juno 4W_M_03,{
mes "[Stangckle]";
if (metto_q == 2) {
mes "What can I do for you? My colleague Metto is coming here soon, so I don't have much time. So what did you say you needed?";
@@ -317,7 +317,7 @@ yuno_in01,17,95,5 script Stangckle#juno 99,{
}
}
-yuno_in01,19,183,5 script Kato#juno 55,{
+yuno_in01,19,183,5 script Kato#juno 1_M_JOBTESTER,{
mes "[Kato]";
if (metto_q == 4) {
mes "I am a scientist researching all sorts of things.";
@@ -365,7 +365,7 @@ yuno_in01,19,183,5 script Kato#juno 55,{
}
}
-yuno_in03,178,43,0 script CiCi#juno 121,{
+yuno_in03,178,43,0 script CiCi#juno 2_M_MOLGENSTEIN,{
if (metto_q == 6) {
mes "[CiCi]";
mes "My name is CiCi. I am one of the three great scientists in this city.";
@@ -422,7 +422,7 @@ yuno_in03,178,43,0 script CiCi#juno 121,{
// Alchemist Brothers Quest :: yuno_ryusei
//============================================================
-yuno_in01,103,157,3 script Bain#juno 98,{
+yuno_in01,103,157,3 script Bain#juno 4W_M_02,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -554,7 +554,7 @@ S_DelItems:
close;
}
-yuno_in01,100,153,7 script Bajin 47,0,0,{
+yuno_in01,100,153,7 script Bajin 1_M_01,0,0,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -684,7 +684,7 @@ S_DelItems:
// Doomed Swords - Juno Portion :: matnani_yuno
//============================================================
-yuno,157,87,4 script A Citizen of Juno#juno 102,{
+yuno,157,87,4 script A Citizen of Juno#juno 8_F,{
mes "[Shalima]";
mes "When you go north from Al De Baran, you will arrive at 'Elmeth Plateau,' a place covered with molten rock.";
next;
@@ -719,7 +719,7 @@ yuno,157,87,4 script A Citizen of Juno#juno 102,{
}
}
-yuno,261,99,4 script Sage Yklah#juno 735,{
+yuno,261,99,4 script Sage Yklah#juno 4_M_JOB_WIZARD,{
if (dmdswrd_Q == 23 || dmdswrd_Q == 24 || dmdswrd_Q == 25) {
switch(dmdswrd_Q) {
case 23:
@@ -920,7 +920,7 @@ yuno,261,99,4 script Sage Yklah#juno 735,{
}
}
-yuno,305,207,4 script Sage Syklah#juno 735,{
+yuno,305,207,4 script Sage Syklah#juno 4_M_JOB_WIZARD,{
if (dmdswrd_Q == 25 || dmdswrd_Q == 26 || dmdswrd_Q == 27) {
switch(dmdswrd_Q) {
case 25:
@@ -1043,7 +1043,7 @@ yuno,305,207,4 script Sage Syklah#juno 735,{
}
}
-yuno,213,298,4 script Sage Esklah#juno 735,{
+yuno,213,298,4 script Sage Esklah#juno 4_M_JOB_WIZARD,{
if (dmdswrd_Q == 27 || dmdswrd_Q == 28 || dmdswrd_Q == 29 || dmdswrd_Q == 30) {
switch(dmdswrd_Q) {
case 27:
@@ -1200,7 +1200,7 @@ yuno,213,298,4 script Sage Esklah#juno 735,{
}
}
-mjolnir_02,170,193,4 script Muriniel's Cottage#juno 111,{
+mjolnir_02,170,193,4 script Muriniel's Cottage#juno HIDDEN_NPC,{
if (dmdswrd_Q == 30 || dmdswrd_Q == 31) {
switch(dmdswrd_Q) {
case 30:
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index afdaee690..72f4b9ddb 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -19,7 +19,7 @@
//= 1.7 Renewal script update. [Euphy]
//============================================================
-prt_fild08,175,374,3 script Bard#brising 51,{
+prt_fild08,175,374,3 script Bard#brising 1_M_BARD,{
cutin "god_nelluad01",2;
if ($God2 >= $@god_check1 && $God3 < $@god_check2) {
if (god_brising > 49) {
@@ -840,7 +840,7 @@ prt_fild08,175,374,3 script Bard#brising 51,{
end;
}
-yuno_in04,47,113,1 script Studying Scholar#1 749,{
+yuno_in04,47,113,1 script Studying Scholar#1 4_M_ALCHE_B,{
if (checkweight(908,200) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
@@ -1394,7 +1394,7 @@ yuno_in04,47,113,1 script Studying Scholar#1 749,{
}
}
-prt_church,113,103,1 script Praying Man 798,{
+prt_church,113,103,1 script Praying Man 4_M_NFMAN,{
if ($God2 < $@god_check1) {
mes "[Praying Man]";
mes "Let everyone live a life";
@@ -2080,7 +2080,7 @@ prt_church,113,103,1 script Praying Man 798,{
}
}
-prt_castle,80,52,0 script Personnel Record#book1 111,{
+prt_castle,80,52,0 script Personnel Record#book1 HIDDEN_NPC,{
if ($God2 < $@god_check1) {
mes "[Librarian]";
mes "What are you doing?";
@@ -2263,7 +2263,7 @@ prt_castle,80,52,0 script Personnel Record#book1 111,{
}
//-----------librarian----------------------------------------------------------
-prt_castle,84,51,5 script Librarian#2 105,{
+prt_castle,84,51,5 script Librarian#2 8W_SOLDIER,{
if ($God2 < $@god_check1) {
mes "[Librarian]";
mes "What are you doing here?";
@@ -2437,7 +2437,7 @@ prt_castle,84,51,5 script Librarian#2 105,{
}
-prontera,260,354,4 script Woman#Rosa Ellenen 101,{
+prontera,260,354,4 script Woman#Rosa Ellenen 4W_F_01,{
if ($God2 < $@god_check1){
mes "[Woman]";
mes "Hm?";
@@ -2563,7 +2563,7 @@ prontera,260,354,4 script Woman#Rosa Ellenen 101,{
}
-prontera,262,353,0 script Gravestone 111,{
+prontera,262,353,0 script Gravestone HIDDEN_NPC,{
if ($God2 > $@god_check1) {
if (god_brising > 33) {
mes "Lowen Ellenen";
@@ -2590,7 +2590,7 @@ prontera,262,353,0 script Gravestone 111,{
}
}
-gef_dun01,89,192,0 script #lowentrace 111,3,3,{
+gef_dun01,89,192,0 script #lowentrace HIDDEN_NPC,3,3,{
if ($God2 < $@god_check1) {
mes "^3355FFIt's just an old,";
mes "dry piece of wood.^000000";
@@ -2713,7 +2713,7 @@ OnTouch:
end;
}
-gef_dun01,203,48,0 script #lowentrace1 111,3,3,{
+gef_dun01,203,48,0 script #lowentrace1 HIDDEN_NPC,3,3,{
if ($God2 < $@god_check1) {
mes "^3355FFIt's just an old,";
mes "dry piece of wood.^000000";
@@ -2845,7 +2845,7 @@ OnTouch:
end;
}
-que_god02,48,55,3 script Lowen Ellenen 745,{
+que_god02,48,55,3 script Lowen Ellenen 4_F_CRU,{
if (god_brising == 30) {
mes "[Lowen Ellenen]";
mes "Can you see me now?";
@@ -2953,7 +2953,7 @@ que_god02,48,55,3 script Lowen Ellenen 745,{
}
}
-que_god02,54,64,4 script Soldier#1_brising 105,1,1,{
+que_god02,54,64,4 script Soldier#1_brising 8W_SOLDIER,1,1,{
if (god_brising == 31) {
mes "[Soldier]";
mes "Have you volunteered for monster subjugation? Would you like to start the mission now?";
@@ -2998,7 +2998,7 @@ OnTouch:
end;
}
-que_god02,55,64,4 script Soldier#2_brising 105,1,1,{
+que_god02,55,64,4 script Soldier#2_brising 8W_SOLDIER,1,1,{
mes "[Soldier]";
mes "Please back away.";
mes "You are not permitted";
@@ -3148,14 +3148,14 @@ OnReset:
end;
}
-que_god02,173,58,4 script #doppelganger1 739,{ end; }
-que_god02,175,55,4 script #doppelganger2 739,{ end; }
-que_god02,175,54,1 script #lowen 745,{ end; }
-que_god02,178,49,1 script #knight1 751,{ end; }
-que_god02,168,53,7 script #knight2 734,{ end; }
-que_god02,167,58,4 script #knight3 752,{ end; }
+que_god02,173,58,4 script #doppelganger1 8_DOPPEL,{ end; }
+que_god02,175,55,4 script #doppelganger2 8_DOPPEL,{ end; }
+que_god02,175,54,1 script #lowen 4_F_CRU,{ end; }
+que_god02,178,49,1 script #knight1 4_M_CRU,{ end; }
+que_god02,168,53,7 script #knight2 4_M_JOB_KNIGHT2,{ end; }
+que_god02,167,58,4 script #knight3 4_M_CRU_OLD,{ end; }
-que_god02,174,49,0 script #lowenone 139,0,0,{
+que_god02,174,49,0 script #lowenone HIDDEN_WARP_NPC,0,0,{
OnTouch:
donpcevent "brisinsold2::OnSold2On";
@@ -3238,9 +3238,9 @@ OnTouch:
end;
}
-que_god02,124,59,7 script #hermite 798,{ end; }
+que_god02,124,59,7 script #hermite 4_M_NFMAN,{ end; }
-que_god02,120,52,0 script #monologue 139,0,0,{
+que_god02,120,52,0 script #monologue HIDDEN_WARP_NPC,0,0,{
OnTouch:
mes "[" + strcharinfo(0) + "]";
@@ -3284,7 +3284,7 @@ OnTouch:
}
-que_god02,21,127,3 script Lowen Ellenen#2 745,{
+que_god02,21,127,3 script Lowen Ellenen#2 4_F_CRU,{
mes "[Lowen Ellenen]";
mes "I was a fool.";
mes "Now I remember Hermite. He must have been the one who rescued me. But when I came to my senses, no one was there.";
@@ -3335,7 +3335,7 @@ que_god02,21,127,3 script Lowen Ellenen#2 745,{
end;
}
-que_god02,178,127,3 script Valkyrie#1 811,{
+que_god02,178,127,3 script Valkyrie#1 4_F_VALKYRIE,{
if (god_brising == 31) {
mes "[Valkyrie]";
@@ -3508,7 +3508,7 @@ que_god02,178,127,3 script Valkyrie#1 811,{
}
}
-xmas,38,105,0 script #brisindwarf1 111,3,3,{
+xmas,38,105,0 script #brisindwarf1 HIDDEN_NPC,3,3,{
if ($God2 < $@god_check1) {
mes "^3355FFA lot of snow";
mes "is heavily piled";
@@ -3682,7 +3682,7 @@ OnTouch:
end;
}
-xmas,36,103,4 script Alfrik#1 826,{
+xmas,36,103,4 script Alfrik#1 4_M_DWARF,{
if (god_brising == 49) {
mes "[Alfrik]";
mes "I've got nothing";
@@ -3975,7 +3975,7 @@ OnInit:
end;
}
-prt_fild02,185,269,0 script #brisindwarf2 111,3,3,{
+prt_fild02,185,269,0 script #brisindwarf2 HIDDEN_NPC,3,3,{
if ($God2 < $@god_check1) {
mes "^3355FFIt's just an";
mes "ordinary rock.^000000";
@@ -4149,7 +4149,7 @@ OnTouch:
end;
}
-prt_fild02,185,270,3 script Dvalin#1 826,{
+prt_fild02,185,270,3 script Dvalin#1 4_M_DWARF,{
if (god_brising > 43) {
mes "[Dvalin]";
mes "A human?";
@@ -4272,7 +4272,7 @@ OnInit:
}
-mjolnir_09,85,129,0 script #brisindwarf3 111,3,3,{
+mjolnir_09,85,129,0 script #brisindwarf3 HIDDEN_NPC,3,3,{
if ($God2 < $@god_check1) {
mes "^3355FFThe sight of this bubbling stream refreshes you just by looking at it.^000000";
close;
@@ -4343,7 +4343,7 @@ OnTouch:
end;
}
-mjolnir_09,87,129,3 script Berling#1 826,{
+mjolnir_09,87,129,3 script Berling#1 4_M_DWARF,{
if (god_brising > 44) {
mes "[Berling]";
mes "You're the one that's awakened us? Hahaha, perhaps that's a sign we may see Freya again! Hahahaha!";
@@ -4487,7 +4487,7 @@ OnInit:
end;
}
-mjo_dun02,126,36,0 script #brisindwarf4 111,3,3,{
+mjo_dun02,126,36,0 script #brisindwarf4 HIDDEN_NPC,3,3,{
if ($God2 < $@god_check1) {
mes "[" + strcharinfo(0) + "]";
mes "Bah, no way out.";
@@ -4645,7 +4645,7 @@ OnTimer301000:
end;
}
-mjo_dun02,126,34,1 script Grer#1 826,{
+mjo_dun02,126,34,1 script Grer#1 4_M_DWARF,{
if (god_brising > 47) {
mes "[Grer]";
mes "As we promised,";
diff --git a/npc/quests/seals/god_global.txt b/npc/quests/seals/god_global.txt
index 94f6ae0f2..c9daa613e 100644
--- a/npc/quests/seals/god_global.txt
+++ b/npc/quests/seals/god_global.txt
@@ -13,7 +13,7 @@
//= Added GM management function.
//============================================================
-sec_in02,15,170,0 script Golbal var 817,{
+sec_in02,15,170,0 script Golbal var 4_F_CHNDRESS3,{
callfunc "F_GM_NPC";
mes "[Check]";
mes "Please enter the password.";
diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt
index 340b9a7f5..a367de1ad 100644
--- a/npc/quests/seals/god_weapon_creation.txt
+++ b/npc/quests/seals/god_weapon_creation.txt
@@ -14,7 +14,7 @@
//= Added GM management function.
//============================================================
-gld_dun01,28,85,0 script Grunburti#1::GodDwarf 826,{
+gld_dun01,28,85,0 script Grunburti#1::GodDwarf 4_M_DWARF,{
mes "[Dwarf Grunburti]";
mes "A human?!";
mes "This land is full";
@@ -340,11 +340,11 @@ gld_dun01,28,85,0 script Grunburti#1::GodDwarf 826,{
close;
}
}
-gld_dun02,85,84,0 duplicate(GodDwarf) Grunburti#2 826
-gld_dun03,92,105,0 duplicate(GodDwarf) Grunburti#3 826
-gld_dun04,268,230,0 duplicate(GodDwarf) Grunburti#4 826
+gld_dun02,85,84,0 duplicate(GodDwarf) Grunburti#2 4_M_DWARF
+gld_dun03,92,105,0 duplicate(GodDwarf) Grunburti#3 4_M_DWARF
+gld_dun04,268,230,0 duplicate(GodDwarf) Grunburti#4 4_M_DWARF
-que_god01,215,127,0 script #god_hopewarp1 111,{
+que_god01,215,127,0 script #god_hopewarp1 HIDDEN_NPC,{
end;
OnInit:
@@ -363,7 +363,7 @@ OnReset:
end;
}
-que_god01,214,128,0 script #que_godnpc1::GodEntrance 111,{
+que_god01,214,128,0 script #que_godnpc1::GodEntrance HIDDEN_NPC,{
mes "[Entrance Notice]";
mes "Only the most";
mes "worthy of humans";
@@ -371,10 +371,10 @@ que_god01,214,128,0 script #que_godnpc1::GodEntrance 111,{
mes "power of the gods.";
close;
}
-que_god01,215,128,0 duplicate(GodEntrance) #que_godnpc2 111
-que_god01,213,128,0 duplicate(GodEntrance) #que_godnpc3 111
+que_god01,215,128,0 duplicate(GodEntrance) #que_godnpc2 HIDDEN_NPC
+que_god01,213,128,0 duplicate(GodEntrance) #que_godnpc3 HIDDEN_NPC
-que_god01,154,112,4 script Grunburti#god 826,{
+que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{
if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
mes "[Dwarf Grunburti]";
mes "One of the godly";
@@ -822,7 +822,7 @@ que_god01,145,118,0 duplicate(god_failwarp#1) god_failwarp#5 -1,9,9
que_god01,164,118,0 duplicate(god_failwarp#1) god_failwarp#6 -1,9,9
// Original name: "Godly Item Quests Related#god"
-que_god01,293,3,0 script Godly Item Quests#god 90,{
+que_god01,293,3,0 script Godly Item Quests#god 4_F_01,{
callfunc "F_GM_NPC";
mes "[Use in case of emergency]";
mes "Please enter password.";
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index 933afb4b0..4ca899621 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -22,7 +22,7 @@
//= 2.2 Renewal script update. [Euphy]
//============================================================
-prt_castle,44,151,0 script Rebarev Doug 56,{
+prt_castle,44,151,0 script Rebarev Doug 1_M_KNIGHTMASTER,{
if (checkweight(1301,3) == 0) {
mes "- You are carrying too many items! -";
close;
@@ -536,7 +536,7 @@ prt_castle,44,151,0 script Rebarev Doug 56,{
end;
}
-prt_castle,48,164,0 script Crusader#God 734,{
+prt_castle,48,164,0 script Crusader#God 4_M_JOB_KNIGHT2,{
if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
if (god_eremes > 22 && god_eremes < 25) {
mes "[Max Von Shedough]";
@@ -615,7 +615,7 @@ prt_castle,48,164,0 script Crusader#God 734,{
}
}
-prt_in,172,109,0 script A File#megin1 111,{
+prt_in,172,109,0 script A File#megin1 HIDDEN_NPC,{
if (god_eremes == 12) {
mes "^3355FFYou have found";
mes "^660000The 3rd Platoon Records^3355FF!^000000";
@@ -647,7 +647,7 @@ prt_in,172,109,0 script A File#megin1 111,{
}
}
-prt_in,170,109,0 script A File#megin2 111,{
+prt_in,170,109,0 script A File#megin2 HIDDEN_NPC,{
if (god_eremes == 12) {
mes "You have found ^0000FFThe 3rd Platoon Records^000000!";
close;
@@ -679,7 +679,7 @@ prt_in,170,109,0 script A File#megin2 111,{
}
}
-prt_in,168,109,0 script A File#megin3 111,{
+prt_in,168,109,0 script A File#megin3 HIDDEN_NPC,{
if (god_eremes == 12) {
mes "You have found";
mes "^0000FFThe 3rd Platoon Records^000000!";
@@ -712,7 +712,7 @@ prt_in,168,109,0 script A File#megin3 111,{
}
}
-prt_in,169,109,0 script A File#megin4 111,{
+prt_in,169,109,0 script A File#megin4 HIDDEN_NPC,{
if (god_eremes == 12) {
mes "You have found ^0000FFThe 3rd Platoon Records^000000!";
close;
@@ -744,7 +744,7 @@ prt_in,169,109,0 script A File#megin4 111,{
}
}
-prt_in,166,109,0 script A File#megin5 111,{
+prt_in,166,109,0 script A File#megin5 HIDDEN_NPC,{
if (god_eremes == 12) {
mes "You have found";
mes "^0000FFThe 3rd Platoon Records^000000!";
@@ -777,7 +777,7 @@ prt_in,166,109,0 script A File#megin5 111,{
}
}
-prt_in,172,106,0 script Librarian#megin 833,{
+prt_in,172,106,0 script Librarian#megin 4_M_ZONDAOYAJI,{
if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
if (god_eremes > 2 && god_eremes < 7) {
mes "[Librarian Jekan]";
@@ -1535,7 +1535,7 @@ prt_in,172,106,0 script Librarian#megin 833,{
close;
}
-geffen_in,109,161,3 script Crusader#God1 751,{
+geffen_in,109,161,3 script Crusader#God1 4_M_CRU,{
if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
if (god_eremes > 17 && god_megin_1 < 2) {
mes "[Zan.Huadoku]";
@@ -1789,7 +1789,7 @@ geffen_in,109,161,3 script Crusader#God1 751,{
}
}
-morocc_in,146,179,0 script Employee#megin1 66,{
+morocc_in,146,179,0 script Employee#megin1 1_F_01,{
if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
if (god_eremes > 17 && god_megin_2 < 1) {
mes "^3355FFThe Inn Employee";
@@ -1994,7 +1994,7 @@ morocc_in,146,179,0 script Employee#megin1 66,{
}
}
-in_rogue,243,61,0 script Suspicious Man#megin 748,{
+in_rogue,243,61,0 script Suspicious Man#megin 4_M_ALCHE_A,{
if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
if (god_eremes == 18) {
mes "[Cuaque Donon]";
@@ -2263,7 +2263,7 @@ in_rogue,243,61,0 script Suspicious Man#megin 748,{
}
}
-alberta,196,146,0 script Crusader#megin2 751,{
+alberta,196,146,0 script Crusader#megin2 4_M_CRU,{
if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
if (god_eremes == 18) {
mes "[Jack O]";
@@ -2454,7 +2454,7 @@ alberta,196,146,0 script Crusader#megin2 751,{
}
}
-aldebaran,66,213,0 script Lady#megin 69,{
+aldebaran,66,213,0 script Lady#megin 1_F_04,{
if (checkweight(1301,3) == 0) {
mes "- You are carrying too many items!";
close;
@@ -2703,7 +2703,7 @@ aldebaran,66,213,0 script Lady#megin 69,{
}
}
-cmd_in02,190,94,3 script Man#megin 828,{
+cmd_in02,190,94,3 script Man#megin 4_M_ROGUE,{
if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
if (god_eremes == 18) {
mes "[Royal Myst]";
@@ -2907,7 +2907,7 @@ cmd_in02,190,94,3 script Man#megin 828,{
}
}
-jawaii_in,44,110,0 script Security Officer#megin 734,{
+jawaii_in,44,110,0 script Security Officer#megin 4_M_JOB_KNIGHT2,{
if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
if (god_eremes == 18) {
mes "[The Nineball]";
@@ -2965,7 +2965,7 @@ jawaii_in,44,110,0 script Security Officer#megin 734,{
}
-niflheim,109,254,0 script Egnigem 796,{
+niflheim,109,254,0 script Egnigem 4_M_NFDEADSWDMAN,{
if ($God1 >= $@god_check1 && $God2 < $@god_check2) {
if (god_eremes > 19 && god_eremes < 25) {
if (god_eremes > 22) {
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index d2e7ba1ca..375b47426 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -22,7 +22,7 @@
//= 1.9 Renewal script update. [Euphy]
//============================================================
-prontera,124,297,3 script Tialfi 706,{
+prontera,124,297,3 script Tialfi 4_M_KID1,{
if (checkweight(1301,3) == 0) {
mes "- You are carrying too many items! -";
close;
@@ -367,7 +367,7 @@ prontera,124,297,3 script Tialfi 706,{
end;
}
-prt_fild01,196,47,3 script Roskva 703,{
+prt_fild01,196,47,3 script Roskva 4_F_KID2,{
if (god_mjo_0 == 1) {
mes "[Roskva]";
mes "You should know that Dwarven Blacksmiths are extremely offended if you do not speak to them with the utmost respect.";
@@ -420,7 +420,7 @@ prt_fild01,196,47,3 script Roskva 703,{
}
}
-mjolnir_11,149,247,5 script Dwarf Blacksmith#east 826,{
+mjolnir_11,149,247,5 script Dwarf Blacksmith#east 4_M_DWARF,{
if ($God3 < $@god_check1) {
mes "[Austri]";
mes "Something is happening somewhere on this continent. You might not believe me, but I keep getting visions of the Fenrir-Wolf.";
@@ -980,7 +980,7 @@ mjolnir_11,149,247,5 script Dwarf Blacksmith#east 826,{
}
}
-mjolnir_09,209,341,3 script Dwarf Blacksmith#south 826,{
+mjolnir_09,209,341,3 script Dwarf Blacksmith#south 4_M_DWARF,{
if ($God3 < $@god_check1) {
mes "[Sudri]";
mes "I want to compete";
@@ -1847,7 +1847,7 @@ mjolnir_09,209,341,3 script Dwarf Blacksmith#south 826,{
}
}
-mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{
+mjolnir_01,35,136,7 script Dwarf Blacksmith#west 4_M_DWARF,{
if ($God3 < $@god_check1) {
mes "[Vestri]";
mes "If you want something, you should earn it through your own efforts.";
@@ -2342,7 +2342,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{
}
}
-mjolnir_12,18,18,7 script Dwarf Blacksmith#north 826,{
+mjolnir_12,18,18,7 script Dwarf Blacksmith#north 4_M_DWARF,{
if ($God3 < $@god_check1) {
mes "[Nordri]";
mes "What...?";
diff --git a/npc/quests/seals/seal_status.txt b/npc/quests/seals/seal_status.txt
index c9e6515fb..1b15981ab 100644
--- a/npc/quests/seals/seal_status.txt
+++ b/npc/quests/seals/seal_status.txt
@@ -13,7 +13,7 @@
//= 1.3 Renewal script update. [Euphy]
//============================================================
-prontera,113,294,3 script Sign Post#god 837,{
+prontera,113,294,3 script Sign Post#god 2_BULLETIN_BOARD,{
mes "======== God Seal Status ========";
setarray .@seal$[1], "Sleipnir","Megingjard","Brisingamen","Mjolnir";
for(set .@i,1; .@i<=4; set .@i,.@i+1) {
diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt
index 4b4e70f8b..85005a4fd 100644
--- a/npc/quests/seals/sleipnir_seal.txt
+++ b/npc/quests/seals/sleipnir_seal.txt
@@ -14,7 +14,7 @@
//= 1.4 Renewal script update. [Euphy]
//============================================================
-yuno,164,200,4 script Noyee#G 101,{
+yuno,164,200,4 script Noyee#G 4W_F_01,{
if (BaseLevel < 70) {
mes "[Noyee]";
mes "Did you know that there's a difference between the armor you can buy from NPC shops and the kinds you obtain from hunting monsters?";
@@ -59,7 +59,7 @@ yuno,164,200,4 script Noyee#G 101,{
}
}
-que_god01,98,98,4 script Manager#G 69,{
+que_god01,98,98,4 script Manager#G 1_F_04,{
if (checkweight(908,500) == 0) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
@@ -505,7 +505,7 @@ que_god01,98,98,4 script Manager#G 69,{
end;
}
-que_god01,66,125,6 script Researcher#G1 89,{
+que_god01,66,125,6 script Researcher#G1 4_M_ORIENT02,{
if ($God1 < $@god_check2) {
if (god_sl_1 == 2) {
set god_sl_1,11;
@@ -671,7 +671,7 @@ que_god01,66,125,6 script Researcher#G1 89,{
}
}
-que_god01,11,136,6 script Researcher#G2 742,{
+que_god01,11,136,6 script Researcher#G2 2_M_SAGE_B,{
if ($God1 < $@god_check2) {
if (god_sl_1 == 2) {
set god_sl_1,21;
@@ -890,7 +890,7 @@ que_god01,11,136,6 script Researcher#G2 742,{
}
}
-que_god01,55,47,3 script Researcher#G3 803,{
+que_god01,55,47,3 script Researcher#G3 1_F_SIGNZISK,{
if ($God1 < $@god_check2) {
if (god_sl_1 == 2) {
set god_sl_1,31;
@@ -1156,7 +1156,7 @@ que_god01,55,47,3 script Researcher#G3 803,{
}
}
-que_god01,14,47,3 script Researcher#G4 713,{
+que_god01,14,47,3 script Researcher#G4 4_M_06,{
if ($God1 < $@god_check2) {
if (god_sl_1 == 2) {
set god_sl_1,41;
@@ -1262,7 +1262,7 @@ que_god01,14,47,3 script Researcher#G4 713,{
}
}
-que_god01,20,48,0 script Slab#G 111,{
+que_god01,20,48,0 script Slab#G HIDDEN_NPC,{
if ($God1 < $@god_check2) {
if ((god_sl_1 == 41) || (god_sl_1 == 12) || (god_sl_1 == 23) || (god_sl_1 == 34)) {
if ((god_sl_2 == 1) || (god_sl_2 == 2)) {
@@ -1408,7 +1408,7 @@ que_god01,20,48,0 script Slab#G 111,{
}
}
-payon,79,171,4 script Friar#G5 95,{
+payon,79,171,4 script Friar#G5 4_F_SISTER,{
if ($God1 < $@god_check2) {
if ((god_sl_1 == 21) || (god_sl_1 == 32) || (god_sl_1 == 43) || (god_sl_1 == 14)) {
if ((god_sl_2 == 1) || (god_sl_2 == 3)) {
@@ -1818,7 +1818,7 @@ payon,79,171,4 script Friar#G5 95,{
}
}
-que_god01,84,95,0 script Switch#God0 111,{
+que_god01,84,95,0 script Switch#God0 HIDDEN_NPC,{
if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
next;
@@ -1834,7 +1834,7 @@ que_god01,84,95,0 script Switch#God0 111,{
}
}
-que_god01,84,92,0 script god_sl_w0 45,1,1,{
+que_god01,84,92,0 script god_sl_w0 WARPNPC,1,1,{
OnTouch:
if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
@@ -1848,7 +1848,7 @@ OnTouch:
}
}
-que_god01,49,97,0 script Switch#God1 111,{
+que_god01,49,97,0 script Switch#God1 HIDDEN_NPC,{
if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
next;
@@ -1861,7 +1861,7 @@ que_god01,49,97,0 script Switch#God1 111,{
}
}
-que_god01,46,97,0 script god_sl_w1 45,1,1,{
+que_god01,46,97,0 script god_sl_w1 WARPNPC,1,1,{
OnTouch:
if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
@@ -1875,7 +1875,7 @@ OnTouch:
}
}
-que_god01,19,97,0 script Switch#God2 111,{
+que_god01,19,97,0 script Switch#God2 HIDDEN_NPC,{
if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
next;
@@ -1888,7 +1888,7 @@ que_god01,19,97,0 script Switch#God2 111,{
}
}
-que_god01,16,97,0 script god_sl_w2 45,1,1,{
+que_god01,16,97,0 script god_sl_w2 WARPNPC,1,1,{
OnTouch:
if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
@@ -1902,7 +1902,7 @@ OnTouch:
}
}
-que_god01,14,80,0 script Switch#God3 111,{
+que_god01,14,80,0 script Switch#God3 HIDDEN_NPC,{
if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
next;
@@ -1915,7 +1915,7 @@ que_god01,14,80,0 script Switch#God3 111,{
}
}
-que_god01,17,80,0 script god_sl_w3 45,1,1,{
+que_god01,17,80,0 script god_sl_w3 WARPNPC,1,1,{
OnTouch:
if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
@@ -1929,7 +1929,7 @@ OnTouch:
}
}
-que_god01,44,80,0 script Switch#God4 111,{
+que_god01,44,80,0 script Switch#God4 HIDDEN_NPC,{
if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
next;
@@ -1942,7 +1942,7 @@ que_god01,44,80,0 script Switch#God4 111,{
}
}
-que_god01,47,80,0 script god_sl_w4 45,1,1,{
+que_god01,47,80,0 script god_sl_w4 WARPNPC,1,1,{
OnTouch:
if ((god_sl_1 > 1) && (god_sl_1 < 51)) {
mes "^3355FFThe door is locked. You slide your temporary pass on the security device on the right side of the door, and the door unlocks.^000000";
diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt
index 113104401..d5db475f8 100644
--- a/npc/quests/skills/acolyte_skills.txt
+++ b/npc/quests/skills/acolyte_skills.txt
@@ -13,7 +13,7 @@
//= 1.8 Fixed JobLevel requirements. [Euphy]
//============================================================
-prt_church,173,23,4 script Cleric 79,{
+prt_church,173,23,4 script Cleric 1_F_PRIEST,{
mes "[Acolyte Klift]";
mes "Ahh . Brothers ! Does the task of";
mes "caring for out lost sheep burden";
diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt
index 678c2696b..d735220b3 100644
--- a/npc/quests/skills/alchemist_skills.txt
+++ b/npc/quests/skills/alchemist_skills.txt
@@ -16,7 +16,7 @@
//= 2.2 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-yuno_in04,33,108,4 script Pisruik#qsk_al 883,{
+yuno_in04,33,108,4 script Pisruik#qsk_al 4_M_ALCHE_D,{
if (BaseJob == Job_Alchemist) {
if (JobLevel < 40) {
mes "[Pisruik]";
@@ -1101,7 +1101,7 @@ yuno_in04,33,108,4 script Pisruik#qsk_al 883,{
}
}
-yuno_in04,22,107,5 script Irache#qsk_al 740,{
+yuno_in04,22,107,5 script Irache#qsk_al 2_M_ALCHE,{
mes "[Irache]";
mes "Heh heh heh...!";
mes "It's done! With this";
@@ -1119,7 +1119,7 @@ yuno_in04,22,107,5 script Irache#qsk_al 740,{
close;
}
-yuno_in04,27,107,4 script Degas#qsk_al 748,{
+yuno_in04,27,107,4 script Degas#qsk_al 4_M_ALCHE_A,{
mes "[Degas]";
mes "It's such a pain working";
mes "so close to these other";
@@ -1137,7 +1137,7 @@ yuno_in04,27,107,4 script Degas#qsk_al 748,{
close;
}
-yuno_in04,33,106,4 script Pile of Books#qsk_al 111,{
+yuno_in04,33,106,4 script Pile of Books#qsk_al HIDDEN_NPC,{
mes "^3355FFIt's simply a pile";
mes "of scattered documents.";
mes "Although it seems unorganized,";
@@ -1147,7 +1147,7 @@ yuno_in04,33,106,4 script Pile of Books#qsk_al 111,{
}
// Start Bioethics quest
-lhz_in01,224,140,3 script Kellasus#qsk_al 57,{
+lhz_in01,224,140,3 script Kellasus#qsk_al 1_M_LIBRARYMASTER,{
if (BaseJob == Job_Alchemist && bioeth == 13) {
mes "[Kellasus]";
mes "Keep up the";
@@ -1740,7 +1740,7 @@ lhz_in01,224,140,3 script Kellasus#qsk_al 57,{
close;
}
-lhz_in01,225,122,5 script Skrajjad#qsk_al 754,{
+lhz_in01,225,122,5 script Skrajjad#qsk_al 4_M_SAGE_A,{
if (BaseJob == Job_Alchemist && bioeth > 4) {
mes "[Skrajjad]";
mes "I've taught you everything";
@@ -1854,7 +1854,7 @@ lhz_in01,225,122,5 script Skrajjad#qsk_al 754,{
close;
}
-lhz_in01,204,138,5 script Keshibien#qsk_al 750,{
+lhz_in01,204,138,5 script Keshibien#qsk_al 4_M_ALCHE_C,{
if (BaseJob == Job_Alchemist && bioeth > 5) {
mes "[Keshibien]";
mes "I hope that you";
@@ -1966,7 +1966,7 @@ lhz_in01,204,138,5 script Keshibien#qsk_al 750,{
close;
}
-lhz_in02,278,273,3 script Broncher#qsk_al 709,{
+lhz_in02,278,273,3 script Broncher#qsk_al 4_M_SEAMAN,{
if (BaseJob == Job_Alchemist && bioeth > 6) {
mes "[Broncher]";
mes "You again? Didn't I already";
@@ -2058,7 +2058,7 @@ lhz_in02,278,273,3 script Broncher#qsk_al 709,{
close;
}
-lhz_in03,106,34,3 script Koring#qsk_al 706,{
+lhz_in03,106,34,3 script Koring#qsk_al 4_M_KID1,{
if (BaseJob == Job_Alchemist && bioeth == 8 || bioeth == 9) {
mes "[Koring]";
mes "My daddy is the bestest";
@@ -2104,7 +2104,7 @@ lhz_in03,106,34,3 script Koring#qsk_al 706,{
close;
}
-lhz_in03,109,31,5 script Beninne#qsk_al 90,{
+lhz_in03,109,31,5 script Beninne#qsk_al 4_F_01,{
if (BaseJob == Job_Alchemist && bioeth == 8 || bioeth == 9) {
mes "[Beninne]";
mes "You've met my husband,";
@@ -2148,7 +2148,7 @@ lhz_in03,109,31,5 script Beninne#qsk_al 90,{
close;
}
-lighthalzen,226,210,3 script Nannan#qsk_al 86,{
+lighthalzen,226,210,3 script Nannan#qsk_al 4_M_04,{
mes "[Nannan]";
mes "You know, I always thought^FFFFFF ^000000 that all Alchemists were bookish,";
mes "scholarly types, their faces always buried in books and studying. But";
@@ -2170,7 +2170,7 @@ lighthalzen,226,210,3 script Nannan#qsk_al 86,{
close;
}
-lhz_in01,218,141,7 script Alchemist#qsk_al 98,{
+lhz_in01,218,141,7 script Alchemist#qsk_al 4W_M_02,{
mes "[Alchemist]";
mes "Out of all humans,";
mes "I believe Kellasus is";
diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt
index 63a465e25..b97fb260b 100644
--- a/npc/quests/skills/archer_skills.txt
+++ b/npc/quests/skills/archer_skills.txt
@@ -13,7 +13,7 @@
//= 1.7 Fixed JobLevel requirements. [Euphy]
//============================================================
-moc_ruins,118,99,5 script Roberto 88,{
+moc_ruins,118,99,5 script Roberto 4_M_ORIENT01,{
if (BaseClass == Job_Archer) {
if (getskilllv("AC_MAKINGARROW") == 1) {
mes "[Roberto]";
@@ -139,7 +139,7 @@ moc_ruins,118,99,5 script Roberto 88,{
close;
}
-payon,103,63,3 script Jason 88,3,3,{
+payon,103,63,3 script Jason 4_M_ORIENT01,3,3,{
if (BaseClass == Job_Archer) {
if (getskilllv("AC_CHARGEARROW") == 1) {
mes "[Jason]";
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 568d0c369..8ff7da04c 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -12,7 +12,7 @@
//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-in_moc_16,14,27,5 script Assassin#realman 884,{
+in_moc_16,14,27,5 script Assassin#realman 4_M_ACROSS,{
if (BaseJob == Job_Assassin && ASSN_SK2 == 1) {
if (getskilllv("AS_VENOMKNIFE") == 0) {
mes "[Killtin]";
@@ -284,7 +284,7 @@ in_moc_16,14,27,5 script Assassin#realman 884,{
}
}
-in_moc_16,23,27,5 script Assassin#realgirl 885,{
+in_moc_16,23,27,5 script Assassin#realgirl 4_F_ACROSS,{
if (BaseJob == Job_Assassin && ASSN_SK == 7) {
if (getskilllv("AS_SONICACCEL") == 0) {
mes "[Esmille]";
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index d64281100..0074a5a79 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -25,7 +25,7 @@
//= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-prontera,174,328,3 script Young Man#bard_q1 89,3,3,{
+prontera,174,328,3 script Young Man#bard_q1 4_M_ORIENT02,3,3,{
if (BaseJob == Job_Bard) {
emotion e_omg;
mes "[Timid Young Man]";
@@ -377,7 +377,7 @@ OnTouch:
end;
}
-morocc_in,169,72,7 script Spiteful-Looking Bard#bs 741,3,3,{
+morocc_in,169,72,7 script Spiteful-Looking Bard#bs 2_M_BARD_ORIENT,3,3,{
if (BaseJob == Job_Bard) {
if (Class == Job_Clown && qskill_bard == 9) {
if (getskilllv("BA_PANGVOICE") != 0) {
@@ -902,7 +902,7 @@ OnTouch:
// Yhelle the Chicken
//============================================================
-niflheim,239,70,1 script Yhelle#bard_chick1 800,3,3,{
+niflheim,239,70,1 script Yhelle#bard_chick1 4_NFCOCK,3,3,{
emotion e_omg,1;
emotion e_omg;
mes "[Hen Yhelle]";
@@ -935,7 +935,7 @@ OnTouch:
callfunc "F_BardSkillYhelle",1,2; close;
}
-niflheim,185,205,3 script Yhelle#bard_chick2 800,3,3,{
+niflheim,185,205,3 script Yhelle#bard_chick2 4_NFCOCK,3,3,{
emotion e_omg,1;
emotion e_omg;
mes "[Hen Yhelle]";
@@ -961,7 +961,7 @@ OnTouch:
callfunc "F_BardSkillYhelle",2,3; close;
}
-niflheim,85,203,5 script Yhelle#bard_chick3 800,3,3,{
+niflheim,85,203,5 script Yhelle#bard_chick3 4_NFCOCK,3,3,{
emotion e_omg,1;
emotion e_omg;
mes "[Hen Yhelle]";
@@ -987,7 +987,7 @@ OnTouch:
callfunc "F_BardSkillYhelle",3,4; close;
}
-niflheim,149,81,7 script Yhelle#bard_chick4 800,3,3,{
+niflheim,149,81,7 script Yhelle#bard_chick4 4_NFCOCK,3,3,{
emotion e_omg,1;
emotion e_omg;
mes "[Hen Yhelle]";
@@ -1013,7 +1013,7 @@ OnTouch:
callfunc "F_BardSkillYhelle",4,5; close;
}
-niflheim,209,144,3 script Yhelle#bard_chick5 800,3,3,{
+niflheim,209,144,3 script Yhelle#bard_chick5 4_NFCOCK,3,3,{
emotion e_omg,1;
emotion e_omg;
mes "[Hen Yhelle]";
@@ -1041,7 +1041,7 @@ OnTouch:
// Drunken Men
//============================================================
-morocc_in,178,73,3 script Customer#bard_skill01 54,{
+morocc_in,178,73,3 script Customer#bard_skill01 1_M_JOBGUIDER,{
mes "[Little Bit Drunken Guy]";
mes "What do you think";
mes "is the best drink in";
@@ -1101,7 +1101,7 @@ morocc_in,178,73,3 script Customer#bard_skill01 54,{
close;
}
-morocc_in,175,70,7 script Customer#bard_skill02 50,{
+morocc_in,175,70,7 script Customer#bard_skill02 1_M_04,{
mes "[Little Bit Drunken Guy]";
mes "What do you think";
mes "is the best drink in";
@@ -1163,7 +1163,7 @@ morocc_in,175,70,7 script Customer#bard_skill02 50,{
// Bartender
//============================================================
-morocc_in,166,76,7 script Bartender#bard_qskill 46,{
+morocc_in,166,76,7 script Bartender#bard_qskill 1_ETC_01,{
if (checkweight(1201,1) == 0) {
mes "^3355FFHold it right there!";
mes "You're carrying too many items and don't have enough inventory space to receive any rewards. Please make more inventory space available and come back to take this challenge.";
diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt
index 8764c3e01..ba7bf82cf 100644
--- a/npc/quests/skills/blacksmith_skills.txt
+++ b/npc/quests/skills/blacksmith_skills.txt
@@ -11,7 +11,7 @@
//= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//============================================================
-geffen,178,72,3 script Akkie#qsk_bs 726,{
+geffen,178,72,3 script Akkie#qsk_bs 4_F_JOB_BLACKSMITH,{
if (BaseJob == Job_Blacksmith) {
if (BLACK_SK == 7 && getskilllv("BS_UNFAIRLYTRICK") == 0) {
mes "[Akkie]";
@@ -471,7 +471,7 @@ geffen,178,72,3 script Akkie#qsk_bs 726,{
}
}
-geffen,172,52,1 script Goodman#qsk_bs 826,{
+geffen,172,52,1 script Goodman#qsk_bs 4_M_DWARF,{
if (BaseJob == Job_Blacksmith) {
if (BLACK_SK2 == 2 && Upper == 1 && getskilllv("BS_GREED") == 0) {
mes "[Goodman]";
diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt
index 144ab44cf..46e294197 100644
--- a/npc/quests/skills/crusader_skills.txt
+++ b/npc/quests/skills/crusader_skills.txt
@@ -11,7 +11,7 @@
//= 1.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//============================================================
-geffen,110,117,3 script Ford#11 752,{
+geffen,110,117,3 script Ford#11 4_M_CRU_OLD,{
if (BaseJob == Job_Crusader) {
if (CRUS_SK == 8 && getskilllv("CR_SHRINK") == 0) {
mes "[Ford]";
@@ -275,7 +275,7 @@ geffen,110,117,3 script Ford#11 752,{
}
}
-gef_fild13,297,242,3 script Soldier#277 751,{
+gef_fild13,297,242,3 script Soldier#277 4_M_CRU,{
if (BaseJob == Job_Crusader) {
if (Upper == 1 && getskilllv("CR_SHRINK")) {
if (CRUS_SK == 8) {
@@ -576,7 +576,7 @@ gef_fild13,297,242,3 script Soldier#277 751,{
}
}
-prt_church,87,127,3 script Pastor#1011 755,{
+prt_church,87,127,3 script Pastor#1011 4_M_SAGE_C,{
if (BaseJob == Job_Crusader) {
if (Upper == 1 && getskilllv("CR_SHRINK")) {
if (CRUS_SK == 8) {
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index 3c7efd345..6a6c802f6 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -13,7 +13,7 @@
//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-comodo,204,172,5 script Canell#qsk_dan01 724,{
+comodo,204,172,5 script Canell#qsk_dan01 4_F_07,{
if (BaseJob == Job_Dancer && JobLevel > 39) {
if (DANCER_SK == 0) {
mes "[Canell]";
@@ -398,7 +398,7 @@ comodo,204,172,5 script Canell#qsk_dan01 724,{
}
}
-prontera,183,333,1 script Aelle#qsk_dan02 79,{
+prontera,183,333,1 script Aelle#qsk_dan02 1_F_PRIEST,{
if (BaseJob == Job_Dancer) {
if (DANCER_SK == 3) {
mes "[Aelle]";
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index 5178d622f..eca408915 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -22,7 +22,7 @@
//= 1.4 Moved Arpesto from tu_archer and added his script. [Kisuka]
//============================================================
-pay_arche,109,169,3 script Arpesto 712,{
+pay_arche,109,169,3 script Arpesto 4_M_05,{
if (BaseJob == Job_Hunter) {
if (qskill_hunter == 100) {
if (getskilllv("HT_PHANTASMIC")) {
diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt
index 9d3358975..818303c68 100644
--- a/npc/quests/skills/knight_skills.txt
+++ b/npc/quests/skills/knight_skills.txt
@@ -11,7 +11,7 @@
//= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//============================================================
-prt_in,85,99,3 script Knight#kabuto 734,{
+prt_in,85,99,3 script Knight#kabuto 4_M_JOB_KNIGHT2,{
if (BaseJob == Job_Knight) {
if (KNGT_SK == 10) {
mes "[Essofeit]";
@@ -306,7 +306,7 @@ prt_in,85,99,3 script Knight#kabuto 734,{
close;
}
-prontera,69,351,0 script #tour 111,5,5,{
+prontera,69,351,0 script #tour HIDDEN_NPC,5,5,{
//OnTouch2:
OnTouch:
if (KNGT_SK > 2)
@@ -339,7 +339,7 @@ OnTouch:
close;
}
-prontera,72,352,7 script Grand Master 733,{
+prontera,72,352,7 script Grand Master 4_M_JOB_KNIGHT1,{
mes "[Grand Master]";
if (KNGT_SK == 2 || KNGT_SK == 3) {
mes "Alright men, you don't";
@@ -372,7 +372,7 @@ prontera,72,352,7 script Grand Master 733,{
close;
}
-prontera,78,354,3 script Knight#zabii 734,{
+prontera,78,354,3 script Knight#zabii 4_M_JOB_KNIGHT2,{
if (KNGT_SK == 3 || KNGT_SK == 4) {
mes "[Zabi]";
mes "I guess we're more like";
@@ -410,7 +410,7 @@ prontera,78,354,3 script Knight#zabii 734,{
close;
}
-prontera,73,357,5 script Knight#drake 734,{
+prontera,73,357,5 script Knight#drake 4_M_JOB_KNIGHT2,{
if (KNGT_SK == 4 || KNGT_SK == 5) {
mes "[Gon]";
mes "What'll I get with";
@@ -444,7 +444,7 @@ prontera,73,357,5 script Knight#drake 734,{
close;
}
-prontera,78,357,3 script Knight#sasword 734,{
+prontera,78,357,3 script Knight#sasword 4_M_JOB_KNIGHT2,{
mes "[Jiya]";
if (KNGT_SK == 5 || KNGT_SK == 6) {
mes "Man, this division of";
@@ -471,7 +471,7 @@ prontera,78,357,3 script Knight#sasword 734,{
close;
}
-prontera,66,358,5 script Knight#gattack 733,{
+prontera,66,358,5 script Knight#gattack 4_M_JOB_KNIGHT1,{
mes "[Gatack]";
if (KNGT_SK == 7) {
mes "Wait, where's";
diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt
index 374330778..3b250b647 100644
--- a/npc/quests/skills/mage_skills.txt
+++ b/npc/quests/skills/mage_skills.txt
@@ -13,7 +13,7 @@
//= 1.8 Fixed JobLevel requirements. [Euphy]
//============================================================
-geffen_in,151,119,4 script Great Wizard 64,{
+geffen_in,151,119,4 script Great Wizard 1_M_WIZARD,{
mes "[BLIZZARDRISS]";
mes "Hey ! My friend !";
mes "I see that you are a mage.";
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 55bc11381..592c6b9dd 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -13,7 +13,7 @@
//= 1.8 Moved Alberta NPC to pre-re/re paths. [Euphy]
//============================================================
-alberta,83,96,5 script Necko 98,7,7,{
+alberta,83,96,5 script Necko 4W_M_02,7,7,{
if (BaseClass == Job_Merchant) {
if (getskilllv("MC_LOUD") == 1) {
mes "[Necko]";
@@ -177,7 +177,7 @@ OnTouch:
close;
}
-alberta,119,221,6 script Charlron 107,{
+alberta,119,221,6 script Charlron 1_M_PAY_ELDER,{
if (BaseClass == Job_Merchant) {
if (getskilllv("MC_CHANGECART") == 1) {
mes "[Charlron]";
diff --git a/npc/quests/skills/monk_skills.txt b/npc/quests/skills/monk_skills.txt
index 920827f51..1522dec86 100644
--- a/npc/quests/skills/monk_skills.txt
+++ b/npc/quests/skills/monk_skills.txt
@@ -11,7 +11,7 @@
//= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
//============================================================
-prt_monk,270,198,3 script Apprentice Monk#qsk_mo 753,{
+prt_monk,270,198,3 script Apprentice Monk#qsk_mo 4_M_MONK,{
if (BaseJob == Job_Monk) {
if (MONK_SK == 7) {
mes "[Monk]";
@@ -209,7 +209,7 @@ prt_monk,270,198,3 script Apprentice Monk#qsk_mo 753,{
close;
}
-monk_test,316,69,5 script Monk#qsk_mo 823,{
+monk_test,316,69,5 script Monk#qsk_mo 4_M_CHNMONK,{
if (BaseJob == Job_Monk) {
if (MONK_SK == 6) {
mes "[Monk]";
diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt
index a3028bc93..c7512b38b 100644
--- a/npc/quests/skills/novice_skills.txt
+++ b/npc/quests/skills/novice_skills.txt
@@ -13,7 +13,7 @@
//= 1.8 Added Baby support. [Zopokx]
//============================================================
-prt_in,234,133,4 script Nami 66,{
+prt_in,234,133,4 script Nami 1_F_01,{
if ((Class == Job_Novice || Class == Job_Baby) && (JobLevel > 3 || BaseLevel > 11) && (skill_nov < 3)) {
mes "[Nami]";
mes "Hello!";
@@ -187,7 +187,7 @@ prt_in,234,133,4 script Nami 66,{
close;
}
-prt_in,73,87,4 script Chivalry Member 65,{
+prt_in,73,87,4 script Chivalry Member 1_M_YOUNGKNIGHT,{
if ((Class == Job_Novice || Class == Job_Baby) && (JobLevel > 6) && ((skill_nov >= 3) && (skill_nov <= 5))) {
mes "[Bulma]";
mes "Yeah. . . I look great. . .";
@@ -355,7 +355,7 @@ prt_in,73,87,4 script Chivalry Member 65,{
close;
}
-prt_castle,175,146,4 script Nursing Instructor 50,{
+prt_castle,175,146,4 script Nursing Instructor 1_M_04,{
mes "[Dread Lord]";
mes ". . . . . . . . . .";
mes ". . . . . . . . . .";
diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt
index 5cb0f7ba8..ebed55087 100644
--- a/npc/quests/skills/priest_skills.txt
+++ b/npc/quests/skills/priest_skills.txt
@@ -12,7 +12,7 @@
//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-prt_church,111,112,1 script Sister Linus 79,{
+prt_church,111,112,1 script Sister Linus 1_F_PRIEST,{
if (BaseJob == Job_Priest) {
if (PRIEST_SK == 100) {
if (getskilllv("PR_REDEMPTIO") == 0) {
diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index 6d9034627..7f12d3d2e 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -46,7 +46,7 @@ OnTimer150000:
end;
}
-in_rogue,357,174,2 script Killer#Rogueguild 705,1,1,{
+in_rogue,357,174,2 script Killer#Rogueguild 4_M_GEF_SOLDIER,1,1,{
OnInit:
disablenpc "Killer#Rogueguild";
end;
@@ -129,7 +129,7 @@ OnTouch:
end;
}
-in_rogue,355,179,0 script Haijara Greg#rogueguild 46,{
+in_rogue,355,179,0 script Haijara Greg#rogueguild 1_ETC_01,{
if (BaseJob == Job_Rogue) {
if (ROG_SK == 12 && Upper == 1) {
mes "[Haijara Greg]";
@@ -539,7 +539,7 @@ in_rogue,355,179,0 script Haijara Greg#rogueguild 46,{
}
}
-in_rogue,152,29,0 script Louis Greg#rogueguild 84,{
+in_rogue,152,29,0 script Louis Greg#rogueguild 4_M_02,{
if (BaseJob == Job_Rogue || Class == Job_Thief_High) {
if (ROG_SK < 1) {
mes "[Louis Greg]";
@@ -694,7 +694,7 @@ in_rogue,152,29,0 script Louis Greg#rogueguild 84,{
close;
}
-in_rogue,268,125,2 script Thor Greg#rogueguild 86,{
+in_rogue,268,125,2 script Thor Greg#rogueguild 4_M_04,{
if (BaseJob == Job_Rogue || Class == Job_Thief_High) {
if (ROG_SK < 1) {
mes "[Thor Greg]";
@@ -886,7 +886,7 @@ in_rogue,268,125,2 script Thor Greg#rogueguild 86,{
close;
}
-in_rogue,181,114,3 script Jay Greg#rogueguild 85,{
+in_rogue,181,114,3 script Jay Greg#rogueguild 4_M_03,{
if (BaseJob == Job_Rogue || Class == Job_Thief_High) {
if (ROG_SK < 1) {
mes "[Jay Greg]";
@@ -1151,19 +1151,19 @@ OnDisable:
end;
}
-prt_are01,149,162,0 script Kienna#1st 700,1,1,{
+prt_are01,149,162,0 script Kienna#1st 8_F_GIRL,1,1,{
end;
OnTouch:
callfunc "F_Kienna",strnpcinfo(2);
end;
}
-prt_are01,136,150,0 duplicate(Kienna#1st) Kienna#2nd 700,1,1
-prt_are01,150,138,0 duplicate(Kienna#1st) Kienna#3rd 700,1,1
-prt_are01,163,147,0 duplicate(Kienna#1st) Kienna#4th 700,1,1
-prt_are01,134,140,0 duplicate(Kienna#1st) Kienna#5th 700,1,1
-prt_are01,161,140,0 duplicate(Kienna#1st) Kienna#6th 700,1,1
-prt_are01,161,160,0 duplicate(Kienna#1st) Kienna#7th 700,1,1
-prt_are01,138,159,0 duplicate(Kienna#1st) Kienna#8th 700,1,1
+prt_are01,136,150,0 duplicate(Kienna#1st) Kienna#2nd 8_F_GIRL,1,1
+prt_are01,150,138,0 duplicate(Kienna#1st) Kienna#3rd 8_F_GIRL,1,1
+prt_are01,163,147,0 duplicate(Kienna#1st) Kienna#4th 8_F_GIRL,1,1
+prt_are01,134,140,0 duplicate(Kienna#1st) Kienna#5th 8_F_GIRL,1,1
+prt_are01,161,140,0 duplicate(Kienna#1st) Kienna#6th 8_F_GIRL,1,1
+prt_are01,161,160,0 duplicate(Kienna#1st) Kienna#7th 8_F_GIRL,1,1
+prt_are01,138,159,0 duplicate(Kienna#1st) Kienna#8th 8_F_GIRL,1,1
function script F_Kienna {
if (ROG_SK == 6) {
@@ -1336,7 +1336,7 @@ OnInit:
end;
}
-in_rogue,88,119,3 script Waiting Room#rogue10 828,{
+in_rogue,88,119,3 script Waiting Room#rogue10 4_M_ROGUE,{
OnEnable:
enablenpc "Waiting Room#rogue10";
enablewaitingroomevent "Waiting Room#rogue10";
diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt
index c66978a85..5fdc38741 100644
--- a/npc/quests/skills/sage_skills.txt
+++ b/npc/quests/skills/sage_skills.txt
@@ -12,7 +12,7 @@
//= 1.5 Optimized. [Euphy]
//============================================================
-yuno_in03,176,24,3 script Mischna 755,{
+yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{
if(BaseJob != Job_Sage) {
mes "[Mishuna]";
mes "Good day, I'm Mishuna, one";
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index 7441d5caf..4e152c780 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -13,7 +13,7 @@
//= 1.8 Fixed JobLevel requirements. [Euphy]
//============================================================
-izlude_in,175,130,2 script Knight De Thomas 98,4,4,{
+izlude_in,175,130,2 script Knight De Thomas 4W_M_02,4,4,{
if ((BaseClass == Job_Swordman) && (sm_movingrecovery_x < 1)) {
mes "[De Thomas]";
mes "Oh, no! You must have been hurt! Are you ok?";
@@ -147,7 +147,7 @@ izlude_in,175,130,2 script Knight De Thomas 98,4,4,{
close;
}
-prt_in,75,88,5 script Leon Von Frich 85,3,3,{
+prt_in,75,88,5 script Leon Von Frich 4_M_03,3,3,{
if ((BaseClass == Job_Swordman) && (JobLevel >= 25 || (BaseJob == Job_Knight || BaseJob == Job_Crusader))) {
if (getskilllv("SM_FATALBLOW") == 1) {
@@ -301,7 +301,7 @@ OnTouch:
close;
}
-prt_in,94,57,3 script Juan 85,4,4,{
+prt_in,94,57,3 script Juan 4_M_03,4,4,{
if (BaseClass == Job_Swordman) {
if (getskilllv("SM_AUTOBERSERK") == 1) {
mes "[Juan]";
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index 329209c57..c0f97859b 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -14,7 +14,7 @@
//= 1.8 Fixed JobLevel requirement for Assassins and Rogues. [Joseph]
//============================================================
-moc_prydb1,154,128,4 script Alcouskou 118,{
+moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{
if (BaseClass == Job_Thief) {
mes "[Alcouskou]";
mes "As you live life you will encounter";
@@ -429,7 +429,7 @@ moc_prydb1,154,128,4 script Alcouskou 118,{
close;
}
-payon,91,77,3 script Bag Seller 99,{
+payon,91,77,3 script Bag Seller 4W_M_03,{
mes "[RuRumuni]";
mes "I am a humble merchant here";
mes "in Payon. I buy the leather";
diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt
index 663c6e01e..4cab1ffe6 100644
--- a/npc/quests/skills/wizard_skills.txt
+++ b/npc/quests/skills/wizard_skills.txt
@@ -12,7 +12,7 @@
//= 1.5 Replaced effect numerics with constants. [L0ne_W0lf]
//============================================================
-gef_tower,115,36,4 script Meow#q_wiz 876,{
+gef_tower,115,36,4 script Meow#q_wiz 4_CAT,{
if (BaseJob == Job_Wizard) {
if (WIZ_SK == 100) {
if (getskilllv("WZ_SIGHTBLASTER") == 0) {
@@ -351,7 +351,7 @@ gef_tower,115,36,4 script Meow#q_wiz 876,{
}
}
-prt_in,82,98,3 script Simon Mayace#q_wiz 46,{
+prt_in,82,98,3 script Simon Mayace#q_wiz 1_ETC_01,{
if (WIZ_SK == 1) {
mes "[Simon]";
mes "Ah, you must be a skilled";
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 881f3405f..bb70a4166 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -12,7 +12,7 @@
//= 1.0a Added 'npcskill' command. [Euphy]
//============================================================
-hu_fild01,140,163,5 script Tower Keeper 852,3,3,{
+hu_fild01,140,163,5 script Tower Keeper 4_M_EIN_SOLDIER,3,3,{
mes "[Gatei]";
mes "Greetings, adventurer.";
mes "I am Gatei Knumm, keeper";
@@ -158,7 +158,7 @@ OnTouch:
close;
}
-tha_t01,149,78,4 script Guide 90,{
+tha_t01,149,78,4 script Guide 4_F_01,{
if (thana_tower == 0) {
mes "[Ditze]";
mes "Welcome to Thanatos Tower.";
@@ -407,7 +407,7 @@ L_Contract:
}
}
-tha_t01,140,78,4 script Guide#reward 831,{
+tha_t01,140,78,4 script Guide#reward 4_F_ZONDAGIRL,{
mes "[Liei]";
if (thana_tower == 0) {
mes "Good day, I'm";
@@ -510,7 +510,7 @@ tha_t01,140,78,4 script Guide#reward 831,{
}
}
-tha_t02,231,161,5 script Entrance Guide 874,{
+tha_t02,231,161,5 script Entrance Guide 4_M_ZONDAMAN,{
mes "[Burled]";
if (thana_tower == 0) {
mes "You are in front of the entrance to the 3rd Floor. Only contracted";
@@ -887,7 +887,7 @@ OnTimer30000:
end;
}
-tha_t03,67,70,0 script Rune Device#tt1 111,4,4,{
+tha_t03,67,70,0 script Rune Device#tt1 HIDDEN_NPC,4,4,{
if ((countitem(7421) == 0) && (countitem(7426) == 0)) {
mes "^3355FFA mysterious field of";
mes "energy seems to surround";
@@ -1005,7 +1005,7 @@ L_Key:
}
}
-tha_t04,195,195,0 script Rune Device#tt2 111,3,3,{
+tha_t04,195,195,0 script Rune Device#tt2 HIDDEN_NPC,3,3,{
if ((countitem(7422) == 0) && (countitem(7427) == 0)) {
mes "^3355FFYou find a screen";
mes "with three tiny panels and";
@@ -1156,7 +1156,7 @@ OnTouch:
end;
}
-tha_t05,62,179,0 script Brilliant Statue#tt3 111,3,3,{
+tha_t05,62,179,0 script Brilliant Statue#tt3 HIDDEN_NPC,3,3,{
if ((countitem(7423) == 0) && (countitem(7428) == 0)) {
mes "I can feel some magical power from this beautiful stone statue.";
mes "There's a little crack between the wings.";
@@ -1241,7 +1241,7 @@ OnTouch:
end;
}
-tha_t06,226,230,0 script Brilliant Statue#tt4 111,3,3,{
+tha_t06,226,230,0 script Brilliant Statue#tt4 HIDDEN_NPC,3,3,{
if ((countitem(7424) == 0) && (countitem(7429) == 0)) {
mes "I can feel some magical power from this brilliant statue.";
mes "This must be one of the seals.";
@@ -1513,7 +1513,7 @@ OnTouch:
end;
}
-tha_t06,204,181,0 script Splendid Sword#tt5 111,3,3,{
+tha_t06,204,181,0 script Splendid Sword#tt5 HIDDEN_NPC,3,3,{
if ((countitem(7425) == 0) && (countitem(7430) == 0)) {
mes "An old, worn sword hangs above the splendid table.";
mes "It emits a gloomy aura.";
@@ -1603,7 +1603,7 @@ OnTouch:
end;
}
-tha_t08,1,1,0 script #Charm Stone Admintt01 844,{
+tha_t08,1,1,0 script #Charm Stone Admintt01 CLEAR_NPC,{
end;
OnInit:
OnEnable:
@@ -1654,7 +1654,7 @@ OnTimer2400000:
end;
}
-tha_t08,90,153,0 script Shining Crystal#tt_r1 844,{
+tha_t08,90,153,0 script Shining Crystal#tt_r1 CLEAR_NPC,{
if (countitem(7421) > 0) {
mes "The Crystal ball is emitting mysterious power.";
next;
@@ -1684,11 +1684,11 @@ OnEnable:
enablenpc strnpcinfo(0);
end;
}
-tha_t08,90,62,0 duplicate(Shining Crystal#tt_r1) Shining Crystal#tt_r2 844
-tha_t08,49,59,0 duplicate(Shining Crystal#tt_r1) Shining Crystal#tt_r3 844
-tha_t08,49,144,0 duplicate(Shining Crystal#tt_r1) Shining Crystal#tt_r4 844
+tha_t08,90,62,0 duplicate(Shining Crystal#tt_r1) Shining Crystal#tt_r2 CLEAR_NPC
+tha_t08,49,59,0 duplicate(Shining Crystal#tt_r1) Shining Crystal#tt_r3 CLEAR_NPC
+tha_t08,49,144,0 duplicate(Shining Crystal#tt_r1) Shining Crystal#tt_r4 CLEAR_NPC
-tha_t08,49,153,0 script Shining Crystal#tt_y1 844,{
+tha_t08,49,153,0 script Shining Crystal#tt_y1 CLEAR_NPC,{
if (countitem(7422) > 0) {
mes "The Crystal ball is emitting mysterious power.";
next;
@@ -1718,11 +1718,11 @@ OnEnable:
enablenpc strnpcinfo(0);
end;
}
-tha_t08,90,150,0 duplicate(Shining Crystal#tt_y1) Shining Crystal#tt_y2 844
-tha_t08,90,59,0 duplicate(Shining Crystal#tt_y1) Shining Crystal#tt_y3 844
-tha_t08,49,56,0 duplicate(Shining Crystal#tt_y1) Shining Crystal#tt_y4 844
+tha_t08,90,150,0 duplicate(Shining Crystal#tt_y1) Shining Crystal#tt_y2 CLEAR_NPC
+tha_t08,90,59,0 duplicate(Shining Crystal#tt_y1) Shining Crystal#tt_y3 CLEAR_NPC
+tha_t08,49,56,0 duplicate(Shining Crystal#tt_y1) Shining Crystal#tt_y4 CLEAR_NPC
-tha_t08,49,65,0 script Shining Crystal#tt_b1 844,{
+tha_t08,49,65,0 script Shining Crystal#tt_b1 CLEAR_NPC,{
if (countitem(7423) > 0) {
mes "The Crystal ball is emitting mysterious power.";
next;
@@ -1752,11 +1752,11 @@ OnEnable:
enablenpc strnpcinfo(0);
end;
}
-tha_t08,49,150,0 duplicate(Shining Crystal#tt_b1) Shining Crystal#tt_b2 844
-tha_t08,90,147,0 duplicate(Shining Crystal#tt_b1) Shining Crystal#tt_b3 844
-tha_t08,90,56,0 duplicate(Shining Crystal#tt_b1) Shining Crystal#tt_b4 844
+tha_t08,49,150,0 duplicate(Shining Crystal#tt_b1) Shining Crystal#tt_b2 CLEAR_NPC
+tha_t08,90,147,0 duplicate(Shining Crystal#tt_b1) Shining Crystal#tt_b3 CLEAR_NPC
+tha_t08,90,56,0 duplicate(Shining Crystal#tt_b1) Shining Crystal#tt_b4 CLEAR_NPC
-tha_t08,90,65,0 script Shining Crystal#tt_g1 844,{
+tha_t08,90,65,0 script Shining Crystal#tt_g1 CLEAR_NPC,{
if (countitem(7424) > 0) {
mes "The Crystal ball is emitting mysterious power.";
next;
@@ -1786,11 +1786,11 @@ OnEnable:
enablenpc strnpcinfo(0);
end;
}
-tha_t08,49,62,0 duplicate(Shining Crystal#tt_g1) Shining Crystal#tt_g2 844
-tha_t08,49,147,0 duplicate(Shining Crystal#tt_g1) Shining Crystal#tt_g3 844
-tha_t08,90,144,0 duplicate(Shining Crystal#tt_g1) Shining Crystal#tt_g4 844
+tha_t08,49,62,0 duplicate(Shining Crystal#tt_g1) Shining Crystal#tt_g2 CLEAR_NPC
+tha_t08,49,147,0 duplicate(Shining Crystal#tt_g1) Shining Crystal#tt_g3 CLEAR_NPC
+tha_t08,90,144,0 duplicate(Shining Crystal#tt_g1) Shining Crystal#tt_g4 CLEAR_NPC
-tha_t12,161,57,0 script Gold Religious Statue#tt 111,{
+tha_t12,161,57,0 script Gold Religious Statue#tt HIDDEN_NPC,{
if ($@thana_summon == 0) {
if (countitem(7427) > 0) {
mes "It's a statue giving off a golden light.";
@@ -1820,7 +1820,7 @@ tha_t12,161,57,0 script Gold Religious Statue#tt 111,{
close;
}
-tha_t12,154,17,0 script Green Wiseman Statue#tt 111,{
+tha_t12,154,17,0 script Green Wiseman Statue#tt HIDDEN_NPC,{
if ($@thana_summon == 1) {
if (countitem(7429) > 0) {
mes "A statue gives off green light.";
@@ -1850,7 +1850,7 @@ tha_t12,154,17,0 script Green Wiseman Statue#tt 111,{
close;
}
-tha_t12,103,17,0 script Blue Angel Statue#tt 111,{
+tha_t12,103,17,0 script Blue Angel Statue#tt HIDDEN_NPC,{
if ($@thana_summon == 2) {
if (countitem(7428) > 0) {
mes "An angel statue is covered with a blue light.";
@@ -1880,7 +1880,7 @@ tha_t12,103,17,0 script Blue Angel Statue#tt 111,{
close;
}
-tha_t12,96,57,0 script Bloody Knight Statue#tt 111,{
+tha_t12,96,57,0 script Bloody Knight Statue#tt HIDDEN_NPC,{
if ($@thana_summon == 3) {
if (countitem(7426) > 0) {
mes "A statue is shining like blood.";
@@ -1910,7 +1910,7 @@ tha_t12,96,57,0 script Bloody Knight Statue#tt 111,{
close;
}
-tha_t12,129,86,0 script Dark Devil Statue#tt 111,{
+tha_t12,129,86,0 script Dark Devil Statue#tt HIDDEN_NPC,{
if ($@thana_summon == 4) {
if (countitem(7430) > 0) {
mes "A devil statue emits dark light.";
@@ -1944,7 +1944,7 @@ tha_t12,129,86,0 script Dark Devil Statue#tt 111,{
close;
}
-tha_t12,134,52,0 script #tteffect01 139,{
+tha_t12,134,52,0 script #tteffect01 HIDDEN_WARP_NPC,{
end;
OnEnable:
initnpctimer;
@@ -1964,7 +1964,7 @@ OnTimer3000:
end;
}
-tha_t12,132,47,0 script #tteffect02 139,{
+tha_t12,132,47,0 script #tteffect02 HIDDEN_WARP_NPC,{
end;
OnEnable:
initnpctimer;
@@ -1984,7 +1984,7 @@ OnTimer3000:
end;
}
-tha_t12,127,47,0 script #tteffect03 139,{
+tha_t12,127,47,0 script #tteffect03 HIDDEN_WARP_NPC,{
end;
OnEnable:
initnpctimer;
@@ -2004,7 +2004,7 @@ OnTimer3000:
end;
}
-tha_t12,125,52,0 script #tteffect04 139,{
+tha_t12,125,52,0 script #tteffect04 HIDDEN_WARP_NPC,{
end;
OnEnable:
initnpctimer;
@@ -2024,7 +2024,7 @@ OnTimer3000:
end;
}
-tha_t12,129,56,0 script #tteffect05 139,{
+tha_t12,129,56,0 script #tteffect05 HIDDEN_WARP_NPC,{
end;
OnEnable:
initnpctimer;
@@ -2044,7 +2044,7 @@ OnTimer3000:
end;
}
-tha_t12,130,52,0 script #gateto_thanatos 45,1,1,{
+tha_t12,130,52,0 script #gateto_thanatos WARPNPC,1,1,{
end;
OnInit:
disablenpc "#gateto_thanatos";
@@ -2161,7 +2161,7 @@ thana_boss,202,75,3 duplicate(Memory Seal#tt1) Memory Seal#tt2 1712,3,3
thana_boss,80,76,7 duplicate(Memory Seal#tt1) Memory Seal#tt3 1709,3,3
thana_boss,62,171,5 duplicate(Memory Seal#tt1) Memory Seal#tt4 1710,3,3
-thana_boss,141,228,0 script #thanatos_seal 139,3,3,{
+thana_boss,141,228,0 script #thanatos_seal HIDDEN_WARP_NPC,3,3,{
end;
OnEnable:
enablenpc "#thanatos_seal";
@@ -2229,7 +2229,7 @@ OnMyMobDead:
end;
}
-thana_boss,1,1,0 script #cooltime_thana 844,{
+thana_boss,1,1,0 script #cooltime_thana CLEAR_NPC,{
end;
OnInit:
set $@thana_summon, 0;
@@ -2286,7 +2286,7 @@ OnTimer7200000:
tha_scene01,30,30,0 warp scene 1,1,tha_scene01,131,220
tha_t04,81,36,0 warp to 5th Floor 1,1,tha_t05,62,8
-tha_t06,119,120,0 script to 7th Floor 45,1,1,{
+tha_t06,119,120,0 script to 7th Floor WARPNPC,1,1,{
end;
OnTouch:
if (eaclass()&(EAJL_2|EAJL_UPPER) || eaclass()&EAJL_THIRD || ((Class == Job_SuperNovice || Class == Job_Taekwon || Class == Job_Star_Gladiator || Class == Job_Soul_Linker || Class == Job_Ninja || Class == Job_Gunslinger) && BaseLevel > 94)) {
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 8c67f9595..7aed9b696 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -29,7 +29,7 @@
// The Sign (Part 1)
//============================================================
-- script Sign::TheSign 111,{
+- script Sign::TheSign HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
cutin "sign_01",4;
mes "^3355FFNext^000000";
@@ -61,14 +61,14 @@ OnInit:
end;
}
-prontera,147,305,0 duplicate(TheSign) Sign#prontera 111
-geffen,168,175,0 duplicate(TheSign) Sign#geffen 111
-morocc,168,265,0 duplicate(TheSign) Sign#morroc 111
-payon,160,183,0 duplicate(TheSign) Sign#payon 111
-aldebaran,54,223,0 duplicate(TheSign) Sign#aldebaran 111
-alberta,35,241,0 duplicate(TheSign) Sign#alberta 111
+prontera,147,305,0 duplicate(TheSign) Sign#prontera HIDDEN_NPC
+geffen,168,175,0 duplicate(TheSign) Sign#geffen HIDDEN_NPC
+morocc,168,265,0 duplicate(TheSign) Sign#morroc HIDDEN_NPC
+payon,160,183,0 duplicate(TheSign) Sign#payon HIDDEN_NPC
+aldebaran,54,223,0 duplicate(TheSign) Sign#aldebaran HIDDEN_NPC
+alberta,35,241,0 duplicate(TheSign) Sign#alberta HIDDEN_NPC
-prt_in,227,45,0 script Archeologist#sign 804,{
+prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{
callfunc "F_UpdateSignVars";
cutin "mets_alpha",2;
mes "[Metz]";
@@ -768,7 +768,7 @@ prt_in,227,45,0 script Archeologist#sign 804,{
end;
}
-prt_in,228,26,5 script Steward#sign 55,{
+prt_in,228,26,5 script Steward#sign 1_M_JOBTESTER,{
callfunc "F_UpdateSignVars";
mes "[Vandez]";
if (sign_q < 3) {
@@ -963,7 +963,7 @@ prt_in,228,26,5 script Steward#sign 55,{
prt_in,248,23,3 script Maid#sign 1275,{
end;
}
-prt_in,248,23,0 script Maid#sign2 111,{
+prt_in,248,23,0 script Maid#sign2 HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
mes "[Elle]";
if (sign_q < 3) {
@@ -1202,7 +1202,7 @@ prt_in,248,23,0 script Maid#sign2 111,{
}
}
-morocc_in,115,154,5 script Rogue#sign 810,{
+morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{
callfunc "F_UpdateSignVars";
if (checkweight(1201,1) == 0) {
mes "^3355FFWait a second! Right now,";
@@ -1533,7 +1533,7 @@ morocc_in,115,154,5 script Rogue#sign 810,{
}
}
-morocc_in,114,162,4 script Young Man#sign 118,{
+morocc_in,114,162,4 script Young Man#sign 2_M_THIEFMASTER,{
callfunc "F_UpdateSignVars";
mes "[Gaanan]";
if (sign_q < 11) {
@@ -1699,7 +1699,7 @@ morocc_in,114,162,4 script Young Man#sign 118,{
}
}
-payon,154,170,3 script Hagin#sign 78,{
+payon,154,170,3 script Hagin#sign 1_F_ORIENT_04,{
mes "[Hagin]";
mes "Have you heard?";
mes "Payon's most eligible";
@@ -1775,7 +1775,7 @@ payon_in03,81,22,4 script Maid#a1 1170,{
end;
}
-payon_in03,81,22,4 script Maid#a2 111,{
+payon_in03,81,22,4 script Maid#a2 HIDDEN_NPC,{
mes "[Maid]";
mes "Welcome to the";
mes "Payon Castle annex";
@@ -1788,7 +1788,7 @@ payon_in03,79,22,4 script Maid#b1 1404,{
end;
}
-payon_in03,79,22,4 script Maid#b2 111,{
+payon_in03,79,22,4 script Maid#b2 HIDDEN_NPC,{
mes "[Maid]";
mes "Welcome.";
mes "Are you another";
@@ -1801,7 +1801,7 @@ payon_in03,81,15,1 script Maid#c1 1170,{
end;
}
-payon_in03,81,15,1 script Maid#c2 111,{
+payon_in03,81,15,1 script Maid#c2 HIDDEN_NPC,{
mes "[Maid]";
mes "Greetings.";
mes "Welcome to the";
@@ -1815,7 +1815,7 @@ payon_in03,79,15,1 script Maid#d1 1404,{
end;
}
-payon_in03,79,15,1 script Maid#d2 111,{
+payon_in03,79,15,1 script Maid#d2 HIDDEN_NPC,{
mes "[Maid]";
mes "Welcome to the";
mes "Payon Castle Annex.";
@@ -1829,7 +1829,7 @@ payon_in03,8,31,4 script Maid#e1 1416,{
end;
}
-payon_in03,8,31,4 script Maid#e2 111,{
+payon_in03,8,31,4 script Maid#e2 HIDDEN_NPC,{
mes "[Chamberlain]";
mes "Please refrain";
mes "from attacking";
@@ -1849,7 +1849,7 @@ payon_in03,13,31,4 script Maid#f1 1416,{
end;
}
-payon_in03,13,31,4 script Maid#f2 111,{
+payon_in03,13,31,4 script Maid#f2 HIDDEN_NPC,{
mes "[Chamberlain]";
mes "Master Daewoon~!";
mes "Please try this too!";
@@ -1864,7 +1864,7 @@ payon_in03,13,31,4 script Maid#f2 111,{
close;
}
-payon_in03,11,31,4 script Daewoon#sign 808,{
+payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{
callfunc "F_UpdateSignVars";
mes "[Daewoon]";
mes "Mwah ah hah!";
@@ -2555,7 +2555,7 @@ payon_in03,11,31,4 script Daewoon#sign 808,{
close;
}
-aldeba_in,139,103,5 script Monograph#sign 111,{
+aldeba_in,139,103,5 script Monograph#sign HIDDEN_NPC,{
mes "[Sir Jore]";
mes "Uwah~!";
mes "Stop reading my";
@@ -2564,7 +2564,7 @@ aldeba_in,139,103,5 script Monograph#sign 111,{
close;
}
-aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
+aldeba_in,155,101,3 script Sir Jore#sign 1_M_SIGNALCHE,7,7,{
callfunc "F_UpdateSignVars";
if ((gettime(3) > 16) && (gettime(3) < 22)) {
if (sign_q == 15) {
@@ -2934,7 +2934,7 @@ OnTouch:
end;
}
-aldeba_in,156,118,4 script Piru Piru#sign 102,{
+aldeba_in,156,118,4 script Piru Piru#sign 8_F,{
callfunc "F_UpdateSignVars";
mes "[Piru Piru]";
if ((gettime(3) >= 12) && (gettime(3) <= 24)) { //235959
@@ -3055,7 +3055,7 @@ aldeba_in,156,118,4 script Piru Piru#sign 102,{
}
}
-prt_maze02,57,151,1 script Pleur#warp 91,{
+prt_maze02,57,151,1 script Pleur#warp 4_F_02,{
mes "^3355FFYou catch a glimpse";
mes "of a girl heading directly";
mes "into a deep forest. You decide";
@@ -3115,7 +3115,7 @@ OnMyMobDead:
end;
}
-prt_maze02,16,183,3 script Pleur#sign 91,{
+prt_maze02,16,183,3 script Pleur#sign 4_F_02,{
callfunc "F_UpdateSignVars";
mes "[Pleur]";
if (sign_q < 19) {
@@ -3142,7 +3142,7 @@ OnOmg:
end;
}
-prt_maze02,14,183,4 script Gordon#sign 51,{
+prt_maze02,14,183,4 script Gordon#sign 1_M_BARD,{
callfunc "F_UpdateSignVars";
mes "[Gordon]";
if (sign_q < 18) {
@@ -3426,7 +3426,7 @@ prt_maze02,14,183,4 script Gordon#sign 51,{
}
}
-geffen_in,59,74,4 script Jesqurienne#sign 803,{
+geffen_in,59,74,4 script Jesqurienne#sign 1_F_SIGNZISK,{
callfunc "F_UpdateSignVars";
mes "[Jesqurienne]";
if (sign_q < 21) {
@@ -3714,7 +3714,7 @@ OnHo:
end;
}
-geffen_in,61,72,7 script Aaron#sign 754,{
+geffen_in,61,72,7 script Aaron#sign 4_M_SAGE_A,{
callfunc "F_UpdateSignVars";
mes "[Aaron]";
if (sign_q == 21) {
@@ -4415,7 +4415,7 @@ OnSmile:
end;
}
-cmd_in02,88,51,4 script Strange Guy#sign 806,{
+cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{
callfunc "F_UpdateSignVars";
mes "[Dearles]";
if (sign_q < 25) {
@@ -4868,7 +4868,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{
}
}
-cmd_in01,33,25,5 script Examiner#sign 724,{
+cmd_in01,33,25,5 script Examiner#sign 4_F_07,{
callfunc "F_UpdateSignVars";
mes "[Lamadin]";
if (sign_q == 30) {
@@ -4990,7 +4990,7 @@ cmd_in01,33,25,5 script Examiner#sign 724,{
}
}
-cmd_in01,16,24,0 script Emergency Exit 111,{
+cmd_in01,16,24,0 script Emergency Exit HIDDEN_NPC,{
mes "[Exit]";
mes "Would you like to go out?";
next;
@@ -5008,7 +5008,7 @@ cmd_in01,16,24,0 script Emergency Exit 111,{
}
}
-cmd_in01,33,33,1 script Standby Room#sign 66,{
+cmd_in01,33,33,1 script Standby Room#sign 1_F_01,{
end;
OnInit:
@@ -5143,7 +5143,7 @@ OnTimer44000:
end;
}
-cmd_in01,16,21,0 script s_dance#up 139,1,3,{
+cmd_in01,16,21,0 script s_dance#up HIDDEN_WARP_NPC,1,3,{
OnInit:
disablenpc "s_dance#up";
end;
@@ -5199,7 +5199,7 @@ OnTouch:
end;
}
-cmd_in01,16,11,0 script s_dance#down 139,1,3,{
+cmd_in01,16,11,0 script s_dance#down HIDDEN_WARP_NPC,1,3,{
OnInit:
donpcevent "s_dance#down::OnDisable";
end;
@@ -5275,7 +5275,7 @@ OnTouch:
end;
}
-cmd_in01,11,16,0 script s_dance#left 139,3,1,{
+cmd_in01,11,16,0 script s_dance#left HIDDEN_WARP_NPC,3,1,{
OnInit:
donpcevent "s_dance#left::OnDisable";
end;
@@ -5344,7 +5344,7 @@ OnTouch:
end;
}
-cmd_in01,21,16,0 script s_dance#right 139,3,1,{
+cmd_in01,21,16,0 script s_dance#right HIDDEN_WARP_NPC,3,1,{
OnInit:
donpcevent "s_dance#right::OnDisable";
end;
@@ -5418,7 +5418,7 @@ OnTouch:
end;
}
-cmd_in01,16,16,0 script s_dance#cen 139,1,1,{
+cmd_in01,16,16,0 script s_dance#cen HIDDEN_WARP_NPC,1,1,{
OnInit:
donpcevent "s_dance#cen::OnDisable";
end;
@@ -5501,7 +5501,7 @@ OnDisable:
end;
}
-alberta_in,125,101,5 script Wealthy-looking Merchant 807,{
+alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{
callfunc "F_UpdateSignVars";
mes "[Bakerlan]";
if (sign_q < 35) {
@@ -5681,7 +5681,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 807,{
}
}
-alberta_in,154,171,5 script Maid#s10 758,{
+alberta_in,154,171,5 script Maid#s10 4_F_JPN,{
callfunc "F_UpdateSignVars";
mes "[Seylin]";
if (sign_q < 38) {
@@ -5998,7 +5998,7 @@ alberta_in,154,171,5 script Maid#s10 758,{
}
}
-prt_castle,107,58,5 script Soldier#s11 105,{
+prt_castle,107,58,5 script Soldier#s11 8W_SOLDIER,{
callfunc "F_UpdateSignVars";
mes "[Maruin]";
if (sign_q < 49) {
@@ -6130,7 +6130,7 @@ prt_castle,107,58,5 script Soldier#s11 105,{
}
}
-alde_alche,169,162,7 script Alchemist#sign 749,{
+alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{
callfunc "F_UpdateSignVars";
mes "[Melkaba]";
if (sign_q < 46) {
@@ -6439,7 +6439,7 @@ alde_alche,169,162,7 script Alchemist#sign 749,{
}
}
-alberta_in,114,178,5 script Refined Steward 109,{
+alberta_in,114,178,5 script Refined Steward 4_M_MANAGER,{
callfunc "F_UpdateSignVars";
mes "[Mahatra]";
if (sign_q < 37) {
@@ -6585,7 +6585,7 @@ alberta_in,114,178,5 script Refined Steward 109,{
}
}
-alberta,98,202,5 script Guard#s10 105,{
+alberta,98,202,5 script Guard#s10 8W_SOLDIER,{
mes "[Hurubu]";
mes "Welcome to the";
mes "Alchesh Estate.";
@@ -6632,7 +6632,7 @@ alberta,98,202,5 script Guard#s10 105,{
}
}
-alberta,43,49,5 script Poor-looking Merchant 89,{
+alberta,43,49,5 script Poor-looking Merchant 4_M_ORIENT02,{
callfunc "F_UpdateSignVars";
mes "[Machen]";
if (sign_q < 35) {
@@ -6731,7 +6731,7 @@ alberta,43,49,5 script Poor-looking Merchant 89,{
}
}
-yuno,330,100,4 script Knight#ss 734,{
+yuno,330,100,4 script Knight#ss 4_M_JOB_KNIGHT2,{
callfunc "F_UpdateSignVars";
mes "[Leibech]";
if (sign_q < 38) {
@@ -6913,7 +6913,7 @@ yuno,330,100,4 script Knight#ss 734,{
// The Sign (Part 2)
//============================================================
-geffen_in,159,48,5 script Lonely-looking Woman 711,{
+geffen_in,159,48,5 script Lonely-looking Woman 4_F_05,{
callfunc "F_UpdateSignVars";
mes "[Brenda Howard]";
if (sign_q < 54) {
@@ -7030,7 +7030,7 @@ geffen_in,159,48,5 script Lonely-looking Woman 711,{
}
}
-geffen_in,171,42,3 script Cute Girl 703,{
+geffen_in,171,42,3 script Cute Girl 4_F_KID2,{
callfunc "F_UpdateSignVars";
if (checkweight(908,200) == 0) {
mes "^3355FFWait a second! Right now,";
@@ -7144,7 +7144,7 @@ geffen_in,171,42,3 script Cute Girl 703,{
}
}
-mjo_dun02,88,295,4 script Flaming Spirit Man 85,{
+mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{
callfunc "F_UpdateSignVars";
if (checkweight(908,200) == 0) {
mes "^3355FFWait a second! Right now,";
@@ -7661,7 +7661,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{
}
}
-gef_tower,118,36,4 script Annoyed Man 64,{
+gef_tower,118,36,4 script Annoyed Man 1_M_WIZARD,{
callfunc "F_UpdateSignVars";
mes "[Dhota]";
if (sign_q < 72) {
@@ -7745,7 +7745,7 @@ gef_tower,118,36,4 script Annoyed Man 64,{
}
}
-umbala,163,256,3 script Native#_s 781,{
+umbala,163,256,3 script Native#_s 4_F_UMGIRL,{
callfunc "F_UpdateSignVars";
if (event_umbala >= 3) {
mes "[Laotan]";
@@ -7821,7 +7821,7 @@ umbala,163,256,3 script Native#_s 781,{
}
}
-um_in,27,23,3 script Fastidious-Looking Guy 121,{
+um_in,27,23,3 script Fastidious-Looking Guy 2_M_MOLGENSTEIN,{
callfunc "F_UpdateSignVars";
if (checkweight(908,200) == 0) {
mes "^3355FFWait a second! Right now,";
@@ -8011,7 +8011,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
}
}
-alberta,165,83,4 script Fastidious Old Man 755,{
+alberta,165,83,4 script Fastidious Old Man 4_M_SAGE_C,{
callfunc "F_UpdateSignVars";
if (checkweight(908,200) == 0) {
mes "^3355FFWait a second! Right now,";
@@ -8134,7 +8134,7 @@ alberta,165,83,4 script Fastidious Old Man 755,{
}
}
-gef_fild07,182,241,0 script #Valkyrie Warp 111,1,1,{
+gef_fild07,182,241,0 script #Valkyrie Warp HIDDEN_NPC,1,1,{
callfunc "F_UpdateSignVars";
if ((sign_q == 80) && (countitem(907) > 3) && (countitem(953) > 11) && (countitem(7013) > 364)) {
mes "^6B8E23It seems that";
@@ -8188,7 +8188,7 @@ OnTouch:
end;
}
-himinn,48,86,5 script Valkyrie#sign 811,{
+himinn,48,86,5 script Valkyrie#sign 4_F_VALKYRIE,{
callfunc "F_UpdateSignVars";
mes "[Valkyrie Sandra]";
if (sign_q < 81) {
@@ -8371,7 +8371,7 @@ himinn,48,86,5 script Valkyrie#sign 811,{
// The Sign (Part 3)
//============================================================
-que_sign01,196,39,4 script Serin#dummy 90,{
+que_sign01,196,39,4 script Serin#dummy 4_F_01,{
end;
OnDisable:
@@ -8407,7 +8407,7 @@ OnTimer13000:
end;
}
-que_sign01,196,44,4 script Dark Lord#serin 737,{
+que_sign01,196,44,4 script Dark Lord#serin 4_DARKLORD,{
end;
OnDisable:
@@ -8420,7 +8420,7 @@ OnEnable:
end;
}
-que_sign01,196,39,4 script Serin#serin 90,{
+que_sign01,196,39,4 script Serin#serin 4_F_01,{
callfunc "F_UpdateSignVars";
if (sign_q < 132) {
mes "[Serin]";
@@ -8725,7 +8725,7 @@ OnEnable:
end;
}
-que_sign01,197,195,4 script Serin#witch 90,{
+que_sign01,197,195,4 script Serin#witch 4_F_01,{
callfunc "F_UpdateSignVars";
if (sign_q < 124) {
mes "[Serin]";
@@ -9085,7 +9085,7 @@ OnEnable:
end;
}
-niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{
+niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{
callfunc "F_UpdateSignVars";
if (sign_q < 82) {
mes "[Serin]";
@@ -9747,7 +9747,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{
}
}
-que_sign01,122,141,4 script Witch#s 792,{
+que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{
callfunc "F_UpdateSignVars";
if (checkweight(1201,1) == 0) {
mes "- Wait a minute !! -";
@@ -10741,7 +10741,7 @@ OnTouch:
end;
}
-que_sign01,45,227,4 script Queen of the Dead 856,{
+que_sign01,45,227,4 script Queen of the Dead 2_F_SIGN1,{
callfunc "F_UpdateSignVars";
mes "[Lady Hell]";
if (sign_q < 117) {
@@ -10930,7 +10930,7 @@ que_sign01,45,227,4 script Queen of the Dead 856,{
}
}
-niflheim,146,241,0 script Depressing Man 735,{
+niflheim,146,241,0 script Depressing Man 4_M_JOB_WIZARD,{
callfunc "F_UpdateSignVars";
if (sign_q < 80) {
mes "[????]";
@@ -11195,7 +11195,7 @@ niflheim,146,241,0 script Depressing Man 735,{
}
}
-nif_in,140,177,0 script #Switch 111,{
+nif_in,140,177,0 script #Switch HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
if (countitem(7313) == 1) {
warp "que_sign01",115,135;
@@ -11209,7 +11209,7 @@ nif_in,140,177,0 script #Switch 111,{
end;
}
-niflheim,102,54,4 script Mad Man#s 739,{
+niflheim,102,54,4 script Mad Man#s 8_DOPPEL,{
callfunc "F_UpdateSignVars";
mes "[Laichin]";
if (sign_q < 82) {
@@ -12039,7 +12039,7 @@ function script F_SignSeal {
return;
}
-gl_dun02,262,265,0 script Mysterious Energy#1 111,{
+gl_dun02,262,265,0 script Mysterious Energy#1 HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
set .@crash_s,rand(1,1000);
if (sign_q == 101) {
@@ -12055,7 +12055,7 @@ gl_dun02,262,265,0 script Mysterious Energy#1 111,{
}
// Angrboda's Seal 2 big 4 O'clock 270 198
-gl_dun02,271,100,0 script Mysterious Energy#2 111,{
+gl_dun02,271,100,0 script Mysterious Energy#2 HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
set .@crash_s,rand(1,1000);
if ((sign_q == 102) || (sign_q == 104)) {
@@ -12072,7 +12072,7 @@ gl_dun02,271,100,0 script Mysterious Energy#2 111,{
}
// Angrboda's Seal 3 big 5 O'clock 268 32
-gl_dun02,268,32,0 script Mysterious Energy#3 111,{
+gl_dun02,268,32,0 script Mysterious Energy#3 HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
set .@crash_s,rand(1,1000);
if ((sign_q == 103) || (sign_q == 105) || (sign_q == 108)) {
@@ -12090,7 +12090,7 @@ gl_dun02,268,32,0 script Mysterious Energy#3 111,{
}
// Angrboda's Seal 4 big 7 O'clock 16 26
-gl_dun02,16,26,0 script Mysterious Energy#4 111,{
+gl_dun02,16,26,0 script Mysterious Energy#4 HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
set .@crash_s,rand(1,1000);
if (sign_q == 109) {
@@ -12106,7 +12106,7 @@ gl_dun02,16,26,0 script Mysterious Energy#4 111,{
}
// Angrboda's Seal 5 big 11 O'clock 42 251
-gl_dun02,42,251,0 script Mysterious Energy#5 111,{
+gl_dun02,42,251,0 script Mysterious Energy#5 HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
set .@crash_s,rand(1,1000);
if ((sign_q == 106) || (sign_q == 112)) {
@@ -12123,7 +12123,7 @@ gl_dun02,42,251,0 script Mysterious Energy#5 111,{
}
// Angrboda's Seal 6 small 11 O'clock 123 234
-gl_dun02,123,234,0 script Mysterious Energy#6 111,{
+gl_dun02,123,234,0 script Mysterious Energy#6 HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
set .@crash_s,rand(1,1000);
if (sign_q == 107) {
@@ -12143,7 +12143,7 @@ gl_dun02,123,234,0 script Mysterious Energy#6 111,{
}
// Angrboda's Seal 7 small 6 O'clock 140 72
-gl_dun02,140,72,0 script Mysterious Energy#7 111,{
+gl_dun02,140,72,0 script Mysterious Energy#7 HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
set .@crash_s,rand(1,1000);
if ((sign_q == 110) || (sign_q == 111)) {
@@ -12164,7 +12164,7 @@ gl_dun02,140,72,0 script Mysterious Energy#7 111,{
}
// Angrboda's Seal 8 very small 119 182
-gl_dun02,119,182,0 script Mysterious Energy#8 111,{
+gl_dun02,119,182,0 script Mysterious Energy#8 HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
set .@crash_s,rand(1,1000);
if ((sign_q == 114) || (sign_q == 115)) {
@@ -12178,7 +12178,7 @@ gl_dun02,119,182,0 script Mysterious Energy#8 111,{
}
}
-que_sign01,46,56,0 script Fountain#sign 111,{
+que_sign01,46,56,0 script Fountain#sign HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
if (sign_q < 118) {
mes "^3355FFThe water in this";
@@ -12231,7 +12231,7 @@ que_sign01,46,56,0 script Fountain#sign 111,{
}
}
-geffen,119,55,0 script Geffenia Warp 45,1,1,{
+geffen,119,55,0 script Geffenia Warp WARPNPC,1,1,{
OnInit:
disablenpc "Geffenia Warp";
end;
@@ -12269,7 +12269,7 @@ OnTimer45000:
end;
}
-geffen,119,48,0 script Fountain#s 111,{
+geffen,119,48,0 script Fountain#s HIDDEN_NPC,{
callfunc "F_UpdateSignVars";
if (countitem(7025) > 0) {
mes "^3355FFAs you approach the fountain,";
@@ -12441,7 +12441,7 @@ que_sign02,0,0,0,0 monster Zombie Prisoner 1480,15,0,0,0
que_sign02,0,0,0,0 monster Wraith 1475,15,0,0,0
que_sign02,0,0,0,0 monster Wraith Dead 1566,8,0,0,0
-que_sign02,378,235,0 script sign_w6 45,1,1,{
+que_sign02,378,235,0 script sign_w6 WARPNPC,1,1,{
OnTouch:
callfunc "F_UpdateSignVars";
if ((countitem(7313) == 1) && ((sign_q != 124) || (sign_q != 125) || (sign_q != 126))) {
diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt
index fedb3e868..69ba5b115 100644
--- a/npc/re/airports/izlude.txt
+++ b/npc/re/airports/izlude.txt
@@ -12,8 +12,8 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-izlude,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90
-izlude_a,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_a 90
-izlude_b,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_b 90
-izlude_c,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_c 90
-izlude_d,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_d 90
+izlude,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 4_F_01
+izlude_a,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_a 4_F_01
+izlude_b,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_b 4_F_01
+izlude_c,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_c 4_F_01
+izlude_d,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_d 4_F_01
diff --git a/npc/re/cities/alberta.txt b/npc/re/cities/alberta.txt
index d25b59b4a..4fb8bab6d 100644
--- a/npc/re/cities/alberta.txt
+++ b/npc/re/cities/alberta.txt
@@ -13,29 +13,29 @@
// cities/amatsu.txt
//============================================================
-alberta,246,74,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 709
+alberta,246,74,3 duplicate(Sea_Captain_amatsu) Sea Captain#ama1 4_M_SEAMAN
// cities/ayothaya.txt
//============================================================
-alberta,246,29,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 843
+alberta,246,29,3 duplicate(Aibakthing_ayothaya) Aibakthing#ayo 4_M_THAIONGBAK
// cities/gonryun.txt
//============================================================
-alberta,246,62,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 776
+alberta,246,62,3 duplicate(Kunlun_Envoy_gonryun) Kunlun Envoy#gon 4_M_TWMIDMAN
// cities/louyang.txt
//============================================================
-alberta,246,40,3 duplicate(Girl_louyang) Girl#0lou 815
+alberta,246,40,3 duplicate(Girl_louyang) Girl#0lou 4_F_CHNDRESS1
// cities/moscovia.txt
//============================================================
-alberta,246,51,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 960
+alberta,246,51,4 duplicate(PR_Officer_moscovia) Moscovia P.R. Officer#1 4_F_RUSWOMAN2
// quests/quests_alberta.txt
//============================================================
-alberta,244,118,4 duplicate(Sailor_alberta) Sailor#tur 709
-alberta,246,114,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 121
+alberta,244,118,4 duplicate(Sailor_alberta) Sailor#tur 4_M_SEAMAN
+alberta,246,114,4 duplicate(Turtle_Scholar_alberta) Turtle Island Scholar 2_M_MOLGENSTEIN
// quests/skills/merchant_skills.txt
//============================================================
-alberta,232,103,6 duplicate(Gershaun_alberta) Gershaun 57
+alberta,232,103,6 duplicate(Gershaun_alberta) Gershaun 1_M_LIBRARYMASTER
diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt
index 7be84507c..fe9f768c4 100644
--- a/npc/re/cities/brasilis.txt
+++ b/npc/re/cities/brasilis.txt
@@ -17,7 +17,7 @@
// Brasilis Transportation
//============================================================
/* Pre-Renewal coordinates: alberta,247,115,3 */
-alberta,246,82,3 script Crewman#bra2 100,{
+alberta,246,82,3 script Crewman#bra2 4W_SAILOR,{
mes "[Crewman]";
mes "Hey, have you heard of a place called Brasilis?";
mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place.";
@@ -48,7 +48,7 @@ alberta,246,82,3 script Crewman#bra2 100,{
}
}
-brasilis,316,57,3 script Crewman#bra1 100,{
+brasilis,316,57,3 script Crewman#bra1 4W_SAILOR,{
mes "[Crewman]";
mes "My ship is going to back to Alberta, do you want to join us?";
next;
@@ -71,36 +71,36 @@ brasilis,316,57,3 script Crewman#bra1 100,{
// Generic Brasilis NPCs
//============================================================
-brasilis,155,165,3 script Signpost#bra1 858,{
+brasilis,155,165,3 script Signpost#bra1 4_BULLETIN_BOARD2,{
mes ":: Art Museum ::";
close;
}
-brasilis,195,231,3 script Signpost#bra2 858,{
+brasilis,195,231,3 script Signpost#bra2 4_BULLETIN_BOARD2,{
mes ":: Verass Monument ::";
close;
}
-brasilis,240,247,3 script Signpost#bra3 858,{
+brasilis,240,247,3 script Signpost#bra3 4_BULLETIN_BOARD2,{
mes ":: Market ::";
mes " ";
mes "- For your Potions and Weaponry -";
close;
}
-brasilis,303,309,3 script Signpost#bra4 858,{
+brasilis,303,309,3 script Signpost#bra4 4_BULLETIN_BOARD2,{
mes ":: Jungle Cable ::";
mes "";
mes "- Not for the faint of heart -";
close;
}
-brasilis,278,137,3 script Signpost#bra5 858,{
+brasilis,278,137,3 script Signpost#bra5 4_BULLETIN_BOARD2,{
mes ":: Brasilis Hotel ::";
close;
}
-brasilis,137,77,5 script Ice-Cream Maker 85,{
+brasilis,137,77,5 script Ice-Cream Maker 4_M_03,{
mes "[Ice Cream Maker]";
mes "Come~come~";
mes "Ice cream is the perfect snack for a hot day~";
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index 37979d6d9..a0fa10275 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -16,7 +16,7 @@
// Dewata Transportation
//============================================================
-alberta,212,202,4 script Dewata Sailor#alberta 536,{
+alberta,212,202,4 script Dewata Sailor#alberta 4_M_DEWMAN,{
mes "[Dewata Sailor]";
mes "Do you want to visit ^8B4513Dewata Island^000000?";
mes "With it's dazzling waves and charming views it's a great place to relax.";
@@ -46,7 +46,7 @@ alberta,212,202,4 script Dewata Sailor#alberta 536,{
}
}
-dewata,229,49,6 script Alberta Sailor#dewata 536,{
+dewata,229,49,6 script Alberta Sailor#dewata 4_M_DEWMAN,{
mes "[Alberta Sailor]";
mes "Do you want to go back to Alberta?";
next;
@@ -69,7 +69,7 @@ dewata,229,49,6 script Alberta Sailor#dewata 536,{
// Generic Dewata NPCs
//============================================================
-dewata,221,237,5 script Young Man#dew-1 536,{
+dewata,221,237,5 script Young Man#dew-1 4_M_DEWMAN,{
mes "[Fruit Fancier]";
mes "What's wrong with your faaaaaace? You must really be clueless!";
next;
@@ -165,7 +165,7 @@ dewata,221,237,5 script Young Man#dew-1 536,{
}
}
-dewata,114,243,6 script Lazy Young Man#dew 536,1,1,{
+dewata,114,243,6 script Lazy Young Man#dew 4_M_DEWMAN,1,1,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
mes "[Lazy Young Man]";
mes "Why are you carrying so much? Isn't it heavy?";
@@ -211,7 +211,7 @@ OnTouch:
end;
}
-dewata,159,81,4 script Tourist#dew-1 881,{
+dewata,159,81,4 script Tourist#dew-1 4_M_SITDOWN,{
mes "[Nasolo]";
mes "Wow~ Pure ocean, a warm beach...";
mes "Perfect for a date with a girlfriend...";
@@ -226,7 +226,7 @@ dewata,159,81,4 script Tourist#dew-1 881,{
close;
}
-dewata,146,109,5 script Restauranteur#dew 886,{
+dewata,146,109,5 script Restauranteur#dew 4_COOK,{
if (checkweight(11532,1) == 0 || checkweight(11533,1) == 0 || MaxWeight - Weight < 500) {
mes "[Restauranteur]";
mes "You came to taste my dish? It is always good to eat with an empty stomach.";
@@ -311,7 +311,7 @@ dewata,146,109,5 script Restauranteur#dew 886,{
}
}
-dewata,147,107,6 script Gourmet#dew 85,{
+dewata,147,107,6 script Gourmet#dew 4_M_03,{
mes "[Gourmet]";
mes "Oh... it's like a party in my";
mes "mouth... and everyone's invited!";
@@ -327,7 +327,7 @@ dewata,147,107,6 script Gourmet#dew 85,{
close;
}
-dewata,154,107,4 script Sightseer#dew 86,{
+dewata,154,107,4 script Sightseer#dew 4_M_04,{
mes "[Tourist]";
mes "Wow...";
mes "How many has he already eaten?";
@@ -341,7 +341,7 @@ dewata,154,107,4 script Sightseer#dew 86,{
close;
}
-dewata,95,203,6 script Travel Guide#dew 536,{
+dewata,95,203,6 script Travel Guide#dew 4_M_DEWMAN,{
mes "[Guide]";
mes "This temple behind me is called Borobudur.";
mes "Borobudur temple was built in the 9th century";
@@ -366,7 +366,7 @@ dewata,95,203,6 script Travel Guide#dew 536,{
close;
}
-dewata,97,207,4 script Tourist#dew1 803,{
+dewata,97,207,4 script Tourist#dew1 1_F_SIGNZISK,{
mes "[Tourist]";
mes "Oh, dag-nabbit... I've gone and";
mes "picked the wrong tour guide...";
@@ -382,7 +382,7 @@ dewata,97,207,4 script Tourist#dew1 803,{
close;
}
-dewata,100,206,4 script Tourist#dew2 59,{
+dewata,100,206,4 script Tourist#dew2 1_M_ORIENT01,{
mes "[Tourist]";
mes "Hey, let's go there! Hurry up,";
mes "while the tour guide is explaining~";
@@ -393,7 +393,7 @@ dewata,100,206,4 script Tourist#dew2 59,{
close;
}
-dewata,101,206,4 script Tourist#dew3 90,{
+dewata,101,206,4 script Tourist#dew3 4_F_01,{
mes "[Tourist]";
mes "Aren't we going to get lost without the guide?";
next;
@@ -402,7 +402,7 @@ dewata,101,206,4 script Tourist#dew3 90,{
close;
}
-dewata,99,203,4 script Tourist#dew4 755,{
+dewata,99,203,4 script Tourist#dew4 4_M_SAGE_C,{
mes "[Tourist]";
mes "Oh~ This is very interesting. A";
mes "temple that worships the Buddha...";
@@ -418,7 +418,7 @@ dewata,99,203,4 script Tourist#dew4 755,{
close;
}
-dewata,67,186,8 script Monk#dew1 834,{
+dewata,67,186,8 script Monk#dew1 4_M_BUDDHIST,{
mes "[Monk]";
mes "I am a monk, content to spend my days in religious study.";
next;
@@ -430,7 +430,7 @@ dewata,67,186,8 script Monk#dew1 834,{
close;
}
-dewata,65,188,8 script Monk#dew2 834,{
+dewata,65,188,8 script Monk#dew2 4_M_BUDDHIST,{
mes "[Monk]";
mes "Borobudur temple is one of few temples left for worshiping the Great Buddha.";
next;
@@ -439,7 +439,7 @@ dewata,65,188,8 script Monk#dew2 834,{
close;
}
-dewata,63,190,8 script Monk#dew3 834,{
+dewata,63,190,8 script Monk#dew3 4_M_BUDDHIST,{
mes "[Monk]";
mes "Are you a Tourist? You can make an offering and a wish to one of the shrines.";
next;
@@ -448,7 +448,7 @@ dewata,63,190,8 script Monk#dew3 834,{
close;
}
-dewata,62,192,8 script Monk#dew4 834,{
+dewata,62,192,8 script Monk#dew4 4_M_BUDDHIST,{
mes "[Monk]";
mes "Our great Buddha is the king of souls and the leader of all good Gods.";
next;
@@ -460,7 +460,7 @@ dewata,62,192,8 script Monk#dew4 834,{
close;
}
-dewata,89,191,6 script Small Shrine#dew1 844,{
+dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{
mes "There is a small shrine here. There are many people making wishes.";
next;
switch(select("Make a donation.:Make a wish.:Walk away.")) {
@@ -559,11 +559,11 @@ L_Wish:
next;
return;
}
-dewata,89,212,6 duplicate(Small Shrine#dew1) Small Shrine#dew2 844
-dewata,68,212,6 duplicate(Small Shrine#dew1) Small Shrine#dew3 844
-dewata,68,191,6 duplicate(Small Shrine#dew1) Small Shrine#dew4 844
+dewata,89,212,6 duplicate(Small Shrine#dew1) Small Shrine#dew2 CLEAR_NPC
+dewata,68,212,6 duplicate(Small Shrine#dew1) Small Shrine#dew3 CLEAR_NPC
+dewata,68,191,6 duplicate(Small Shrine#dew1) Small Shrine#dew4 CLEAR_NPC
-dewata,75,122,6 script Monk#dewt1 834,{
+dewata,75,122,6 script Monk#dewt1 4_M_BUDDHIST,{
mes "[Monk]";
mes "You are a stranger here. What brings here to this quiet place?";
next;
@@ -579,7 +579,7 @@ dewata,75,122,6 script Monk#dewt1 834,{
}
}
-dewata,69,101,6 script Monk#dewt2 834,{
+dewata,69,101,6 script Monk#dewt2 4_M_BUDDHIST,{
mes "[Monk]";
mes "We have a pagoda for the worship of Buddhas. Each temple has one of these towers, though not many people come here besides other monks.";
next;
@@ -614,7 +614,7 @@ dewata,69,101,6 script Monk#dewt2 834,{
}
}
-dewata,71,79,6 script Monk#dewt3 834,{
+dewata,71,79,6 script Monk#dewt3 4_M_BUDDHIST,{
mes "[Monk]";
mes "This tower is built on the edge of coastal cliff. You can pray with a cool ocean breeze in your hair.";
next;
@@ -623,7 +623,7 @@ dewata,71,79,6 script Monk#dewt3 834,{
close;
}
-dewata,211,272,4 script Lodge Owner#dew 534,2,3,{
+dewata,211,272,4 script Lodge Owner#dew 4_M_DEWOLDMAN,2,3,{
OnTouch:
mes "[Lodge Owner]";
mes "These days, we have many honeymooners visiting here.";
@@ -640,7 +640,7 @@ OnTouch:
close;
}
-dewata,245,244,4 script Lodge Employee#dew 536,2,3,{
+dewata,245,244,4 script Lodge Employee#dew 4_M_DEWMAN,2,3,{
OnTouch:
mes "[Lodge employee]";
mes "Argg~ This is really ticking me off!";
@@ -657,7 +657,7 @@ OnTouch:
close;
}
-dewata,233,263,8 script Sweet Married Couple#1 828,2,3,{
+dewata,233,263,8 script Sweet Married Couple#1 4_M_ROGUE,2,3,{
OnTouch:
mes "[Sweet Husband]";
mes "You are the most beautiful thing in the world baby~";
@@ -677,7 +677,7 @@ OnTouch:
close;
}
-dewata,234,263,8 script Sweet Married Couple#2 727,2,3,{
+dewata,234,263,8 script Sweet Married Couple#2 4_F_JOB_HUNTER,2,3,{
OnTouch:
mes "[Sweet Wife]";
mes "Baby~ You know what flower that is~?";
@@ -708,7 +708,7 @@ OnTouch:
close;
}
-dewata,279,213,4 script Tourist#dew-2 887,2,3,{
+dewata,279,213,4 script Tourist#dew-2 4_M_LIEMAN,2,3,{
OnTouch:
mes "[Reclining Tourist]";
mes "Wow~ This is really comfy~";
@@ -726,7 +726,7 @@ OnTouch:
close;
}
-dewata,269,208,4 script Little Kid in Town#dew 538,2,3,{
+dewata,269,208,4 script Little Kid in Town#dew 4_M_DEWBOY,2,3,{
OnTouch:
mes "[Kid]";
mes "Hey "+((Sex)?"bro":"sis")+", look at that man!";
@@ -743,7 +743,7 @@ OnTouch:
close;
}
-dewata,227,129,4 script Sarr#dew 538,2,3,{
+dewata,227,129,4 script Sarr#dew 4_M_DEWBOY,2,3,{
OnTouch:
mes "[Sarr]";
mes "They're hiding so I should seek.";
@@ -766,7 +766,7 @@ OnTouch:
close;
}
-dewata,239,140,4 script Siyak#dew 539,2,3,{
+dewata,239,140,4 script Siyak#dew 4_M_DEWGIRL,2,3,{
OnTouch:
mes "[Siyak]";
mes "Hey come on, move over~ He's gonna find me~~";
@@ -784,7 +784,7 @@ OnTouch:
close;
}
-dewata,193,145,4 script Sipo#dew 538,2,3,{
+dewata,193,145,4 script Sipo#dew 4_M_DEWBOY,2,3,{
OnTouch:
mes "[Sipo]";
mes "Sarr won't find me here, right?";
@@ -801,7 +801,7 @@ OnTouch:
close;
}
-dewata,228,177,4 script Majya#dew 538,2,3,{
+dewata,228,177,4 script Majya#dew 4_M_DEWBOY,2,3,{
OnTouch:
mes "[Majya]";
mes "I was playing hide-and-seek with my friends...";
@@ -815,7 +815,7 @@ OnTouch:
close;
}
-dewata,278,100,4 script Missing Child#dew 703,2,3,{
+dewata,278,100,4 script Missing Child#dew 4_F_KID2,2,3,{
OnTouch:
mes "[Ukki]";
mes "WaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaaWaa~";
@@ -840,7 +840,7 @@ OnTouch:
close;
}
-dewata,249,87,4 script Mum#dew 101,2,3,{
+dewata,249,87,4 script Mum#dew 4W_F_01,2,3,{
OnTouch:
mes "[Mum]";
mes "Ukki~ Ukki~ Where did she go?";
@@ -855,7 +855,7 @@ OnTouch:
close;
}
-dewata,251,85,6 script Poppa#dew 97,2,3,{
+dewata,251,85,6 script Poppa#dew 4W_M_01,2,3,{
OnTouch:
mes "[Poppa]";
mes "Honey, is Ukki lost again?";
@@ -876,7 +876,7 @@ OnTouch:
close;
}
-dewata,278,281,4 script Happily Married Grandpa 534,{
+dewata,278,281,4 script Happily Married Grandpa 4_M_DEWOLDMAN,{
mes "[Happily Married Grandpa]";
mes "Today, I should ask my lady to";
mes "cook me some ^006400fried rice^000000.";
@@ -892,7 +892,7 @@ dewata,278,281,4 script Happily Married Grandpa 534,{
close;
}
-dewata,280,277,4 script Happily Married Grandma 535,{
+dewata,280,277,4 script Happily Married Grandma 4_M_DEWOLDWOMAN,{
mes "[Happily Married Grandma]";
mes "In my younger days,";
mes "there were many gentleman callers";
@@ -920,7 +920,7 @@ dewata,280,277,4 script Happily Married Grandma 535,{
close;
}
-dewata,165,103,6 script Adventurer Semangat#dew 534,{
+dewata,165,103,6 script Adventurer Semangat#dew 4_M_DEWOLDMAN,{
mes "[Adventurer Semangat]";
mes "I also traveled around the World";
mes "When I was young like you.";
@@ -942,7 +942,7 @@ dewata,165,103,6 script Adventurer Semangat#dew 534,{
close;
}
-dewata,139,114,6 script Semangat's Wife#dew 535,{
+dewata,139,114,6 script Semangat's Wife#dew 4_M_DEWOLDWOMAN,{
mes "[Semangat's Wife]";
mes "Where's that old man";
mes "gone off to again?";
@@ -977,7 +977,7 @@ dewata,139,114,6 script Semangat's Wife#dew 535,{
}
}
-dewata,181,88,6 script Young Man#dew-2 536,{
+dewata,181,88,6 script Young Man#dew-2 4_M_DEWMAN,{
mes "[Young Man]";
mes "Isn't ^8B4513Dewata^000000 beach";
mes "really beautiful?";
@@ -994,7 +994,7 @@ dewata,181,88,6 script Young Man#dew-2 536,{
close;
}
-dewata,179,204,4 script Young Lady#dew 537,{
+dewata,179,204,4 script Young Lady#dew 4_M_DEWWOMAN,{
mes "[Young Lady]";
mes "When you are outside of the town,";
mes "and meet ^FF0000Tiger, Monkey, or pig^000000,";
@@ -1016,7 +1016,7 @@ dewata,179,204,4 script Young Lady#dew 537,{
close;
}
-dewata,280,236,4 script Settler#dew 726,{
+dewata,280,236,4 script Settler#dew 4_F_JOB_BLACKSMITH,{
mes "[Settler]";
mes "I'm not really from ^8B4513Dewata^000000.";
mes "But while traveling,";
@@ -1036,7 +1036,7 @@ dewata,280,236,4 script Settler#dew 726,{
close;
}
-dewata,204,230,6 script Dieting Lady#dew 537,{
+dewata,204,230,6 script Dieting Lady#dew 4_M_DEWWOMAN,{
if (countitem(11533) == 0) {
mes "[Dieting Lady]";
mes "Ah~ I'm starving!!";
@@ -1081,7 +1081,7 @@ dewata,204,230,6 script Dieting Lady#dew 537,{
}
}
-dewata,117,156,6 script Dreaming Kid#dew 538,{
+dewata,117,156,6 script Dreaming Kid#dew 4_M_DEWBOY,{
mes "[Dreaming Kid]";
mes "My granny says";
mes "There was once a bird named ^FF0000Garuda^000000";
@@ -1099,7 +1099,7 @@ dewata,117,156,6 script Dreaming Kid#dew 538,{
close;
}
-dewata,144,216,4 script Energetic Kid#dew 538,{
+dewata,144,216,4 script Energetic Kid#dew 4_M_DEWBOY,{
mes "[Energetic Kid]";
mes "My parents used to tell me...";
next;
@@ -1120,7 +1120,7 @@ dewata,144,216,4 script Energetic Kid#dew 538,{
close;
}
-dewata,127,248,6 script Wishing Kid#dew 539,{
+dewata,127,248,6 script Wishing Kid#dew 4_M_DEWGIRL,{
mes "[Kid wishing to be an adult]";
mes "My family has been brewing";
mes "traditional Dewata wine for ages.";
@@ -1140,7 +1140,7 @@ dewata,127,248,6 script Wishing Kid#dew 539,{
close;
}
-dew_fild01,101,259,6 script Jaty Tribe Gatekeeper 541,{
+dew_fild01,101,259,6 script Jaty Tribe Gatekeeper 4_M_DEWZATIMAN,{
mes "[Jaty Tribe Gatekeeper]";
mes "Welcome to ^FF0000Jaty^000000 town.";
mes "Our tribe reveres strength and bravery.";
@@ -1148,7 +1148,7 @@ dew_fild01,101,259,6 script Jaty Tribe Gatekeeper 541,{
close;
}
-dew_fild01,106,306,4 script R. Jaty Tribe Warrior 541,{
+dew_fild01,106,306,4 script R. Jaty Tribe Warrior 4_M_DEWZATIMAN,{
mes "[Reserved Jaty Warrior]";
mes "I want to be the very best";
mes "like no one ever was.";
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt
index af8ec7824..f46ce2651 100644
--- a/npc/re/cities/dicastes.txt
+++ b/npc/re/cities/dicastes.txt
@@ -15,7 +15,7 @@
//= 1.3 Updated to match official script. [SkittleNugget]
//============================================================
-dicastes01,194,159,5 script Excited Galten#a 492,{
+dicastes01,194,159,5 script Excited Galten#a 4_MAN_GALTUN1,{
mes "[Excited Galten]";
if (isequipped(2782)) {
mes "I can't get beautiful";
@@ -34,7 +34,7 @@ dicastes01,194,159,5 script Excited Galten#a 492,{
close;
}
-dicastes01,202,86,3 script Sentinel#a 492,{
+dicastes01,202,86,3 script Sentinel#a 4_MAN_GALTUN1,{
mes "[Sentinel]";
if (isequipped(2782)) {
mes "El Dicastes, the";
@@ -61,7 +61,7 @@ dicastes01,202,86,3 script Sentinel#a 492,{
close;
}
-dicastes01,194,95,5 script Sentinel#b 450,{
+dicastes01,194,95,5 script Sentinel#b 4_MAN_GALTUN,{
mes "[Sentinel]";
if (isequipped(2782)) {
mes "I permit your entry.";
@@ -75,7 +75,7 @@ dicastes01,194,95,5 script Sentinel#b 450,{
close;
}
-dicastes01,234,158,0 script Training Galten#a 450,{
+dicastes01,234,158,0 script Training Galten#a 4_MAN_GALTUN,{
mes "[Training Galten]";
if (isequipped(2782)) {
mes "I'll be ready for anything";
@@ -89,7 +89,7 @@ dicastes01,234,158,0 script Training Galten#a 450,{
close;
}
-dicastes01,244,166,0 script Training Galten#b 450,{
+dicastes01,244,166,0 script Training Galten#b 4_MAN_GALTUN,{
mes "[Training Galten]";
if (isequipped(2782)) {
mes "I wonder if Ahat knows how";
@@ -103,7 +103,7 @@ dicastes01,244,166,0 script Training Galten#b 450,{
close;
}
-dicastes01,272,166,0 script Training Galten#c 450,{
+dicastes01,272,166,0 script Training Galten#c 4_MAN_GALTUN,{
mes "[Training Galten]";
if (isequipped(2782)) {
mes "[Training Galten]";
@@ -118,7 +118,7 @@ dicastes01,272,166,0 script Training Galten#c 450,{
close;
}
-dicastes01,248,129,0 script Training Galten#d 450,{
+dicastes01,248,129,0 script Training Galten#d 4_MAN_GALTUN,{
mes "[Training Galten]";
if (isequipped(2782)) {
mes "[Training Galten]";
@@ -135,7 +135,7 @@ dicastes01,248,129,0 script Training Galten#d 450,{
}
/*
-dicastes01,271,152,0 script Training Galten#e 450,{
+dicastes01,271,152,0 script Training Galten#e 4_MAN_GALTUN,{
mes "[Training Galten]";
if (isequipped(2782)) {
mes "I will get great results";
@@ -148,7 +148,7 @@ dicastes01,271,152,0 script Training Galten#e 450,{
}
*/
-dic_in01,349,282,4 script Waiting Galten#in_1 492,{
+dic_in01,349,282,4 script Waiting Galten#in_1 4_MAN_GALTUN1,{
if (isequipped(2782)) {
mes "[Waiting Galten]";
mes "Here is the Battle Station.";
@@ -161,7 +161,7 @@ dic_in01,349,282,4 script Waiting Galten#in_1 492,{
close;
}
-dic_in01,370,261,1 script Waiting Galten#in_2 492,{
+dic_in01,370,261,1 script Waiting Galten#in_2 4_MAN_GALTUN1,{
if (isequipped(2782)) {
mes "[Waiting Galten]";
mes "Boring.";
@@ -172,7 +172,7 @@ dic_in01,370,261,1 script Waiting Galten#in_2 492,{
close;
}
-dic_in01,381,261,1 script Waiting Galten#in_3 492,{
+dic_in01,381,261,1 script Waiting Galten#in_3 4_MAN_GALTUN1,{
if (isequipped(2782)) {
mes "[Waiting Galten]";
mes "Zzzzz...";
@@ -183,7 +183,7 @@ dic_in01,381,261,1 script Waiting Galten#in_3 492,{
close;
}
-dic_in01,370,282,4 script Waiting Galten#in_4 492,{
+dic_in01,370,282,4 script Waiting Galten#in_4 4_MAN_GALTUN1,{
if (isequipped(2782)) {
mes "[Waiting Galten]";
mes "El Dicastes is the most peaceful place in this world as long as I am here.";
@@ -194,7 +194,7 @@ dic_in01,370,282,4 script Waiting Galten#in_4 492,{
close;
}
-dic_in01,354,219,4 script Resting Galten#in_5 492,{
+dic_in01,354,219,4 script Resting Galten#in_5 4_MAN_GALTUN1,{
if (isequipped(2782)) {
mes "[Resting Galten]";
mes "Resting is always so sweet.";
@@ -205,7 +205,7 @@ dic_in01,354,219,4 script Resting Galten#in_5 492,{
close;
}
-dic_in01,365,197,1 script Resting Galten#in_6 492,{
+dic_in01,365,197,1 script Resting Galten#in_6 4_MAN_GALTUN1,{
if (isequipped(2782)) {
mes "[Resting Galten]";
mes "Galten can also rest while standing up like this.";
@@ -220,11 +220,11 @@ dic_in01,365,197,1 script Resting Galten#in_6 492,{
close;
}
-dic_in01,87,102,5 script Resting Piom#01 454,{
+dic_in01,87,102,5 script Resting Piom#01 4_MAN_PIOM,{
end;
}
-dic_in01,29,119,4 script Resting Piom#04 489,{
+dic_in01,29,119,4 script Resting Piom#04 4_MAN_PIOM6,{
if (isequipped(2782)) {
mes "[Resting Piom]";
mes "Why is it so noisy when I'm trying to get rest?";
@@ -235,7 +235,7 @@ dic_in01,29,119,4 script Resting Piom#04 489,{
close;
}
-dic_in01,91,113,5 script Suspicious Piom#a 489,{
+dic_in01,91,113,5 script Suspicious Piom#a 4_MAN_PIOM6,{
mes "[Suspicious Piom]";
if (isequipped(2782)) {
mes "Have you heard of the";
@@ -276,7 +276,7 @@ dic_in01,91,113,5 script Suspicious Piom#a 489,{
close;
}
-dic_in01,168,116,5 script Tired Piom#c 491,{
+dic_in01,168,116,5 script Tired Piom#c 4_MAN_PIOM5,{
mes "[Tired Piom]";
if (isequipped(2782)) {
mes "If you need any";
@@ -292,7 +292,7 @@ dic_in01,168,116,5 script Tired Piom#c 491,{
close;
}
-dic_in01,149,104,5 script Tired Piom#b 455,{
+dic_in01,149,104,5 script Tired Piom#b 4_MAN_PIOM2,{
mes "[Tired Piom]";
if (isequipped(2782)) {
mes "I feel so stiff...";
@@ -310,7 +310,7 @@ dic_in01,149,104,5 script Tired Piom#b 455,{
close;
}
-dic_in01,341,113,3 script Tired Piom#a 491,{
+dic_in01,341,113,3 script Tired Piom#a 4_MAN_PIOM5,{
mes "[Tired Piom]";
if (isequipped(2782)) {
mes "[Tired Piom]";
@@ -341,7 +341,7 @@ dic_in01,341,113,3 script Tired Piom#a 491,{
close;
}
-dic_in01,252,103,3 script Eating Adventurer#tre 711,{
+dic_in01,252,103,3 script Eating Adventurer#tre 4_F_05,{
mes "[Eating Adventurer]";
mes "Hey, do you have any emergency rations on you from Midgard?";
next;
@@ -357,7 +357,7 @@ dic_in01,252,103,3 script Eating Adventurer#tre 711,{
close;
}
-dic_in01,32,54,5 script Venknick#el_01 449,{
+dic_in01,32,54,5 script Venknick#el_01 4_MAN_BENKUNI,{
if (isequipped(2782)) {
mes "[Venknick]";
mes "Oh feels so refreshed.";
@@ -370,7 +370,7 @@ dic_in01,32,54,5 script Venknick#el_01 449,{
close;
}
-dic_in01,372,116,3 script Thrilled Piom#a 490,{
+dic_in01,372,116,3 script Thrilled Piom#a 4_MAN_PIOM4,{
mes "[Thrilled Piom]";
if (isequipped(2782)) {
mes "Ahat is the one";
@@ -400,7 +400,7 @@ dic_in01,372,116,3 script Thrilled Piom#a 490,{
close;
}
-dic_in01,360,125,5 script Serious Venknicka 449,{
+dic_in01,360,125,5 script Serious Venknicka 4_MAN_BENKUNI,{
mes "[Serious Venknick]";
if (isequipped(2782)) {
mes "A sudden increase in Bradium production.";
@@ -414,7 +414,7 @@ dic_in01,360,125,5 script Serious Venknicka 449,{
close;
}
-dic_in01,42,250,5 script Guide#diel_1 489,{
+dic_in01,42,250,5 script Guide#diel_1 4_MAN_PIOM6,{
if (isequipped(2782)) {
if (ep13_3_invite > 5) {
mes "[Guide]";
@@ -461,7 +461,7 @@ dic_in01,42,250,5 script Guide#diel_1 489,{
close;
}
-dic_in01,335,34,5 script Talkative Piom#a 490,{
+dic_in01,335,34,5 script Talkative Piom#a 4_MAN_PIOM4,{
mes "[Talkative Piom]";
if (isequipped(2782)) {
mes "At my factory";
@@ -481,7 +481,7 @@ dic_in01,335,34,5 script Talkative Piom#a 490,{
close;
}
-dic_in01,387,30,1 script Manuk Piom#a 454,{
+dic_in01,387,30,1 script Manuk Piom#a 4_MAN_PIOM,{
mes "[Manuk Piom]";
if (isequipped(2782)) {
mes "You! We met in Manuk, didn't we?";
@@ -493,7 +493,7 @@ dic_in01,387,30,1 script Manuk Piom#a 454,{
close;
}
-dicastes01,282,210,4 script Free Knit#a 453,{
+dicastes01,282,210,4 script Free Knit#a 4_MAN_NITT,{
mes "[Free Knit]";
if (isequipped(2782)) {
mes "As long as we have a steady";
@@ -511,7 +511,7 @@ dicastes01,282,210,4 script Free Knit#a 453,{
close;
}
-dicastes01,246,210,3 script Free Venknick#a 449,{
+dicastes01,246,210,3 script Free Venknick#a 4_MAN_BENKUNI,{
mes "[Free Venknick]";
if (isequipped(2782)) {
mes "At least we have plenty of Bradium.";
@@ -541,7 +541,7 @@ dicastes01,246,210,3 script Free Venknick#a 449,{
close;
}
-dicastes01,235,245,4 script Excited Piom#a 490,{
+dicastes01,235,245,4 script Excited Piom#a 4_MAN_PIOM4,{
if (isequipped(2782)) {
mes "[Excited Piom]";
mes "Have you seen Ahat?";
@@ -556,7 +556,7 @@ dicastes01,235,245,4 script Excited Piom#a 490,{
close;
}
-dicastes01,284,262,3 script Favorable Knit#a 453,{
+dicastes01,284,262,3 script Favorable Knit#a 4_MAN_NITT,{
mes "[Favorable Knit]";
if (isequipped(2782)) {
mes "Unlike the Raphine, we Saphas";
@@ -574,7 +574,7 @@ dicastes01,284,262,3 script Favorable Knit#a 453,{
close;
}
-dicastes01,164,180,4 script Limpy Piom#a 489,{
+dicastes01,164,180,4 script Limpy Piom#a 4_MAN_PIOM6,{
mes "[Limpy Piom]";
if (isequipped(2782)) {
mes "They say there is a";
@@ -594,7 +594,7 @@ dicastes01,164,180,4 script Limpy Piom#a 489,{
close;
}
-dicastes01,191,202,4 script Complaining Galten#fihs 450,{
+dicastes01,191,202,4 script Complaining Galten#fihs 4_MAN_GALTUN,{
if (isequipped(2782)) {
mes "[Complaining Galten]";
mes "That crazy Vanknick always";
@@ -634,7 +634,7 @@ dicastes01,191,202,4 script Complaining Galten#fihs 450,{
close;
}
-dicastes01,202,197,4 script Crazy Venknick#fihsing1 449,{
+dicastes01,202,197,4 script Crazy Venknick#fihsing1 4_MAN_BENKUNI,{
if (isequipped(2782)) {
mes "[Crazy Venknick]";
mes "At only 5000 Zeny";
@@ -684,7 +684,7 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 449,{
close;
}
-dic_in01,98,110,5 script Worried Piom#a 489,{
+dic_in01,98,110,5 script Worried Piom#a 4_MAN_PIOM6,{
if (isequipped(2782)) {
mes "[Worried Piom]";
mes "I haven't seen my friends for the last few hours.";
@@ -699,7 +699,7 @@ dic_in01,98,110,5 script Worried Piom#a 489,{
close;
}
-dic_in01,98,96,3 script Lost Galten#a 492,{
+dic_in01,98,96,3 script Lost Galten#a 4_MAN_GALTUN1,{
if (isequipped(2782)) {
mes "[Lost Galten]";
mes "I've been living as a Piom for too long";
diff --git a/npc/re/cities/eclage.txt b/npc/re/cities/eclage.txt
index 7ae1f292c..009f87ab3 100644
--- a/npc/re/cities/eclage.txt
+++ b/npc/re/cities/eclage.txt
@@ -12,7 +12,7 @@
// Generic Eclage NPCs - Set 1
//============================================================
-ecl_fild01,92,316,4 script Tourist#ep14_2f2 545,{
+ecl_fild01,92,316,4 script Tourist#ep14_2f2 4_CAT_SAILOR2,{
mes "[Tourist]";
mes "I can't believe I have to wait this long......";
mes "When is it going to be my turn?";
@@ -20,7 +20,7 @@ ecl_fild01,92,316,4 script Tourist#ep14_2f2 545,{
close;
}
-ecl_fild01,106,312,4 script Tourist#ep14_2f3 525,{
+ecl_fild01,106,312,4 script Tourist#ep14_2f3 4_F_RAFLE_VI,{
mes "[Tourist]";
mes "I'm actually done with my documentation, but I'm just sticking around to appreciate all of these flowers.";
emotion e_lv2;
@@ -31,7 +31,7 @@ ecl_fild01,106,312,4 script Tourist#ep14_2f3 525,{
close;
}
-ecl_fild01,108,320,6 script Tourist#ep14_2f4 941,{
+ecl_fild01,108,320,6 script Tourist#ep14_2f4 4_F_DST_CHILD,{
mes "[Tourist]";
mes "I wonder how beautiful of a city Eclage would be.";
mes "It just makes my heart beat thinking about it.";
@@ -39,7 +39,7 @@ ecl_fild01,108,320,6 script Tourist#ep14_2f4 941,{
close;
}
-ecl_fild01,105,320,2 script Tourist#ep14_2f5 436,{
+ecl_fild01,105,320,2 script Tourist#ep14_2f5 4_F_FAIRYKID,{
mes "[Tourist]";
mes "No, I'm not a visitor. I'm an Eclage citizen!";
emotion e_an;
@@ -50,7 +50,7 @@ ecl_fild01,105,320,2 script Tourist#ep14_2f5 436,{
close;
}
-ecl_fild01,103,319,4 script Tourist#ep14_2f6 900,{
+ecl_fild01,103,319,4 script Tourist#ep14_2f6 4_M_HUMERCHANT,{
mes "[Tourist]";
mes "I hear their acorns are delicious without a hint of bitterness.";
next;
@@ -60,7 +60,7 @@ ecl_fild01,103,319,4 script Tourist#ep14_2f6 900,{
close;
}
-ecl_fild01,110,316,2 script Tourist#ep14_2f7 896,{
+ecl_fild01,110,316,2 script Tourist#ep14_2f7 4_M_HUBOY,{
mes "[Tourist]";
mes "It's important to keep your belongings light when traveling.";
next;
@@ -73,13 +73,13 @@ ecl_fild01,110,316,2 script Tourist#ep14_2f7 896,{
close;
}
-ecl_fild01,92,318,4 script Tourist#ep14_2f8 517,{
+ecl_fild01,92,318,4 script Tourist#ep14_2f8 4_M_RAFLE_OLD,{
mes "[Tourist]";
mes "Cool cool.";
close;
}
-ecl_fild01,93,318,2 script Tourist#ep14_2f9 107,{
+ecl_fild01,93,318,2 script Tourist#ep14_2f9 1_M_PAY_ELDER,{
mes "[Tourist]";
mes "Snorrrreee....Erhem....";
next;
@@ -90,7 +90,7 @@ ecl_fild01,93,318,2 script Tourist#ep14_2f9 107,{
close;
}
-ecl_fild01,94,313,4 script Tourist#ep14_2f10 715,{
+ecl_fild01,94,313,4 script Tourist#ep14_2f10 4_M_PIERROT,{
mes "[Tourist]";
mes "Oh! Are you also from Midgard?";
next;
@@ -100,7 +100,7 @@ ecl_fild01,94,313,4 script Tourist#ep14_2f10 715,{
close;
}
-ecl_fild01,101,320,4 script Tourist#ep14_2f11 522,{
+ecl_fild01,101,320,4 script Tourist#ep14_2f11 4_M_RAFLE_OR,{
mes "[Tourist]";
mes "Ow.... My legs...";
mes "You're saying I have to wait after all this traveling through Bifrost?!";
@@ -108,7 +108,7 @@ ecl_fild01,101,320,4 script Tourist#ep14_2f11 522,{
close;
}
-ecl_fild01,88,315,4 script Tourist#ep14_2f12 957,{
+ecl_fild01,88,315,4 script Tourist#ep14_2f12 4_WHITE_COW,{
mes "[Tourist]";
mes "Ahh...";
mes "Why are there so many people...?";
@@ -121,7 +121,7 @@ ecl_fild01,88,315,4 script Tourist#ep14_2f12 957,{
// Generic Eclage NPCs - Set 2
//============================================================
-ecl_fild01,183,190,4 script Catering#eclbig 447,{
+ecl_fild01,183,190,4 script Catering#eclbig 4_M_FAIRYSOLDIER,{
mes "[Catering]";
mes "Wahahaha! How do you do!";
mes "It's perfect weather for a picnic, no?";
@@ -152,7 +152,7 @@ ecl_fild01,183,190,4 script Catering#eclbig 447,{
close;
}
-ecl_fild01,134,109,4 script Warao#eclbig 446,{
+ecl_fild01,134,109,4 script Warao#eclbig 4_M_FAIRYKID5,{
mes "[Warao]";
mes "Ah~ I'm so hungry. What should I eat today?";
next;
@@ -165,13 +165,13 @@ ecl_fild01,134,109,4 script Warao#eclbig 446,{
close;
}
-ecl_fild01,70,285,4 script Giranni#eclbig 611,{
+ecl_fild01,70,285,4 script Giranni#eclbig 4_F_FAIRY2,{
mes "[Giranni]";
mes "I wonder where he went. It should be around here...";
close;
}
-eclage,106,61,4 script Markoza#eclbig 444,{
+eclage,106,61,4 script Markoza#eclbig 4_M_FAIRYKID3,{
mes "[Markoza]";
mes "I also want to visit foreign lands.";
next;
@@ -184,7 +184,7 @@ eclage,106,61,4 script Markoza#eclbig 444,{
close;
}
-eclage,101,130,5 script Wutapoa#eclbig 435,{
+eclage,101,130,5 script Wutapoa#eclbig 4_F_FAIRY,{
mes "[Wutapoa]";
mes "I recently moved out of my parent's place!";
mes "I am so glad I finally have my own Yai!";
@@ -198,7 +198,7 @@ eclage,101,130,5 script Wutapoa#eclbig 435,{
close;
}
-eclage,200,272,4 script Masione#eclbig 437,{
+eclage,200,272,4 script Masione#eclbig 4_F_FAIRYKID2,{
mes "[Masione]";
mes "Whoa! Hey!";
mes "Would you please stop appearing out of nowhere?";
@@ -209,7 +209,7 @@ eclage,200,272,4 script Masione#eclbig 437,{
close;
}
-ecl_in01,55,25,3 script Mijani#eclbig 520,{
+ecl_in01,55,25,3 script Mijani#eclbig 4_F_MORAFINE1,{
mes "[Mijani]";
mes "You are not from around here?";
mes "Welcome.";
@@ -219,7 +219,7 @@ ecl_in01,55,25,3 script Mijani#eclbig 520,{
close;
}
-ecl_in01,38,37,4 script A kneeling boy#eclbig 441,{
+ecl_in01,38,37,4 script A kneeling boy#eclbig 4_F_FAIRYKID6,{
mes "[A kneeling boy]";
mes "Why am I kneeling like this?";
next;
@@ -233,7 +233,7 @@ ecl_in01,38,37,4 script A kneeling boy#eclbig 441,{
close;
}
-ecl_in02,168,41,2 script Pambo#eclbig 438,{
+ecl_in02,168,41,2 script Pambo#eclbig 4_F_FAIRYKID3,{
mes "[Pambo]";
mes "Do you like things that twinkle?";
next;
@@ -261,7 +261,7 @@ ecl_in02,168,41,2 script Pambo#eclbig 438,{
close;
}
-ecl_in01,41,103,1 script A blushing girl#eclbig 439,{
+ecl_in01,41,103,1 script A blushing girl#eclbig 4_F_FAIRYKID4,{
mes "[A blushing girl]";
mes "Do you see this balcony up top?";
mes "Mayor Jun appears there everytime there is an important occasion!";
@@ -272,7 +272,7 @@ ecl_in01,41,103,1 script A blushing girl#eclbig 439,{
close;
}
-ecl_in01,53,92,4 script Lafiki#eclbig 444,{
+ecl_in01,53,92,4 script Lafiki#eclbig 4_M_FAIRYKID3,{
mes "[Lafiki]";
mes "My fashion sense today is excellent as usual. Heh-";
next;
@@ -287,7 +287,7 @@ ecl_in01,53,92,4 script Lafiki#eclbig 444,{
close;
}
-ecl_in01,54,91,2 script Dandy#eclbig 443,{
+ecl_in01,54,91,2 script Dandy#eclbig 4_M_FAIRYKID2,{
mes "[Dandy]";
mes "Take a look at me! How's this? Am I not so fabulous?";
next;
@@ -300,7 +300,7 @@ ecl_in01,54,91,2 script Dandy#eclbig 443,{
close;
}
-ecl_in01,52,102,4 script Choir Conductor#eclbig 442,{
+ecl_in01,52,102,4 script Choir Conductor#eclbig 4_M_FAIRYKID,{
mes "[Choir conductor]";
mes "We are Eclage's Tree Wing Choir~";
mes "We bring you heavenly harmonies~";
@@ -362,33 +362,33 @@ ecl_in01,52,102,4 script Choir Conductor#eclbig 442,{
close;
}
-ecl_in01,51,103,4 script Choir member#eclbig01 442,{
+ecl_in01,51,103,4 script Choir member#eclbig01 4_M_FAIRYKID,{
mes "[Choir member]";
mes "Aaa~";
emotion e_ho;
close;
}
-ecl_in01,53,103,4 duplicate(Choir member#eclbig01) Choir member#eclbig02 442
-ecl_in01,50,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig03 442
-ecl_in01,52,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig04 442
-ecl_in01,54,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig05 442
+ecl_in01,53,103,4 duplicate(Choir member#eclbig01) Choir member#eclbig02 4_M_FAIRYKID
+ecl_in01,50,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig03 4_M_FAIRYKID
+ecl_in01,52,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig04 4_M_FAIRYKID
+ecl_in01,54,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig05 4_M_FAIRYKID
// Generic Eclage NPCs - Set 3
//============================================================
-ecl_fild01,190,93,4 script Fili#1 617,{
+ecl_fild01,190,93,4 script Fili#1 4_M_FAIRYANG,{
mes "[Fili]";
mes "Looking at this beautiful field, the song sings itself~";
emotion e_ho;
close;
}
-ecl_fild01,83,263,4 script Watering Laphine#1 444,{
+ecl_fild01,83,263,4 script Watering Laphine#1 4_M_FAIRYKID3,{
mes "[Watering Laphine]";
mes "I think the earth is running dry.";
close;
}
-ecl_fild01,163,196,4 script Dancing Laphine#1 438,{
+ecl_fild01,163,196,4 script Dancing Laphine#1 4_F_FAIRYKID3,{
mes "[Dancing Laphine]";
mes "It's important to warm up like this before you start dancing. One, two, three, four....";
close;
@@ -396,19 +396,19 @@ ecl_fild01,163,196,4 script Dancing Laphine#1 438,{
// Eclage Prison & Clinic
//============================================================
-ecl_in01,8,71,4 script Eclage Guard#pri_inn 447,{
+ecl_in01,8,71,4 script Eclage Guard#pri_inn 4_M_FAIRYSOLDIER,{
mes "[Eclage Guard]";
mes "This path will take you to the lower parts of Eclage. You'll find a prison and a clinic there.";
close;
}
-ecl_in02,96,22,2 script Sign#prison_inn 835,{
+ecl_in02,96,22,2 script Sign#prison_inn 2_BOARD1,{
mes "[North] Prison";
mes "[West] Clinic";
close;
}
-ecl_in02,164,56,2 script Receptionist#Laphine 437,{
+ecl_in02,164,56,2 script Receptionist#Laphine 4_F_FAIRYKID2,{
mes "[Receptionist]";
mes "Welcome to Eclage Clinic.";
next;
@@ -454,7 +454,7 @@ ecl_in02,164,56,2 script Receptionist#Laphine 437,{
}
}
-ecl_in02,137,44,2 script Doctor Laphine#doctor 442,{
+ecl_in02,137,44,2 script Doctor Laphine#doctor 4_M_FAIRYKID,{
mes "[Injured Laphine]";
mes "Ooww...";
mes "Where...am...I?";
@@ -482,4 +482,4 @@ ecl_in02,137,44,2 script Doctor Laphine#doctor 442,{
mes "What? No way...please...doctor!! No!!";
close;
}
-ecl_in02,135,45,4 duplicate(Doctor Laphine#doctor) Injured Laphine 441
+ecl_in02,135,45,4 duplicate(Doctor Laphine#doctor) Injured Laphine 4_F_FAIRYKID6
diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt
index 0082594cb..7e37f9de2 100644
--- a/npc/re/cities/izlude.txt
+++ b/npc/re/cities/izlude.txt
@@ -15,70 +15,70 @@
// Izlude
//============================================================
-izlude,197,205,1 duplicate(Sailor_izlude) Sailor#izlude 100
-izlude_a,197,205,1 duplicate(Sailor_izlude) Sailor#izlude_a 100
-izlude_b,197,205,1 duplicate(Sailor_izlude) Sailor#izlude_b 100
-izlude_c,197,205,1 duplicate(Sailor_izlude) Sailor#izlude_c 100
-izlude_d,197,205,1 duplicate(Sailor_izlude) Sailor#izlude_d 100
+izlude,197,205,1 duplicate(Sailor_izlude) Sailor#izlude 4W_SAILOR
+izlude_a,197,205,1 duplicate(Sailor_izlude) Sailor#izlude_a 4W_SAILOR
+izlude_b,197,205,1 duplicate(Sailor_izlude) Sailor#izlude_b 4W_SAILOR
+izlude_c,197,205,1 duplicate(Sailor_izlude) Sailor#izlude_c 4W_SAILOR
+izlude_d,197,205,1 duplicate(Sailor_izlude) Sailor#izlude_d 4W_SAILOR
-izlude,71,92,2 duplicate(Bonne_izlude) Bonne#izlude 90
-izlude_a,71,92,2 duplicate(Bonne_izlude) Bonne#izlude_a 90
-izlude_b,71,92,2 duplicate(Bonne_izlude) Bonne#izlude_b 90
-izlude_c,71,92,2 duplicate(Bonne_izlude) Bonne#izlude_c 90
-izlude_d,71,92,2 duplicate(Bonne_izlude) Bonne#izlude_d 90
+izlude,71,92,2 duplicate(Bonne_izlude) Bonne#izlude 4_F_01
+izlude_a,71,92,2 duplicate(Bonne_izlude) Bonne#izlude_a 4_F_01
+izlude_b,71,92,2 duplicate(Bonne_izlude) Bonne#izlude_b 4_F_01
+izlude_c,71,92,2 duplicate(Bonne_izlude) Bonne#izlude_c 4_F_01
+izlude_d,71,92,2 duplicate(Bonne_izlude) Bonne#izlude_d 4_F_01
-izlude,172,215,4 duplicate(Charfri_izlude) Charfri#izlude 91
-izlude_a,172,215,4 duplicate(Charfri_izlude) Charfri#izlude_a 91
-izlude_b,172,215,4 duplicate(Charfri_izlude) Charfri#izlude_b 91
-izlude_c,172,215,4 duplicate(Charfri_izlude) Charfri#izlude_c 91
-izlude_d,172,215,4 duplicate(Charfri_izlude) Charfri#izlude_d 91
+izlude,172,215,4 duplicate(Charfri_izlude) Charfri#izlude 4_F_02
+izlude_a,172,215,4 duplicate(Charfri_izlude) Charfri#izlude_a 4_F_02
+izlude_b,172,215,4 duplicate(Charfri_izlude) Charfri#izlude_b 4_F_02
+izlude_c,172,215,4 duplicate(Charfri_izlude) Charfri#izlude_c 4_F_02
+izlude_d,172,215,4 duplicate(Charfri_izlude) Charfri#izlude_d 4_F_02
-izlude,174,164,4 duplicate(Cuskoal_izlude) Cuskoal#izlude 124
-izlude_a,174,164,4 duplicate(Cuskoal_izlude) Cuskoal#izlude_a 124
-izlude_b,174,164,4 duplicate(Cuskoal_izlude) Cuskoal#izlude_b 124
-izlude_c,174,164,4 duplicate(Cuskoal_izlude) Cuskoal#izlude_c 124
-izlude_d,174,164,4 duplicate(Cuskoal_izlude) Cuskoal#izlude_d 124
+izlude,174,164,4 duplicate(Cuskoal_izlude) Cuskoal#izlude 4_F_TELEPORTER
+izlude_a,174,164,4 duplicate(Cuskoal_izlude) Cuskoal#izlude_a 4_F_TELEPORTER
+izlude_b,174,164,4 duplicate(Cuskoal_izlude) Cuskoal#izlude_b 4_F_TELEPORTER
+izlude_c,174,164,4 duplicate(Cuskoal_izlude) Cuskoal#izlude_c 4_F_TELEPORTER
+izlude_d,174,164,4 duplicate(Cuskoal_izlude) Cuskoal#izlude_d 4_F_TELEPORTER
-izlude,85,103,4 duplicate(Dega_izlude) Dega#izlude 84
-izlude_a,85,103,4 duplicate(Dega_izlude) Dega#izlude_a 84
-izlude_b,85,103,4 duplicate(Dega_izlude) Dega#izlude_b 84
-izlude_c,85,103,4 duplicate(Dega_izlude) Dega#izlude_c 84
-izlude_d,85,103,4 duplicate(Dega_izlude) Dega#izlude_d 84
+izlude,85,103,4 duplicate(Dega_izlude) Dega#izlude 4_M_02
+izlude_a,85,103,4 duplicate(Dega_izlude) Dega#izlude_a 4_M_02
+izlude_b,85,103,4 duplicate(Dega_izlude) Dega#izlude_b 4_M_02
+izlude_c,85,103,4 duplicate(Dega_izlude) Dega#izlude_c 4_M_02
+izlude_d,85,103,4 duplicate(Dega_izlude) Dega#izlude_d 4_M_02
-izlude,140,186,4 duplicate(Kylick_izlude) Kylick#izlude 97
-izlude_a,140,186,4 duplicate(Kylick_izlude) Kylick#izlude_a 97
-izlude_b,140,186,4 duplicate(Kylick_izlude) Kylick#izlude_b 97
-izlude_c,140,186,4 duplicate(Kylick_izlude) Kylick#izlude_c 97
-izlude_d,140,186,4 duplicate(Kylick_izlude) Kylick#izlude_d 97
+izlude,140,186,4 duplicate(Kylick_izlude) Kylick#izlude 4W_M_01
+izlude_a,140,186,4 duplicate(Kylick_izlude) Kylick#izlude_a 4W_M_01
+izlude_b,140,186,4 duplicate(Kylick_izlude) Kylick#izlude_b 4W_M_01
+izlude_c,140,186,4 duplicate(Kylick_izlude) Kylick#izlude_c 4W_M_01
+izlude_d,140,186,4 duplicate(Kylick_izlude) Kylick#izlude_d 4W_M_01
-izlude,57,159,2 duplicate(Red_izlude) Red#izlude 85
-izlude_a,57,159,2 duplicate(Red_izlude) Red#izlude_a 85
-izlude_b,57,159,2 duplicate(Red_izlude) Red#izlude_b 85
-izlude_c,57,159,2 duplicate(Red_izlude) Red#izlude_c 85
-izlude_d,57,159,2 duplicate(Red_izlude) Red#izlude_d 85
+izlude,57,159,2 duplicate(Red_izlude) Red#izlude 4_M_03
+izlude_a,57,159,2 duplicate(Red_izlude) Red#izlude_a 4_M_03
+izlude_b,57,159,2 duplicate(Red_izlude) Red#izlude_b 4_M_03
+izlude_c,57,159,2 duplicate(Red_izlude) Red#izlude_c 4_M_03
+izlude_d,57,159,2 duplicate(Red_izlude) Red#izlude_d 4_M_03
-izlude,55,159,2 duplicate(Cebalis_izlude) Cebalis#izlude 98
-izlude_a,55,159,2 duplicate(Cebalis_izlude) Cebalis#izlude_a 98
-izlude_b,55,159,2 duplicate(Cebalis_izlude) Cebalis#izlude_b 98
-izlude_c,55,159,2 duplicate(Cebalis_izlude) Cebalis#izlude_c 98
-izlude_d,55,159,2 duplicate(Cebalis_izlude) Cebalis#izlude_d 98
+izlude,55,159,2 duplicate(Cebalis_izlude) Cebalis#izlude 4W_M_02
+izlude_a,55,159,2 duplicate(Cebalis_izlude) Cebalis#izlude_a 4W_M_02
+izlude_b,55,159,2 duplicate(Cebalis_izlude) Cebalis#izlude_b 4W_M_02
+izlude_c,55,159,2 duplicate(Cebalis_izlude) Cebalis#izlude_c 4W_M_02
+izlude_d,55,159,2 duplicate(Cebalis_izlude) Cebalis#izlude_d 4W_M_02
-izlude,165,156,2 duplicate(Soldier_izlude) Soldier#izlude 105
-izlude_a,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_a 105
-izlude_b,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_b 105
-izlude_c,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_c 105
-izlude_d,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_d 105
+izlude,165,156,2 duplicate(Soldier_izlude) Soldier#izlude 8W_SOLDIER
+izlude_a,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_a 8W_SOLDIER
+izlude_b,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_b 8W_SOLDIER
+izlude_c,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_c 8W_SOLDIER
+izlude_d,165,156,2 duplicate(Soldier_izlude) Soldier#izlude_d 8W_SOLDIER
- script ::Guard_izlude -1,{
mes "[Izlude Guard]";
mes "Welcome to Izlude.";
close;
}
-prt_fild08,350,219,4 duplicate(Guard_izlude) Guard#izlude 105
-prt_fild08a,350,219,4 duplicate(Guard_izlude) Guard#izlude_a 105
-prt_fild08b,350,219,4 duplicate(Guard_izlude) Guard#izlude_b 105
-prt_fild08c,350,219,4 duplicate(Guard_izlude) Guard#izlude_c 105
-prt_fild08d,350,219,4 duplicate(Guard_izlude) Guard#izlude_d 105
+prt_fild08,350,219,4 duplicate(Guard_izlude) Guard#izlude 8W_SOLDIER
+prt_fild08a,350,219,4 duplicate(Guard_izlude) Guard#izlude_a 8W_SOLDIER
+prt_fild08b,350,219,4 duplicate(Guard_izlude) Guard#izlude_b 8W_SOLDIER
+prt_fild08c,350,219,4 duplicate(Guard_izlude) Guard#izlude_c 8W_SOLDIER
+prt_fild08d,350,219,4 duplicate(Guard_izlude) Guard#izlude_d 8W_SOLDIER
// Channel Warper
//============================================================
@@ -98,8 +98,8 @@ function script F_IzludeChannel {
}
close;
}
-izlude,122,105,5 script Izlude Copy Warper 64,{ callfunc "F_IzludeChannel",":Go to copy 2:Go to copy 3:Go to copy 4:Go to copy 5"; }
-izlude_a,122,105,5 script Izlude Copy Warper#_a 64,{ callfunc "F_IzludeChannel","Go to copy 1::Go to copy 3:Go to copy 4:Go to copy 5"; }
-izlude_b,122,105,5 script Izlude Copy Warper#_b 64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2::Go to copy 4:Go to copy 5"; }
-izlude_c,122,105,5 script Izlude Copy Warper#_c 64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3::Go to copy 5"; }
-izlude_d,122,105,5 script Izlude Copy Warper#_d 64,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3:Go to copy 4:"; }
+izlude,122,105,5 script Izlude Copy Warper 1_M_WIZARD,{ callfunc "F_IzludeChannel",":Go to copy 2:Go to copy 3:Go to copy 4:Go to copy 5"; }
+izlude_a,122,105,5 script Izlude Copy Warper#_a 1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1::Go to copy 3:Go to copy 4:Go to copy 5"; }
+izlude_b,122,105,5 script Izlude Copy Warper#_b 1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2::Go to copy 4:Go to copy 5"; }
+izlude_c,122,105,5 script Izlude Copy Warper#_c 1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3::Go to copy 5"; }
+izlude_d,122,105,5 script Izlude Copy Warper#_d 1_M_WIZARD,{ callfunc "F_IzludeChannel","Go to copy 1:Go to copy 2:Go to copy 3:Go to copy 4:"; }
diff --git a/npc/re/cities/jawaii.txt b/npc/re/cities/jawaii.txt
index de263448c..61f27341c 100644
--- a/npc/re/cities/jawaii.txt
+++ b/npc/re/cities/jawaii.txt
@@ -13,8 +13,8 @@
//= 1.2 Added Izlude duplicates. [Euphy]
//============================================================
-izlude,180,224,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 71
-izlude_a,180,224,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Iz_a 71
-izlude_b,180,224,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Iz_b 71
-izlude_c,180,224,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Iz_c 71
-izlude_d,180,224,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Iz_d 71
+izlude,180,224,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Izlude 1_F_LIBRARYGIRL
+izlude_a,180,224,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Iz_a 1_F_LIBRARYGIRL
+izlude_b,180,224,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Iz_b 1_F_LIBRARYGIRL
+izlude_c,180,224,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Iz_c 1_F_LIBRARYGIRL
+izlude_d,180,224,3 duplicate(Honeymoon_Helper_Izlude) Honeymoon Helper#Iz_d 1_F_LIBRARYGIRL
diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt
index ad9e30279..6e6e8749a 100644
--- a/npc/re/cities/malangdo.txt
+++ b/npc/re/cities/malangdo.txt
@@ -147,15 +147,15 @@
close;
}
}
-prontera,114,77,6 duplicate(Dolangmal) Dolangmal#1 553
-geffen,109,61,6 duplicate(Dolangmal) Dolangmal#2 553
-payon,200,106,4 duplicate(Dolangmal) Dolangmal#3 553
-aldebaran,170,104,4 duplicate(Dolangmal) Dolangmal#4 553
-morocc,168,275,4 duplicate(Dolangmal) Dolangmal#5 553
-yuno,165,122,4 duplicate(Dolangmal) Dolangmal#6 553
-rachel,121,126,4 duplicate(Dolangmal) Dolangmal#7 553
-lighthalzen,254,83,5 duplicate(Dolangmal) Dolangmal#8 553
-mora,57,150,4 duplicate(Dolangmal) Dolangmal#9 553
+prontera,114,77,6 duplicate(Dolangmal) Dolangmal#1 4_CAT_DOWN
+geffen,109,61,6 duplicate(Dolangmal) Dolangmal#2 4_CAT_DOWN
+payon,200,106,4 duplicate(Dolangmal) Dolangmal#3 4_CAT_DOWN
+aldebaran,170,104,4 duplicate(Dolangmal) Dolangmal#4 4_CAT_DOWN
+morocc,168,275,4 duplicate(Dolangmal) Dolangmal#5 4_CAT_DOWN
+yuno,165,122,4 duplicate(Dolangmal) Dolangmal#6 4_CAT_DOWN
+rachel,121,126,4 duplicate(Dolangmal) Dolangmal#7 4_CAT_DOWN
+lighthalzen,254,83,5 duplicate(Dolangmal) Dolangmal#8 4_CAT_DOWN
+mora,57,150,4 duplicate(Dolangmal) Dolangmal#9 4_CAT_DOWN
- script ::Odgnalam -1,{
mes "This cat is sleeping in the warm "+((strnpcinfo(2) == "albe")?"Alberta":"Izlude")+" sun.";
@@ -205,14 +205,14 @@ mora,57,150,4 duplicate(Dolangmal) Dolangmal#9 553
warp "malangdo",217,85;
close;
}
-alberta,200,151,4 duplicate(Odgnalam) Odgnalam#albe 554
-izlude,182,218,4 duplicate(Odgnalam) Odgnalam#iz 554 // Old coordinates: (182,192)
-izlude_a,182,218,4 duplicate(Odgnalam) Odgnalam#iz_a 554
-izlude_b,182,218,4 duplicate(Odgnalam) Odgnalam#iz_b 554
-izlude_c,182,218,4 duplicate(Odgnalam) Odgnalam#iz_c 554
-izlude_d,182,218,4 duplicate(Odgnalam) Odgnalam#iz_d 554
+alberta,200,151,4 duplicate(Odgnalam) Odgnalam#albe 4_CAT_REST
+izlude,182,218,4 duplicate(Odgnalam) Odgnalam#iz 4_CAT_REST // Old coordinates: (182,192)
+izlude_a,182,218,4 duplicate(Odgnalam) Odgnalam#iz_a 4_CAT_REST
+izlude_b,182,218,4 duplicate(Odgnalam) Odgnalam#iz_b 4_CAT_REST
+izlude_c,182,218,4 duplicate(Odgnalam) Odgnalam#iz_c 4_CAT_REST
+izlude_d,182,218,4 duplicate(Odgnalam) Odgnalam#iz_d 4_CAT_REST
-malangdo,219,86,4 script Kong#malang 545,{
+malangdo,219,86,4 script Kong#malang 4_CAT_SAILOR2,{
mes "[Kong]";
mes "Did you have fun in Malangdo?";
mes "The fleet has a service to Izlude and Alberta.";
@@ -284,7 +284,7 @@ malangdo,219,86,4 script Kong#malang 545,{
// Generic Malangdo NPCs :: malang_tre
//============================================================
-malangdo,147,117,3 script Innkeeper#malang 554,{
+malangdo,147,117,3 script Innkeeper#malang 4_CAT_REST,{
mes "You see a lazy cat standing on a chair.";
mes "You guess that this is the Innkeeper.";
next;
@@ -330,7 +330,7 @@ malangdo,147,117,3 script Innkeeper#malang 554,{
close;
}
-malangdo,151,120,3 script Minstrel#mal 479,{
+malangdo,151,120,3 script Minstrel#mal 4_M_MINSTREL,{
mes "[Minstrel]";
mes "Boy, that lazy cat makes me want to just nap all day long.";
next;
@@ -339,7 +339,7 @@ malangdo,151,120,3 script Minstrel#mal 479,{
close;
}
-malangdo,149,120,5 script Wanderer#mal 485,5,1,{
+malangdo,149,120,5 script Wanderer#mal 4_F_WANDERER,5,1,{
mes "[Wanderer]";
mes "The cats living in here are so energetic.";
mes "Is it weird that they make me want to dance all day?";
@@ -367,7 +367,7 @@ OnTouch:
end;
}
-malangdo,216,168,3 script Cat Trainer#mal1 558,0,8,{
+malangdo,216,168,3 script Cat Trainer#mal1 4_F_ALCHE_A,0,8,{
emotion e_awsm;
mes "[Cat Trainer]";
mes "Ooo~ their soft puffy tails and soft fur~";
@@ -399,7 +399,7 @@ OnTouch:
end;
}
-malangdo,164,203,3 script Cat Trainer#mal2 853,{
+malangdo,164,203,3 script Cat Trainer#mal2 4_M_YURI,{
emotion e_awsm;
mes "[Cat Trainer]";
mes "Ooo~ their soft puffy tails and soft fur~";
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt
index ba2196aa9..ddc261e4f 100644
--- a/npc/re/cities/malaya.txt
+++ b/npc/re/cities/malaya.txt
@@ -17,7 +17,7 @@
// Port Malaya Transportation
//============================================================
// Old coordinates: alberta (237,71)
-alberta,196,202,3 script Optamara Crew#alberta 100,{
+alberta,196,202,3 script Optamara Crew#alberta 4W_SAILOR,{
mes "[Optamara Crew]";
mes "Hey, there!";
mes "It's 10,000 Zeny to go to Port Malaya. Interested?";
@@ -60,7 +60,7 @@ alberta,196,202,3 script Optamara Crew#alberta 100,{
}
}
-malaya,276,55,4 script Optamara Crew#malaya 100,{
+malaya,276,55,4 script Optamara Crew#malaya 4W_SAILOR,{
if (malaya_hi < 10) {
mes "[Optamara Crew]";
mes "I think the village is still busy. Done with your visit? There is always a ship heading for Alberta.";
@@ -90,7 +90,7 @@ malaya,276,55,4 script Optamara Crew#malaya 100,{
// Generic Port Malaya NPCs
//============================================================
-ma_in01,30,94,4 script Inn Keeper#ma 583,{
+ma_in01,30,94,4 script Inn Keeper#ma 4_F_MALAYA,{
if (malaya_hi < 10) {
mes "[Inn Keeper]";
mes "Oh my! Visiting?";
@@ -187,9 +187,9 @@ OnTouch:
mes "The unidentified creature looks at you and runs away.";
close;
}
-ma_fild01,74,367,6 duplicate(Unidentified Creature#i) Unidentified Creature#01 572,2,2
-ma_fild02,282,41,4 duplicate(Unidentified Creature#i) Unidentified Creature#05 572,2,2
-ma_scene01,195,92,4 duplicate(Unidentified Creature#i) Unidentified Creature#09 572,2,2
+ma_fild01,74,367,6 duplicate(Unidentified Creature#i) Unidentified Creature#01 4_MAL_BUDIDAI,2,2
+ma_fild02,282,41,4 duplicate(Unidentified Creature#i) Unidentified Creature#05 4_MAL_BUDIDAI,2,2
+ma_scene01,195,92,4 duplicate(Unidentified Creature#i) Unidentified Creature#09 4_MAL_BUDIDAI,2,2
- script Unidentified Creature#j -1,{
end;
@@ -260,16 +260,16 @@ OnTouch:
mes "The unidentified creature looks at you and runs away.";
close;
}
-ma_fild01,109,116,4 duplicate(Unidentified Creature#j) Unidentified Creature#02 572,2,2
-ma_fild01,280,150,6 duplicate(Unidentified Creature#j) Unidentified Creature#03 572,2,2
-ma_fild01,309,221,6 duplicate(Unidentified Creature#j) Unidentified Creature#04 572,2,2
-ma_fild02,246,324,4 duplicate(Unidentified Creature#j) Unidentified Creature#06 572,2,2
-ma_fild02,71,296,6 duplicate(Unidentified Creature#j) Unidentified Creature#07 572,2,2
-ma_fild02,32,263,4 duplicate(Unidentified Creature#j) Unidentified Creature#08 572,2,2
-ma_scene01,158,139,4 duplicate(Unidentified Creature#j) Unidentified Creature#10 572,2,2
-ma_scene01,167,112,6 duplicate(Unidentified Creature#j) Unidentified Creature#11 572,2,2
-
-malaya,227,311,4 script Grandma#ma01 575,{
+ma_fild01,109,116,4 duplicate(Unidentified Creature#j) Unidentified Creature#02 4_MAL_BUDIDAI,2,2
+ma_fild01,280,150,6 duplicate(Unidentified Creature#j) Unidentified Creature#03 4_MAL_BUDIDAI,2,2
+ma_fild01,309,221,6 duplicate(Unidentified Creature#j) Unidentified Creature#04 4_MAL_BUDIDAI,2,2
+ma_fild02,246,324,4 duplicate(Unidentified Creature#j) Unidentified Creature#06 4_MAL_BUDIDAI,2,2
+ma_fild02,71,296,6 duplicate(Unidentified Creature#j) Unidentified Creature#07 4_MAL_BUDIDAI,2,2
+ma_fild02,32,263,4 duplicate(Unidentified Creature#j) Unidentified Creature#08 4_MAL_BUDIDAI,2,2
+ma_scene01,158,139,4 duplicate(Unidentified Creature#j) Unidentified Creature#10 4_MAL_BUDIDAI,2,2
+ma_scene01,167,112,6 duplicate(Unidentified Creature#j) Unidentified Creature#11 4_MAL_BUDIDAI,2,2
+
+malaya,227,311,4 script Grandma#ma01 4_F_BARYO_OLD,{
if (malaya_hi < 10) {
mes "[Grandma]";
mes "You're not from around here? Take care of yourself.";
@@ -321,7 +321,7 @@ malaya,227,311,4 script Grandma#ma01 575,{
close;
}
-malaya,189,263,4 script Drumming Young Man#ma02 578,{
+malaya,189,263,4 script Drumming Young Man#ma02 4_M_BARYO_MAN,{
if (malaya_hi < 10) {
emotion e_omg;
mes "[Drumming Young Man]";
@@ -374,7 +374,7 @@ malaya,189,263,4 script Drumming Young Man#ma02 578,{
close;
}
-malaya,270,59,4 script Port Guard#ma03 570,{
+malaya,270,59,4 script Port Guard#ma03 4_MAL_SOLDIER,{
if (malaya_hi < 10) {
emotion e_swt2;
mes "[Port Guard]";
@@ -427,7 +427,7 @@ malaya,270,59,4 script Port Guard#ma03 570,{
}
}
-malaya,88,252,4 script Little Girl#ma04 576,{
+malaya,88,252,4 script Little Girl#ma04 4_F_BARYO_GIRL,{
if (malaya_hi < 10) {
mes "[Little Girl]";
mes "I'm scared but I have to visit the fairy in the forest.";
@@ -459,7 +459,7 @@ malaya,88,252,4 script Little Girl#ma04 576,{
close;
}
-malaya,219,92,6 script Little Kid#ma05 577,{
+malaya,219,92,6 script Little Kid#ma05 4_M_BARYO_BOY,{
if (malaya_hi < 10) {
mes "[Little Kid]";
mes "My mom told me not to play outside because its dangerous. Why?";
@@ -497,7 +497,7 @@ malaya,219,92,6 script Little Kid#ma05 577,{
close;
}
-malaya,363,283,4 script Local#ma06 582,{
+malaya,363,283,4 script Local#ma06 4_M_MALAYA,{
if (malaya_hi < 10) {
mes "[Local]";
mes "Hmm... is it time to be careful of the witches' curse?";
@@ -560,7 +560,7 @@ malaya,363,283,4 script Local#ma06 582,{
close;
}
-malaya,41,127,6 script Old Man #ma07 574,{
+malaya,41,127,6 script Old Man #ma07 4_M_BARYO_OLD,{
if (malaya_hi < 10) {
mes "[Old Man]";
mes "Foreigners are not welcomed that much when our village is chaotic like these days.";
@@ -600,7 +600,7 @@ malaya,41,127,6 script Old Man #ma07 574,{
close;
}
-malaya,63,185,4 script Woman#ma08 583,{
+malaya,63,185,4 script Woman#ma08 4_F_MALAYA,{
if (malaya_hi < 10) {
mes "[Woman]";
mes "I don't have anything to share with you.";
@@ -772,7 +772,7 @@ function script F_Malaya_Jeepney {
close;
}
-malaya,237,240,4 script Jeepney Driver#01 582,{
+malaya,237,240,4 script Jeepney Driver#01 4_M_MALAYA,{
callfunc(
"F_Malaya_Jeepney",
"ma_zif01",
@@ -792,7 +792,7 @@ malaya,237,240,4 script Jeepney Driver#01 582,{
);
}
-malaya,67,44,4 script Jeepney Driver#02 582,{
+malaya,67,44,4 script Jeepney Driver#02 4_M_MALAYA,{
callfunc(
"F_Malaya_Jeepney",
"ma_zif02",
@@ -810,7 +810,7 @@ malaya,67,44,4 script Jeepney Driver#02 582,{
);
}
-malaya,282,129,4 script Jeepney Driver#03 582,{
+malaya,282,129,4 script Jeepney Driver#03 4_M_MALAYA,{
callfunc(
"F_Malaya_Jeepney",
"ma_zif03",
@@ -828,7 +828,7 @@ malaya,282,129,4 script Jeepney Driver#03 582,{
);
}
-malaya,134,250,6 script Jeepney Driver#04 582,{
+malaya,134,250,6 script Jeepney Driver#04 4_M_MALAYA,{
callfunc(
"F_Malaya_Jeepney",
"ma_zif04",
@@ -846,7 +846,7 @@ malaya,134,250,6 script Jeepney Driver#04 582,{
);
}
-malaya,341,153,4 script Jeepney Driver#05 582,{
+malaya,341,153,4 script Jeepney Driver#05 4_M_MALAYA,{
callfunc(
"F_Malaya_Jeepney",
"ma_zif05",
@@ -864,7 +864,7 @@ malaya,341,153,4 script Jeepney Driver#05 582,{
);
}
-malaya,293,290,6 script Jeepney Driver#06 582,{
+malaya,293,290,6 script Jeepney Driver#06 4_M_MALAYA,{
callfunc(
"F_Malaya_Jeepney",
"ma_zif06",
@@ -882,7 +882,7 @@ malaya,293,290,6 script Jeepney Driver#06 582,{
);
}
-malaya,242,221,4 script Jeepney Driver#07 582,{
+malaya,242,221,4 script Jeepney Driver#07 4_M_MALAYA,{
callfunc(
"F_Malaya_Jeepney",
"ma_zif07",
@@ -897,7 +897,7 @@ malaya,242,221,4 script Jeepney Driver#07 582,{
);
}
-malaya,62,245,6 script Jeepney Driver#08 582,{
+malaya,62,245,6 script Jeepney Driver#08 4_M_MALAYA,{
callfunc(
"F_Malaya_Jeepney",
"ma_zif08",
@@ -913,7 +913,7 @@ malaya,62,245,6 script Jeepney Driver#08 582,{
);
}
-malaya,257,58,6 script Jeepney Driver#09 582,{
+malaya,257,58,6 script Jeepney Driver#09 4_M_MALAYA,{
callfunc(
"F_Malaya_Jeepney",
"ma_zif09",
diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
index baa5f90bc..c3c05d6f5 100644
--- a/npc/re/cities/mora.txt
+++ b/npc/re/cities/mora.txt
@@ -18,14 +18,14 @@
// Set 1 :: mora_resident
//============================================================
-mora,52,138,5 script Mungmung#p 516,{
+mora,52,138,5 script Mungmung#p 4_M_RAFLE_GR,{
mes "[Mungmung]";
mes "I'm not the innkeeper!";
mes "Why do people want to pay me when they see me?";
close;
}
-mora,160,123,3 script Nemnem#p 517,{
+mora,160,123,3 script Nemnem#p 4_M_RAFLE_OLD,{
mes "[Nemnem]";
mes "My pain is getting worse and worse";
mes "since the crevice appeared in Bifrost.";
@@ -45,7 +45,7 @@ mora,160,123,3 script Nemnem#p 517,{
}
}
-mora,105,104,3 script Boaster#podo 514,{
+mora,105,104,3 script Boaster#podo 4_M_DOGTRAVELER2,{
mes "[Boaster]";
mes "So the situation";
mes "was at its worst.";
@@ -73,7 +73,7 @@ mora,105,104,3 script Boaster#podo 514,{
close;
}
-mora,105,100,1 script Rangrang#p 518,{
+mora,105,100,1 script Rangrang#p 4_F_RAFLE_PK,{
mes "[Rangrang]";
mes "I've never heard such a boring and sad story.";
mes "I feel like crying!";
@@ -83,7 +83,7 @@ mora,105,100,1 script Rangrang#p 518,{
/*
// Disabled due to overlapping with RangRang,
// and is not clickable on official servers.
-mora,105,100,1 script Gurgur#p 516,{
+mora,105,100,1 script Gurgur#p 4_M_RAFLE_GR,{
mes "[Gurgur]";
mes "He's been crying, falling asleep,";
mes "and then waking up for 210 times now.";
@@ -93,7 +93,7 @@ mora,105,100,1 script Gurgur#p 516,{
}
*/
-mora,99,100,7 script Decoy#podo 515,{
+mora,99,100,7 script Decoy#podo 4_F_DOGTRAVELER,{
mes "[A Decoy]";
mes "Oh~!";
mes "That's just so";
@@ -102,7 +102,7 @@ mora,99,100,7 script Decoy#podo 515,{
close;
}
-mora,98,104,5 script Moved Raffle#podo 516,{
+mora,98,104,5 script Moved Raffle#podo 4_M_RAFLE_GR,{
mes "[Moved Raffle]";
mes "This is sad, too sad!";
mes "I'm not sure why,";
@@ -111,7 +111,7 @@ mora,98,104,5 script Moved Raffle#podo 516,{
close;
}
-mora,102,107,5 script Relieved Raffle#podo 517,{
+mora,102,107,5 script Relieved Raffle#podo 4_M_RAFLE_OLD,{
mes "[Relieved Raffle]";
mes "Wow~!";
mes "This is exciting.";
@@ -124,7 +124,7 @@ mora,102,107,5 script Relieved Raffle#podo 517,{
close;
}
-mora,101,107,5 script Excited Raffle#podo 518,{
+mora,101,107,5 script Excited Raffle#podo 4_F_RAFLE_PK,{
mes "[Excited Raffle]";
mes "Wow~";
mes "The story is no fun at all.";
@@ -135,34 +135,34 @@ mora,101,107,5 script Excited Raffle#podo 518,{
close;
}
-mora,103,100,5 script Impressed Raffle#podo 518,{
+mora,103,100,5 script Impressed Raffle#podo 4_F_RAFLE_PK,{
mes "[Impressed Raffle]";
mes "Wow! Wow!";
close;
}
-mora,123,94,7 script Visitor to Mora#podo1 515,{
+mora,123,94,7 script Visitor to Mora#podo1 4_F_DOGTRAVELER,{
mes "[Visitor to Mora]";
mes "I'm stuck here because of the crevice, which appeared out of nowhere.";
mes "Ha......";
close;
}
-mora,155,72,3 script Visitor to Mora#podo2 513,{
+mora,155,72,3 script Visitor to Mora#podo2 4_M_DOGTRAVELER,{
mes "[Visitor to Mora]";
mes "Isn't this one cheerful village?";
mes "With Bifrost blocked like that, I'm thinking of settling here permanently.";
close;
}
-mora,184,169,5 script Worker#mo1 516,{
+mora,184,169,5 script Worker#mo1 4_M_RAFLE_GR,{
mes "[Worker]";
mes "I heard that somebody made it out of the Labyrinth Forest alive.";
mes "Whoever it is, I want to meet this person myself.";
close;
}
-mora,179,155,1 script Novice Worker#mo 516,{
+mora,179,155,1 script Novice Worker#mo 4_M_RAFLE_GR,{
mes "[Novice Worker]";
mes "I'll come out of the Labyrinth Forest and become a hero!";
next;
@@ -181,7 +181,7 @@ mora,179,155,1 script Novice Worker#mo 516,{
close;
}
-mora,177,157,5 script Indifferent Worker#mo 518,{
+mora,177,157,5 script Indifferent Worker#mo 4_F_RAFLE_PK,{
mes "[Novice Worker]";
mes "I'll come out of the Labyrinth Forest and become a hero!";
next;
@@ -200,7 +200,7 @@ mora,177,157,5 script Indifferent Worker#mo 518,{
close;
}
-mora,108,182,5 script Worker#mo4 516,{
+mora,108,182,5 script Worker#mo4 4_M_RAFLE_GR,{
mes "[Worker]";
mes "Stay clear of the Labyrinth Forest.";
mes "Don't ever dream of peeking in out of curiosity.";
@@ -210,7 +210,7 @@ mora,108,182,5 script Worker#mo4 516,{
// Set 2 :: npc
//============================================================
-mora,122,97,6 script Relaxing Raffle#ep14_1 517,{
+mora,122,97,6 script Relaxing Raffle#ep14_1 4_M_RAFLE_OLD,{
mes "[Relaxing Rafflesia]";
mes "The public bath in the center of the village is a symbol of Mora Village.";
next;
@@ -226,7 +226,7 @@ mora,122,97,6 script Relaxing Raffle#ep14_1 517,{
close;
}
-mora,174,171,0 script Warehouse Worker#mo1 518,{
+mora,174,171,0 script Warehouse Worker#mo1 4_F_RAFLE_PK,{
mes "[Shortffle]";
mes "I want to climb the ladder,";
mes "but my legs are too short to do that.";
@@ -237,7 +237,7 @@ mora,174,171,0 script Warehouse Worker#mo1 518,{
close;
}
-mora,113,185,4 script Reading Raffle#ep14_1 516,{
+mora,113,185,4 script Reading Raffle#ep14_1 4_M_RAFLE_GR,{
mes "You see a Rafflesia";
mes "lost in reading.";
next;
@@ -327,7 +327,7 @@ mora,113,185,4 script Reading Raffle#ep14_1 516,{
}
}
-mora,99,65,6 script Banana Rafflesia#ep14_1 516,{
+mora,99,65,6 script Banana Rafflesia#ep14_1 4_M_RAFLE_GR,{
mes "[Banana Rafflesia]";
mes "You want a banana?";
next;
@@ -347,7 +347,7 @@ mora,99,65,6 script Banana Rafflesia#ep14_1 516,{
}
}
-mora,30,128,4 script Relaxing Traveler#ep14_1 514,{
+mora,30,128,4 script Relaxing Traveler#ep14_1 4_M_DOGTRAVELER2,{
mes "[Traveler]";
mes "The Mora Inn is famous";
mes "for its unusual pieces of furniture.";
@@ -361,7 +361,7 @@ mora,30,128,4 script Relaxing Traveler#ep14_1 514,{
close;
}
-mora,130,96,4 script Relaxing Traveler#ep14_2 513,{
+mora,130,96,4 script Relaxing Traveler#ep14_2 4_M_DOGTRAVELER,{
mes "[Traveler]";
mes "The Rafflesia in Mora Village all look alike, so it's so confusing.";
mes "It's like looking at centuplets...";
@@ -374,7 +374,7 @@ mora,130,96,4 script Relaxing Traveler#ep14_2 513,{
close;
}
-mora,43,113,4 script Wounded Rafflesia#ep14_1 517,{
+mora,43,113,4 script Wounded Rafflesia#ep14_1 4_M_RAFLE_OLD,{
mes "[Wounded Raffle]";
mes "Ugghh... What was it";
mes "that was in the bath... Arrrghh...";
@@ -383,7 +383,7 @@ mora,43,113,4 script Wounded Rafflesia#ep14_1 517,{
close;
}
-mora,168,161,4 script Warehouse Worker#mo2 513,{
+mora,168,161,4 script Warehouse Worker#mo2 4_M_DOGTRAVELER,{
mes "[Lively]";
mes "The inn over there~";
mes "It should've been mine~";
@@ -404,7 +404,7 @@ mora,168,161,4 script Warehouse Worker#mo2 513,{
close;
}
-mora,175,161,6 script Warehouse Worker#mo3 518,{
+mora,175,161,6 script Warehouse Worker#mo3 4_F_RAFLE_PK,{
mes "[Kuorita]";
mes "Oh... this duck...";
next;
@@ -422,7 +422,7 @@ mora,175,161,6 script Warehouse Worker#mo3 518,{
close;
}
-mora,140,186,3 script Raffle Philosopher 517,{
+mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{
mes "[Raffle Philosopher]";
mes "With a little token of appreciation, I will tell you a quote that will help you in your life.";
next;
@@ -1029,31 +1029,31 @@ mora,140,186,3 script Raffle Philosopher 517,{
warp "mora",31,132;
end;
}
-mora,140,72,4 duplicate(#mora_traveler) Traveler#ep14_1_1 513 //Upset Traveler
-mora,138,72,6 duplicate(#mora_traveler) Traveler#ep14_1_2 513 //Traveler That Posed the Question
-mora,139,73,4 duplicate(#mora_traveler) Traveler#ep14_1_3 513 //Traveler Trying to Stop the Fight
+mora,140,72,4 duplicate(#mora_traveler) Traveler#ep14_1_1 4_M_DOGTRAVELER //Upset Traveler
+mora,138,72,6 duplicate(#mora_traveler) Traveler#ep14_1_2 4_M_DOGTRAVELER //Traveler That Posed the Question
+mora,139,73,4 duplicate(#mora_traveler) Traveler#ep14_1_3 4_M_DOGTRAVELER //Traveler Trying to Stop the Fight
// Set 3 :: tre
//============================================================
-mora,132,185,5 script Mora Villager#sleep5 518,{
+mora,132,185,5 script Mora Villager#sleep5 4_F_RAFLE_PK,{
mes "[Mora Villager]";
mes "Phew~ Phew~";
close;
}
-mora,133,185,5 script Mora Villager#sleep2 524,{
+mora,133,185,5 script Mora Villager#sleep2 4_M_RAFLE_VI,{
mes "[Mora Villager]";
mes "Snore...";
close;
}
-mora,134,185,3 script Mora Villager#sleep1 525,{
+mora,134,185,3 script Mora Villager#sleep1 4_F_RAFLE_VI,{
mes "[Mora Villager]";
mes "Snort--";
close;
}
-mora,132,184,5 script Mora Villager#sleep6 522,{
+mora,132,184,5 script Mora Villager#sleep6 4_M_RAFLE_OR,{
mes "[Mora Villager]";
mes "Snort--";
close;
@@ -1065,31 +1065,31 @@ mora,133,184,1 script Mora Villager#sleep4 1790,{
end;
}
-mora,134,184,1 script Mora Villager#sleep3 516,{
+mora,134,184,1 script Mora Villager#sleep3 4_M_RAFLE_GR,{
mes "[Mora Villager]";
mes "Phew phew pheeew~";
close;
}
-mora,132,183,7 script Mora Villager#sleep7 524,{
+mora,132,183,7 script Mora Villager#sleep7 4_M_RAFLE_VI,{
mes "[Mora Villager]";
mes "z Z";
close;
}
-mora,133,183,7 script Mora Villager#sleep8 518,{
+mora,133,183,7 script Mora Villager#sleep8 4_F_RAFLE_PK,{
mes "[Mora Villager]";
mes "z Z";
end;
}
-mora,134,183,1 script Mora Villager#sleep9 522,{
+mora,134,183,1 script Mora Villager#sleep9 4_M_RAFLE_OR,{
mes "[Mora Villager]";
mes "z Z";
close;
}
-mora,43,127,3 script Innkeeper#mora_inn 522,{
+mora,43,127,3 script Innkeeper#mora_inn 4_M_RAFLE_OR,{
mes "[Innkeeper]";
mes "Oh~ looks like we have another adventurer.";
mes "Where are you from?";
@@ -1163,7 +1163,7 @@ mora,43,127,3 script Innkeeper#mora_inn 522,{
}
}
-mora,48,128,0 script Drawer#mora_warehouse 111,{
+mora,48,128,0 script Drawer#mora_warehouse HIDDEN_NPC,{
if(basicskillcheck() && getskilllv("NV_BASIC") < 6) {
mes "- You don't remember how to open the warehouse. -";
close;
diff --git a/npc/re/cities/yuno.txt b/npc/re/cities/yuno.txt
index 630969db6..ac2fb25fb 100644
--- a/npc/re/cities/yuno.txt
+++ b/npc/re/cities/yuno.txt
@@ -11,10 +11,10 @@
//= 1.0 First version.
//============================================================
-yuno,150,283,4 duplicate(JunoSoldier1) Juno Soldier#juno 852
-yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 852
-yuno,227,292,4 duplicate(JunoSoldier3) Juno Soldier#3juno 852
-yuno,165,228,4 duplicate(JunoSoldier4) Juno Soldier#4juno 852
-yuno,150,228,4 duplicate(JunoSoldier5) Juno Soldier#5juno 852
-yuno,334,182,4 duplicate(JunoSoldier6) Juno Soldier#6juno 852
-yuno,263,320,4 duplicate(JunoSoldier7) Juno Soldier#7juno 852
+yuno,150,283,4 duplicate(JunoSoldier1) Juno Soldier#juno 4_M_EIN_SOLDIER
+yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 4_M_EIN_SOLDIER
+yuno,227,292,4 duplicate(JunoSoldier3) Juno Soldier#3juno 4_M_EIN_SOLDIER
+yuno,165,228,4 duplicate(JunoSoldier4) Juno Soldier#4juno 4_M_EIN_SOLDIER
+yuno,150,228,4 duplicate(JunoSoldier5) Juno Soldier#5juno 4_M_EIN_SOLDIER
+yuno,334,182,4 duplicate(JunoSoldier6) Juno Soldier#6juno 4_M_EIN_SOLDIER
+yuno,263,320,4 duplicate(JunoSoldier7) Juno Soldier#7juno 4_M_EIN_SOLDIER
diff --git a/npc/re/guides/guides_alberta.txt b/npc/re/guides/guides_alberta.txt
index d18ec2031..94c95279c 100644
--- a/npc/re/guides/guides_alberta.txt
+++ b/npc/re/guides/guides_alberta.txt
@@ -12,7 +12,7 @@
//= 1.1 Navigation system update. [Euphy]
//============================================================
-alberta,23,238,4 script Guide#01alberta::AlbertaGuide 105,{
+alberta,23,238,4 script Guide#01alberta::AlbertaGuide 8W_SOLDIER,{
cutin "prt_soldier",2;
mes "[Alberta Guide]";
mes "Welcome to ^8B4513Alberta^000000,";
@@ -208,5 +208,5 @@ alberta,23,238,4 script Guide#01alberta::AlbertaGuide 105,{
}
}
}
-alberta,120,60,3 duplicate(AlbertaGuide) Guide#02alberta 105
-alberta,184,143,4 duplicate(AlbertaGuide) Guide#03alberta 105
+alberta,120,60,3 duplicate(AlbertaGuide) Guide#02alberta 8W_SOLDIER
+alberta,184,143,4 duplicate(AlbertaGuide) Guide#03alberta 8W_SOLDIER
diff --git a/npc/re/guides/guides_aldebaran.txt b/npc/re/guides/guides_aldebaran.txt
index e9b44d4c7..ef47d543d 100644
--- a/npc/re/guides/guides_aldebaran.txt
+++ b/npc/re/guides/guides_aldebaran.txt
@@ -13,7 +13,7 @@
//= Optimized.
//============================================================
-aldebaran,139,63,4 script Guide#01aldebaran::GuideAldearan 105,{
+aldebaran,139,63,4 script Guide#01aldebaran::GuideAldearan 8W_SOLDIER,{
cutin "prt_soldier",2;
mes "[Al De Baran Guide]";
mes "Welcome to ^8B4513Al De Baran^000000,";
@@ -145,6 +145,6 @@ L_Mark:
mes "on your mini-map.";
return;
}
-aldebaran,243,143,2 duplicate(GuideAldearan) Guide#02aldebaran 105
-aldebaran,135,243,4 duplicate(GuideAldearan) Guide#03aldebaran 105
-aldebaran,36,135,6 duplicate(GuideAldearan) Guide#04aldebaran 105
+aldebaran,243,143,2 duplicate(GuideAldearan) Guide#02aldebaran 8W_SOLDIER
+aldebaran,135,243,4 duplicate(GuideAldearan) Guide#03aldebaran 8W_SOLDIER
+aldebaran,36,135,6 duplicate(GuideAldearan) Guide#04aldebaran 8W_SOLDIER
diff --git a/npc/re/guides/guides_amatsu.txt b/npc/re/guides/guides_amatsu.txt
index f9498499f..e08569831 100644
--- a/npc/re/guides/guides_amatsu.txt
+++ b/npc/re/guides/guides_amatsu.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-amatsu,202,91,3 script Amatsu Guide#amatsu 758,{
+amatsu,202,91,3 script Amatsu Guide#amatsu 4_F_JPN,{
mes "[Amachang]";
mes "Welcome to ^8B4513Amatsu^000000,";
mes "the town of kind towners";
diff --git a/npc/re/guides/guides_ayothaya.txt b/npc/re/guides/guides_ayothaya.txt
index fd61b1380..6d351d4d6 100644
--- a/npc/re/guides/guides_ayothaya.txt
+++ b/npc/re/guides/guides_ayothaya.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-ayothaya,203,169,4 script Ayothaya Guide Noi#01ay 839,{
+ayothaya,203,169,4 script Ayothaya Guide Noi#01ay 4_F_THAIGIRL,{
if (strnpcinfo(0) == "Ayothaya Guide Noi#01ay")
set .@n$, "[Noi]";
else
@@ -90,4 +90,4 @@ ayothaya,203,169,4 script Ayothaya Guide Noi#01ay 839,{
}
}
}
-ayothaya,146,86,4 duplicate(Ayothaya Guide Noi#01ay) Ayothaya Guide Noa#02ay 839
+ayothaya,146,86,4 duplicate(Ayothaya Guide Noi#01ay) Ayothaya Guide Noa#02ay 4_F_THAIGIRL
diff --git a/npc/re/guides/guides_brasilis.txt b/npc/re/guides/guides_brasilis.txt
index 68b6df91f..05f6a47d7 100644
--- a/npc/re/guides/guides_brasilis.txt
+++ b/npc/re/guides/guides_brasilis.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-brasilis,219,97,3 script Brasilis Guide 478,{
+brasilis,219,97,3 script Brasilis Guide 4_F_BRZ_WOMAN,{
mes "[Brasilis Guide]";
mes "Welcome to ^8B4513Brasilis^000000, a country as passionate as the sun.";
mes "If you have any questions, please ask me.";
diff --git a/npc/re/guides/guides_comodo.txt b/npc/re/guides/guides_comodo.txt
index 85ad31703..6b584714e 100644
--- a/npc/re/guides/guides_comodo.txt
+++ b/npc/re/guides/guides_comodo.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-comodo,322,178,4 script Comodo Guide#01comodo::GuideComodo 700,{
+comodo,322,178,4 script Comodo Guide#01comodo::GuideComodo 8_F_GIRL,{
mes "[Comodo Guide]";
mes "Welcome to ^8B4513Comodo^000000,";
mes "the Beach Town of the Rune-Midgarts Kingdom.";
@@ -176,6 +176,6 @@ L_Mark:
mes "Would you like to check any other locations?";
return;
}
-comodo,181,347,4 duplicate(GuideComodo) Comodo Guide#02comodo 700
-comodo,197,149,3 duplicate(GuideComodo) Comodo Guide#03comodo 700
-comodo,37,219,4 duplicate(GuideComodo) Comodo Guide#04comodo 700
+comodo,181,347,4 duplicate(GuideComodo) Comodo Guide#02comodo 8_F_GIRL
+comodo,197,149,3 duplicate(GuideComodo) Comodo Guide#03comodo 8_F_GIRL
+comodo,37,219,4 duplicate(GuideComodo) Comodo Guide#04comodo 8_F_GIRL
diff --git a/npc/re/guides/guides_dewata.txt b/npc/re/guides/guides_dewata.txt
index 356ca81d1..91786f2d6 100644
--- a/npc/re/guides/guides_dewata.txt
+++ b/npc/re/guides/guides_dewata.txt
@@ -12,7 +12,7 @@
//= 1.1 Navigation system update. [Euphy]
//============================================================
-dewata,202,106,4 script Dewata Guide#dewata01 535,{
+dewata,202,106,4 script Dewata Guide#dewata01 4_M_DEWOLDWOMAN,{
mes "[Dewata Guide]";
mes "Welcome to ^8B4513Dewata Island^000000,";
mes "a place with dazzling waves and charming views it's a great place to relax.";
@@ -79,4 +79,4 @@ L_Mark:
mes "Is there anything else I can do for you?";
return;
}
-dewata,197,184,4 duplicate(Dewata Guide#dewata01) Dewata Guide#dewata02 535
+dewata,197,184,4 duplicate(Dewata Guide#dewata01) Dewata Guide#dewata02 4_M_DEWOLDWOMAN
diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt
index e802f9633..e5b6f4133 100644
--- a/npc/re/guides/guides_dicastes.txt
+++ b/npc/re/guides/guides_dicastes.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-dicastes01,181,191,5 script Traveler Ichack#info 481,2,2,{
+dicastes01,181,191,5 script Traveler Ichack#info 4_M_SHADOWCHASER,2,2,{
mes "[Traveler Ichack]";
mes "Oh!! You are a stranger!";
mes "I'm Ichack, the first adventurer that arrived here in El Dicastes!";
diff --git a/npc/re/guides/guides_eclage.txt b/npc/re/guides/guides_eclage.txt
index ed9432c95..177813e1c 100644
--- a/npc/re/guides/guides_eclage.txt
+++ b/npc/re/guides/guides_eclage.txt
@@ -10,7 +10,7 @@
//= 1.0 First version. [Euphy]
//============================================================
-ecl_in01,48,60,4 script Eclage Guard#obb 447,{
+ecl_in01,48,60,4 script Eclage Guard#obb 4_M_FAIRYSOLDIER,{
mes "[Eclage Guard]";
mes "Welcome, Adventurer. This is the plaza of Eclage, a great and sacred tree. How can I help you?";
next;
diff --git a/npc/re/guides/guides_einbroch.txt b/npc/re/guides/guides_einbroch.txt
index 81fa50bb5..697450f51 100644
--- a/npc/re/guides/guides_einbroch.txt
+++ b/npc/re/guides/guides_einbroch.txt
@@ -12,7 +12,7 @@
//= 1.1 Navigation system update. [Euphy]
//============================================================
-einbroch,72,202,4 script Einbroch Guide#ein01::GuideEinbroch 852,{
+einbroch,72,202,4 script Einbroch Guide#ein01::GuideEinbroch 4_M_EIN_SOLDIER,{
cutin "ein_soldier",2;
mes "[Einbroch Guide]";
mes "Welcome";
@@ -206,11 +206,11 @@ einbroch,72,202,4 script Einbroch Guide#ein01::GuideEinbroch 852,{
}
}
}
-einbroch,155,43,4 duplicate(GuideEinbroch) Einbroch Guide#ein02 852
-einbroch,162,317,4 duplicate(GuideEinbroch) Einbroch Guide#ein03 852
-einbroch,252,320,3 duplicate(GuideEinbroch) Einbroch Guide#ein04 852
+einbroch,155,43,4 duplicate(GuideEinbroch) Einbroch Guide#ein02 4_M_EIN_SOLDIER
+einbroch,162,317,4 duplicate(GuideEinbroch) Einbroch Guide#ein03 4_M_EIN_SOLDIER
+einbroch,252,320,3 duplicate(GuideEinbroch) Einbroch Guide#ein04 4_M_EIN_SOLDIER
-einbech,67,37,4 script Einbech Guide#einbech01::GuideEinbech 852,{
+einbech,67,37,4 script Einbech Guide#einbech01::GuideEinbech 4_M_EIN_SOLDIER,{
cutin "ein_soldier",2;
mes "[Einbech Guide]";
mes "Welcome to ^8B4513Einbech^000000,";
@@ -289,4 +289,4 @@ einbech,67,37,4 script Einbech Guide#einbech01::GuideEinbech 852,{
}
}
}
-einbech,48,214,4 duplicate(GuideEinbech) Einbech Guide#einbech02 852
+einbech,48,214,4 duplicate(GuideEinbech) Einbech Guide#einbech02 4_M_EIN_SOLDIER
diff --git a/npc/re/guides/guides_geffen.txt b/npc/re/guides/guides_geffen.txt
index 527b46fe3..3bcd4db5b 100644
--- a/npc/re/guides/guides_geffen.txt
+++ b/npc/re/guides/guides_geffen.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-geffen,203,116,4 script Guide#01geffen::GuideGeffen 705,{
+geffen,203,116,4 script Guide#01geffen::GuideGeffen 4_M_GEF_SOLDIER,{
cutin "gef_soldier",2;
mes "[Geffen Guide]";
mes "Welcome to ^8B4513Geffen^000000,";
@@ -165,6 +165,6 @@ L_Mark:
return;
}
-geffen,118,62,0 duplicate(GuideGeffen) Guide#02geffen 705
-geffen,36,123,6 duplicate(GuideGeffen) Guide#03geffen 705
-geffen,123,203,4 duplicate(GuideGeffen) Guide#04geffen 705
+geffen,118,62,0 duplicate(GuideGeffen) Guide#02geffen 4_M_GEF_SOLDIER
+geffen,36,123,6 duplicate(GuideGeffen) Guide#03geffen 4_M_GEF_SOLDIER
+geffen,123,203,4 duplicate(GuideGeffen) Guide#04geffen 4_M_GEF_SOLDIER
diff --git a/npc/re/guides/guides_gonryun.txt b/npc/re/guides/guides_gonryun.txt
index 9d1517059..23f842758 100644
--- a/npc/re/guides/guides_gonryun.txt
+++ b/npc/re/guides/guides_gonryun.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-gonryun,163,60,4 script Kunlun Guide#01gonryun 780,{
+gonryun,163,60,4 script Kunlun Guide#01gonryun 8_M_TWSOLDIER,{
mes "[He Yuen Zhe]";
mes "Ni Hao!";
mes "Welcome to ^8B4513Kunlun^000000~";
diff --git a/npc/re/guides/guides_hugel.txt b/npc/re/guides/guides_hugel.txt
index 97e0513fa..0544ead01 100644
--- a/npc/re/guides/guides_hugel.txt
+++ b/npc/re/guides/guides_hugel.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-hugel,98,56,3 script Hugel Guide Granny#hugel 863,{
+hugel,98,56,3 script Hugel Guide Granny#hugel 4_F_LGTGRAND,{
mes "[Hugel Guide Granny]";
mes "Oh, hello~ you are one energetic adventurer.";
mes "Welcome to ^8B4513Hugel^000000. I am honored to guide you in this beautiful village.";
@@ -170,7 +170,7 @@ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{
}
}
-hugel,187,172,6 script Guide Rich King#hugel 414,{
+hugel,187,172,6 script Guide Rich King#hugel 4_M_CRU_KNT,{
mes "[Rich King]";
mes "What business do you have";
mes "in this countryside village?";
diff --git a/npc/re/guides/guides_izlude.txt b/npc/re/guides/guides_izlude.txt
index 793a6ab77..a3a37537b 100644
--- a/npc/re/guides/guides_izlude.txt
+++ b/npc/re/guides/guides_izlude.txt
@@ -192,16 +192,16 @@ L_Mark:
return;
}
-izlude,129,175,4 duplicate(GuideIzlude) Guide#01izlude 105
-izlude_a,129,175,4 duplicate(GuideIzlude) Guide#01izlude_a 105
-izlude_b,129,175,4 duplicate(GuideIzlude) Guide#01izlude_b 105
-izlude_c,129,175,4 duplicate(GuideIzlude) Guide#01izlude_c 105
-izlude_d,129,175,4 duplicate(GuideIzlude) Guide#01izlude_d 105
+izlude,129,175,4 duplicate(GuideIzlude) Guide#01izlude 8W_SOLDIER
+izlude_a,129,175,4 duplicate(GuideIzlude) Guide#01izlude_a 8W_SOLDIER
+izlude_b,129,175,4 duplicate(GuideIzlude) Guide#01izlude_b 8W_SOLDIER
+izlude_c,129,175,4 duplicate(GuideIzlude) Guide#01izlude_c 8W_SOLDIER
+izlude_d,129,175,4 duplicate(GuideIzlude) Guide#01izlude_d 8W_SOLDIER
-izlude,133,113,4 duplicate(GuideIzlude) Guide#02izlude 105
-izlude_a,133,113,4 duplicate(GuideIzlude) Guide#02izlude_a 105
-izlude_b,133,113,4 duplicate(GuideIzlude) Guide#02izlude_b 105
-izlude_c,133,113,4 duplicate(GuideIzlude) Guide#02izlude_c 105
-izlude_d,133,113,4 duplicate(GuideIzlude) Guide#02izlude_d 105
+izlude,133,113,4 duplicate(GuideIzlude) Guide#02izlude 8W_SOLDIER
+izlude_a,133,113,4 duplicate(GuideIzlude) Guide#02izlude_a 8W_SOLDIER
+izlude_b,133,113,4 duplicate(GuideIzlude) Guide#02izlude_b 8W_SOLDIER
+izlude_c,133,113,4 duplicate(GuideIzlude) Guide#02izlude_c 8W_SOLDIER
+izlude_d,133,113,4 duplicate(GuideIzlude) Guide#02izlude_d 8W_SOLDIER
-//izlude,120,206,4 duplicate(GuideIzlude) Guide#03izlude 105
+//izlude,120,206,4 duplicate(GuideIzlude) Guide#03izlude 8W_SOLDIER
diff --git a/npc/re/guides/guides_juno.txt b/npc/re/guides/guides_juno.txt
index 924de82a1..dc85f0743 100644
--- a/npc/re/guides/guides_juno.txt
+++ b/npc/re/guides/guides_juno.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-yuno,59,212,4 script Juno Guide#yuno01::GuideJuno 700,{
+yuno,59,212,4 script Juno Guide#yuno01::GuideJuno 8_F_GIRL,{
mes "[Juno Guide]";
mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
mes "the city of ^8B4513Juno^000000!";
@@ -160,4 +160,4 @@ L_Mark:
mes "Would you like to check any other locations?";
return;
}
-yuno,153,47,4 duplicate(GuideJuno) Juno Guide#yuno02 700
+yuno,153,47,4 duplicate(GuideJuno) Juno Guide#yuno02 8_F_GIRL
diff --git a/npc/re/guides/guides_lighthalzen.txt b/npc/re/guides/guides_lighthalzen.txt
index 6c6c42b26..d7cd22aae 100644
--- a/npc/re/guides/guides_lighthalzen.txt
+++ b/npc/re/guides/guides_lighthalzen.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 852,{
+lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 4_M_EIN_SOLDIER,{
cutin "ein_soldier",2;
mes "[Lighthalzen Guide]";
mes "Welcome to ^8B4513Lighthalzen^000000,";
@@ -180,6 +180,6 @@ L_Mark:
mes "Would you like to check any other locations?";
return;
}
-lighthalzen,220,310,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz02 852
-lighthalzen,154,100,5 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz03 852
-lighthalzen,307,224,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz04 852
+lighthalzen,220,310,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz02 4_M_EIN_SOLDIER
+lighthalzen,154,100,5 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz03 4_M_EIN_SOLDIER
+lighthalzen,307,224,3 duplicate(GuideLighthazlen) Lighthalzen Guide#lhz04 4_M_EIN_SOLDIER
diff --git a/npc/re/guides/guides_louyang.txt b/npc/re/guides/guides_louyang.txt
index 49eb5404b..f79039e32 100644
--- a/npc/re/guides/guides_louyang.txt
+++ b/npc/re/guides/guides_louyang.txt
@@ -12,7 +12,7 @@
//= 1.1 Navigation system update. [Euphy]
//============================================================
-louyang,224,104,4 script Louyang Guide#01louyang 818,{
+louyang,224,104,4 script Louyang Guide#01louyang 4_F_CHNWOMAN,{
mes "[Representative]";
mes "Welcome to ^8B4513Louyang^000000,";
mes "an ancient land with";
diff --git a/npc/re/guides/guides_lutie.txt b/npc/re/guides/guides_lutie.txt
index 5705cae9c..86f283c98 100644
--- a/npc/re/guides/guides_lutie.txt
+++ b/npc/re/guides/guides_lutie.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-xmas,140,137,3 script Lutie Guide#xmas 717,{
+xmas,140,137,3 script Lutie Guide#xmas 4_F_KID3,{
mes "[Lutie Guide]";
mes "Welcome to ^8B4513Lutie^000000,";
mes "the Snow Village.";
diff --git a/npc/re/guides/guides_malaya.txt b/npc/re/guides/guides_malaya.txt
index 265b362bb..7120d843c 100644
--- a/npc/re/guides/guides_malaya.txt
+++ b/npc/re/guides/guides_malaya.txt
@@ -11,7 +11,7 @@
//= 1.1 Navigation system update. [Euphy]
//============================================================
-malaya,71,72,4 script Port Malaya Guide#01::GuideMalaya 579,{
+malaya,71,72,4 script Port Malaya Guide#01::GuideMalaya 4_F_BARYO_WOMAN,{
mes "[Port Malaya Guide]";
mes "Welcome to ^8B4513Port Malaya^000000, the Breathing Village.";
mes "Where cultures and legends come to life!";
@@ -77,5 +77,5 @@ L_Mark:
mes "Is there anything else I can do for you?";
return;
}
-malaya,250,83,6 duplicate(GuideMalaya) Port Malaya Guide#02 579
-malaya,224,204,6 duplicate(GuideMalaya) Port Malaya Guide#03 579
+malaya,250,83,6 duplicate(GuideMalaya) Port Malaya Guide#02 4_F_BARYO_WOMAN
+malaya,224,204,6 duplicate(GuideMalaya) Port Malaya Guide#03 4_F_BARYO_WOMAN
diff --git a/npc/re/guides/guides_mora.txt b/npc/re/guides/guides_mora.txt
index 67936cac0..87de33b35 100644
--- a/npc/re/guides/guides_mora.txt
+++ b/npc/re/guides/guides_mora.txt
@@ -11,7 +11,7 @@
//= 1.1 Navigation system update. [Euphy]
//============================================================
-mora,25,158,5 script Raffle Guide#north 516,{
+mora,25,158,5 script Raffle Guide#north 4_M_RAFLE_GR,{
mes "[Raffoh]";
mes "Laoh~!";
mes "Welcome to the Village of Mora.";
@@ -62,7 +62,7 @@ mora,25,158,5 script Raffle Guide#north 516,{
}
}
-mora,167,76,3 script Raffle Guide#east 522,{
+mora,167,76,3 script Raffle Guide#east 4_M_RAFLE_OR,{
mes "[Raffuh]";
mes "Uh...";
mes "This, this is the Village of Mora.";
@@ -113,7 +113,7 @@ mora,167,76,3 script Raffle Guide#east 522,{
}
}
-mora,115,138,5 script Raffle Guide#center 524,{
+mora,115,138,5 script Raffle Guide#center 4_M_RAFLE_VI,{
mes "[Raffla]";
mes "Lala!";
mes "Welcome to the Village of Mora la!";
@@ -165,7 +165,7 @@ mora,115,138,5 script Raffle Guide#center 524,{
}
}
-mora,72,51,3 script Raffle Guide#south 518,{
+mora,72,51,3 script Raffle Guide#south 4_F_RAFLE_PK,{
mes "[Raffli]";
mes "Lali?";
mes "Welcome to the Village of Mora.";
diff --git a/npc/re/guides/guides_morroc.txt b/npc/re/guides/guides_morroc.txt
index 9c86f7fae..55b1ef58e 100644
--- a/npc/re/guides/guides_morroc.txt
+++ b/npc/re/guides/guides_morroc.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{
+morocc,153,286,6 script Guide#01morocc::GuideMorroc 4_M_MOC_SOLDIER,{
cutin "moc_soldier",2;
mes "[Morroc Guide]";
mes "Welcome to ^8B4513Morroc^000000,";
@@ -161,11 +161,11 @@ L_Mark:
mes "Would you like to check any other locations?";
return;
}
-morocc,154,38,6 duplicate(GuideMorroc) Guide#02morocc 707
-morocc,296,213,4 duplicate(GuideMorroc) Guide#03morocc 707
-morocc,28,170,5 duplicate(GuideMorroc) Guide#04morocc 707
+morocc,154,38,6 duplicate(GuideMorroc) Guide#02morocc 4_M_MOC_SOLDIER
+morocc,296,213,4 duplicate(GuideMorroc) Guide#03morocc 4_M_MOC_SOLDIER
+morocc,28,170,5 duplicate(GuideMorroc) Guide#04morocc 4_M_MOC_SOLDIER
-moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 707,{
+moc_ruins,159,53,3 script Guide#01ruins::GuideMocRuins 4_M_MOC_SOLDIER,{
cutin "moc_soldier",2;
mes "[Morroc Guide]";
mes "Welcome to ^8B4513Morroc^000000,";
@@ -305,5 +305,5 @@ L_Mark:
mes "Would you like to check any other locations?";
return;
}
-moc_ruins,70,164,3 duplicate(GuideMocRuins) Guide#02ruins 707
-moc_ruins,65,44,5 duplicate(GuideMocRuins) Guide#03ruins 707
+moc_ruins,70,164,3 duplicate(GuideMocRuins) Guide#02ruins 4_M_MOC_SOLDIER
+moc_ruins,65,44,5 duplicate(GuideMocRuins) Guide#03ruins 4_M_MOC_SOLDIER
diff --git a/npc/re/guides/guides_moscovia.txt b/npc/re/guides/guides_moscovia.txt
index 3a8d3e98b..05664c06a 100644
--- a/npc/re/guides/guides_moscovia.txt
+++ b/npc/re/guides/guides_moscovia.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-moscovia,161,76,3 script Moscovia Guide#01mosc 959,{
+moscovia,161,76,3 script Moscovia Guide#01mosc 4_F_RUSWOMAN1,{
mes "[Moscovia Guide]";
mes "A paradise on the sea,";
mes "beautiful waves and warm sunshine.";
@@ -98,4 +98,4 @@ moscovia,161,76,3 script Moscovia Guide#01mosc 959,{
}
}
}
-moscovia,226,191,4 duplicate(Moscovia Guide#01mosc) Moscovia Guide#02mosc 959
+moscovia,226,191,4 duplicate(Moscovia Guide#01mosc) Moscovia Guide#02mosc 4_F_RUSWOMAN1
diff --git a/npc/re/guides/guides_niflheim.txt b/npc/re/guides/guides_niflheim.txt
index 9c9321069..141f14cfa 100644
--- a/npc/re/guides/guides_niflheim.txt
+++ b/npc/re/guides/guides_niflheim.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-niflheim,201,187,3 script Niflheim Guide#01nif 849,{
+niflheim,201,187,3 script Niflheim Guide#01nif 4_M_DIEMAN,{
mes "[Niflheim Guide]";
mes "Welcome to.. ^8B4513Niflheim^000000...";
mes "the Realm of the Dead...";
diff --git a/npc/re/guides/guides_payon.txt b/npc/re/guides/guides_payon.txt
index ce8164701..a165ad455 100644
--- a/npc/re/guides/guides_payon.txt
+++ b/npc/re/guides/guides_payon.txt
@@ -13,7 +13,7 @@
//= 1.2 Navigation system update. [Euphy]
//============================================================
-payon,163,64,3 script Guide#01payon::GuidePayon 708,{
+payon,163,64,3 script Guide#01payon::GuidePayon 4_M_PAY_SOLDIER,{
cutin "pay_soldier",2;
mes "[Payon Guide]";
mes "Welcome to ^8B4513Payon^000000,";
@@ -191,11 +191,11 @@ L_Mark:
return;
}
-payon,151,182,6 duplicate(GuidePayon) Guide#02payon 708
-payon,221,85,6 duplicate(GuidePayon) Guide#03payon 708
-payon,233,324,4 duplicate(GuidePayon) Guide#04payon 708
+payon,151,182,6 duplicate(GuidePayon) Guide#02payon 4_M_PAY_SOLDIER
+payon,221,85,6 duplicate(GuidePayon) Guide#03payon 4_M_PAY_SOLDIER
+payon,233,324,4 duplicate(GuidePayon) Guide#04payon 4_M_PAY_SOLDIER
-pay_arche,86,33,4 script Guide#05payon 708,{
+pay_arche,86,33,4 script Guide#05payon 4_M_PAY_SOLDIER,{
cutin "pay_soldier",2;
mes "[Payon Guide]";
mes "Welcome to ^8B4513Archer Village^000000,";
diff --git a/npc/re/guides/guides_prontera.txt b/npc/re/guides/guides_prontera.txt
index 08f2a8972..c3ecea92f 100644
--- a/npc/re/guides/guides_prontera.txt
+++ b/npc/re/guides/guides_prontera.txt
@@ -13,7 +13,7 @@
//= Optimized.
//============================================================
-prontera,154,187,4 script Guide#01prontera::GuideProntera 105,{
+prontera,154,187,4 script Guide#01prontera::GuideProntera 8W_SOLDIER,{
cutin "prt_soldier",2;
mes "[Prontera Guide]";
mes "Welcome to ^8B4513Prontera^000000,";
@@ -294,7 +294,7 @@ L_Mark:
mes "on your mini-map.";
return;
}
-prontera,282,208,2 duplicate(GuideProntera) Guide#02prontera 105
-prontera,29,200,6 duplicate(GuideProntera) Guide#03prontera 105
-prontera,160,29,0 duplicate(GuideProntera) Guide#04prontera 105
-prontera,151,330,4 duplicate(GuideProntera) Guide#05prontera 105
+prontera,282,208,2 duplicate(GuideProntera) Guide#02prontera 8W_SOLDIER
+prontera,29,200,6 duplicate(GuideProntera) Guide#03prontera 8W_SOLDIER
+prontera,160,29,0 duplicate(GuideProntera) Guide#04prontera 8W_SOLDIER
+prontera,151,330,4 duplicate(GuideProntera) Guide#05prontera 8W_SOLDIER
diff --git a/npc/re/guides/guides_rachel.txt b/npc/re/guides/guides_rachel.txt
index 706a4b7b2..f7f1a2c87 100644
--- a/npc/re/guides/guides_rachel.txt
+++ b/npc/re/guides/guides_rachel.txt
@@ -12,7 +12,7 @@
//= 1.1 Navigation system update. [Euphy]
//============================================================
-rachel,138,146,5 script Rachel Guide#rachel 934,{
+rachel,138,146,5 script Rachel Guide#rachel 4_M_RASWORD,{
mes "[Rachel Guide]";
mes "Welcome to the capital of Arunafeltz, ^8B4513Rachel^000000 where the warm breath of the goddess Freya reaches.";
mes "If this is the first time for you to use the guide services, I suggest you ask many questions.";
diff --git a/npc/re/guides/guides_umbala.txt b/npc/re/guides/guides_umbala.txt
index 3554a0ae0..d2d3849ca 100644
--- a/npc/re/guides/guides_umbala.txt
+++ b/npc/re/guides/guides_umbala.txt
@@ -12,7 +12,7 @@
//= 1.1 Navigation system update. [Euphy]
//============================================================
-umbala,128,94,3 script Umbala Guide#01umbala::GuideUmbala 702,{
+umbala,128,94,3 script Umbala Guide#01umbala::GuideUmbala 4_F_GON,{
mes "[Umbala Guide]";
mes "Welcome to ^8B4513Umbala^000000,";
mes "the Village of the Utan Tribe.";
@@ -97,4 +97,4 @@ umbala,128,94,3 script Umbala Guide#01umbala::GuideUmbala 702,{
}
}
}
-umbala,99,158,3 duplicate(GuideUmbala) Umbala Guide#02umbala 702
+umbala,99,158,3 duplicate(GuideUmbala) Umbala Guide#02umbala 4_F_GON
diff --git a/npc/re/guides/guides_veins.txt b/npc/re/guides/guides_veins.txt
index 1f931d2bc..8c136f623 100644
--- a/npc/re/guides/guides_veins.txt
+++ b/npc/re/guides/guides_veins.txt
@@ -12,7 +12,7 @@
//= 1.1 Navigation system update. [Euphy]
//============================================================
-veins,210,345,5 script Veins Guide#veins01::GuideVeins 934,{
+veins,210,345,5 script Veins Guide#veins01::GuideVeins 4_M_RASWORD,{
mes "[Veins Guide]";
mes "Thank you for coming through the rough sand storms. Welcome to ^8B4513Veins^000000, the Canyon Village.";
mes "If this is the first time for you to use the guide services, why don't you check the \"Notice\" menu first?";
@@ -105,4 +105,4 @@ veins,210,345,5 script Veins Guide#veins01::GuideVeins 934,{
}
}
}
-veins,189,101,5 duplicate(GuideVeins) Veins Guide#veins02 934
+veins,189,101,5 duplicate(GuideVeins) Veins Guide#veins02 4_M_RASWORD
diff --git a/npc/re/guild/invest_main.txt b/npc/re/guild/invest_main.txt
index a5a7b1e72..0a9e4105b 100644
--- a/npc/re/guild/invest_main.txt
+++ b/npc/re/guild/invest_main.txt
@@ -224,7 +224,7 @@ function script F_Invest_Abyss {
// Script Core
//============================================================
-prt_gld,1,1,0 script #fund_master 844,{
+prt_gld,1,1,0 script #fund_master CLEAR_NPC,{
end;
OnInit:
set .@invest_status, callfunc("F_Invest_Status");
@@ -386,7 +386,7 @@ OnReset:
end;
}
-prt_gld,2,2,0 script Investment_total#fund00 844,{
+prt_gld,2,2,0 script Investment_total#fund00 CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "Is this not working properly?";
next;
@@ -462,7 +462,7 @@ OnTimer3600000:
}
}
-prt_gld,164,98,3 script Revoting Manager#Invest1 421,{
+prt_gld,164,98,3 script Revoting Manager#Invest1 4_M_BOSSCAT,{
mes "[Revoting Manager]";
mes "We are not accepting additional votes.";
mes "Please wait for our results announcement.";
@@ -552,7 +552,7 @@ OnTimer60000:
end;
}
-prt_gld,164,98,3 script Revoting Manager#Invest2 421,{
+prt_gld,164,98,3 script Revoting Manager#Invest2 4_M_BOSSCAT,{
set .@invest, $2011_agit_invest;
if (.@invest < 11) {
mes "[Revoting Manager]";
@@ -666,7 +666,7 @@ OnTimer20000:
}
/*
-prtg_cas01,2,2,0 script Abrai 55,{
+prtg_cas01,2,2,0 script Abrai 1_M_JOBTESTER,{
mes "I should quit my steward job.";
close;
OnAgitInvest:
@@ -1259,7 +1259,7 @@ L_Enter:
// Item Investments
//============================================================
-malangdo,218,126,4 script Cat Paw Merchants Notice 857,{
+malangdo,218,126,4 script Cat Paw Merchants Notice 4_BOARD3,{
mes "<< Cat Paw Merchants Notice >>";
mes "'^C379CEInvest Unused Items for Prizes!^000000'";
next;
@@ -1325,7 +1325,7 @@ malangdo,218,126,4 script Cat Paw Merchants Notice 857,{
}
}
-malangdo,218,123,1 script Namis#invest 545,4,4,{
+malangdo,218,123,1 script Namis#invest 4_CAT_SAILOR2,4,4,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "- Currently you're carrying -";
mes "- too many items with you. -";
@@ -1465,7 +1465,7 @@ OnTouch:
// Investment Rewards
//============================================================
-malangdo,215,119,4 script Thanks Ticket Machine 564,{
+malangdo,215,119,4 script Thanks Ticket Machine 2_VENDING_MACHINE1,{
if (MaxWeight - Weight < 4500 || checkweight(1201,1) == 0) {
mes "- Currently you're carrying -";
mes "- too many items with you. -";
diff --git a/npc/re/guild/invest_npc.txt b/npc/re/guild/invest_npc.txt
index edc8eeacf..a1d564e00 100644
--- a/npc/re/guild/invest_npc.txt
+++ b/npc/re/guild/invest_npc.txt
@@ -16,50 +16,50 @@
// Realms - Merchant Guilds, Gate Managers, Status Boards
//============================================================
-alde_gld,186,157,3 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Megrez 549
-alde_gld,191,164,3 duplicate(Gate Manager#realm) Gate Manager#alde_f00 421
-alde_gld,188,158,3 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Alde 857
+alde_gld,186,157,3 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Megrez 4_CAT_MERMASTER
+alde_gld,191,164,3 duplicate(Gate Manager#realm) Gate Manager#alde_f00 4_M_BOSSCAT
+alde_gld,188,158,3 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Alde 4_BOARD3
-gef_fild13,187,208,3 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Meraq 549
-gef_fild13,189,206,3 duplicate(Gate Manager#realm) Gate Manager#gef_f00 421
-gef_fild13,190,209,3 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Gef 857
+gef_fild13,187,208,3 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Meraq 4_CAT_MERMASTER
+gef_fild13,189,206,3 duplicate(Gate Manager#realm) Gate Manager#gef_f00 4_M_BOSSCAT
+gef_fild13,190,209,3 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Gef 4_BOARD3
-pay_gld,203,189,3 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Phecda 549
-pay_gld,206,189,3 duplicate(Gate Manager#realm) Gate Manager#pay_f00 421
-pay_gld,200,189,5 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Pay 857
+pay_gld,203,189,3 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Phecda 4_CAT_MERMASTER
+pay_gld,206,189,3 duplicate(Gate Manager#realm) Gate Manager#pay_f00 4_M_BOSSCAT
+pay_gld,200,189,5 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Pay 4_BOARD3
-prt_gld,158,96,5 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Dubae 549
-prt_gld,161,96,3 duplicate(Gate Manager#realm) Gate Manager#prt_f00 421
-prt_gld,163,99,3 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Prt 857
+prt_gld,158,96,5 duplicate(Cat Paw Merchant Guild) Cat Paw Merchant Dubae 4_CAT_MERMASTER
+prt_gld,161,96,3 duplicate(Gate Manager#realm) Gate Manager#prt_f00 4_M_BOSSCAT
+prt_gld,163,99,3 duplicate(Investment Status Board) Investment Status Board::InvestStatus_Prt 4_BOARD3
// Inside Castles - Gate Managers
//============================================================
-aldeg_cas01,85,105,4 duplicate(Gate Manager#castle) Gate Manager#alde_f01 421
-aldeg_cas02,124,49,3 duplicate(Gate Manager#castle) Gate Manager#alde_f02 421
-aldeg_cas03,121,75,3 duplicate(Gate Manager#castle) Gate Manager#alde_f03 421
-aldeg_cas04,25,67,7 duplicate(Gate Manager#castle) Gate Manager#alde_f04 421
-aldeg_cas05,54,200,3 duplicate(Gate Manager#castle) Gate Manager#alde_f05 421
+aldeg_cas01,85,105,4 duplicate(Gate Manager#castle) Gate Manager#alde_f01 4_M_BOSSCAT
+aldeg_cas02,124,49,3 duplicate(Gate Manager#castle) Gate Manager#alde_f02 4_M_BOSSCAT
+aldeg_cas03,121,75,3 duplicate(Gate Manager#castle) Gate Manager#alde_f03 4_M_BOSSCAT
+aldeg_cas04,25,67,7 duplicate(Gate Manager#castle) Gate Manager#alde_f04 4_M_BOSSCAT
+aldeg_cas05,54,200,3 duplicate(Gate Manager#castle) Gate Manager#alde_f05 4_M_BOSSCAT
-gefg_cas01,39,49,4 duplicate(Gate Manager#castle) Gate Manager#gef_f01 421
-gefg_cas02,10,65,4 duplicate(Gate Manager#castle) Gate Manager#gef_f02 421
-gefg_cas03,100,87,4 duplicate(Gate Manager#castle) Gate Manager#gef_f03 421
-gefg_cas04,35,44,3 duplicate(Gate Manager#castle) Gate Manager#gef_f04 421
-gefg_cas05,84,46,3 duplicate(Gate Manager#castle) Gate Manager#gef_f05 421
+gefg_cas01,39,49,4 duplicate(Gate Manager#castle) Gate Manager#gef_f01 4_M_BOSSCAT
+gefg_cas02,10,65,4 duplicate(Gate Manager#castle) Gate Manager#gef_f02 4_M_BOSSCAT
+gefg_cas03,100,87,4 duplicate(Gate Manager#castle) Gate Manager#gef_f03 4_M_BOSSCAT
+gefg_cas04,35,44,3 duplicate(Gate Manager#castle) Gate Manager#gef_f04 4_M_BOSSCAT
+gefg_cas05,84,46,3 duplicate(Gate Manager#castle) Gate Manager#gef_f05 4_M_BOSSCAT
-payg_cas01,129,59,3 duplicate(Gate Manager#castle) Gate Manager#pay_f01 421
-payg_cas02,27,277,3 duplicate(Gate Manager#castle) Gate Manager#pay_f02 421
-payg_cas03,51,266,3 duplicate(Gate Manager#castle) Gate Manager#pay_f03 421
-payg_cas04,39,264,4 duplicate(Gate Manager#castle) Gate Manager#pay_f04 421
-payg_cas05,272,252,4 duplicate(Gate Manager#castle) Gate Manager#pay_f05 421
+payg_cas01,129,59,3 duplicate(Gate Manager#castle) Gate Manager#pay_f01 4_M_BOSSCAT
+payg_cas02,27,277,3 duplicate(Gate Manager#castle) Gate Manager#pay_f02 4_M_BOSSCAT
+payg_cas03,51,266,3 duplicate(Gate Manager#castle) Gate Manager#pay_f03 4_M_BOSSCAT
+payg_cas04,39,264,4 duplicate(Gate Manager#castle) Gate Manager#pay_f04 4_M_BOSSCAT
+payg_cas05,272,252,4 duplicate(Gate Manager#castle) Gate Manager#pay_f05 4_M_BOSSCAT
-prtg_cas01,114,178,3 duplicate(Gate Manager#castle) Gate Manager#prt_f01 421
-prtg_cas02,89,63,5 duplicate(Gate Manager#castle) Gate Manager#prt_f02 421
-prtg_cas03,72,109,3 duplicate(Gate Manager#castle) Gate Manager#prt_f03 421
-prtg_cas04,29,263,4 duplicate(Gate Manager#castle) Gate Manager#prt_f04 421
-prtg_cas05,24,23,4 duplicate(Gate Manager#castle) Gate Manager#prt_f05 421
+prtg_cas01,114,178,3 duplicate(Gate Manager#castle) Gate Manager#prt_f01 4_M_BOSSCAT
+prtg_cas02,89,63,5 duplicate(Gate Manager#castle) Gate Manager#prt_f02 4_M_BOSSCAT
+prtg_cas03,72,109,3 duplicate(Gate Manager#castle) Gate Manager#prt_f03 4_M_BOSSCAT
+prtg_cas04,29,263,4 duplicate(Gate Manager#castle) Gate Manager#prt_f04 4_M_BOSSCAT
+prtg_cas05,24,23,4 duplicate(Gate Manager#castle) Gate Manager#prt_f05 4_M_BOSSCAT
// iRO NPC Locations
//============================================================
-//prt_gld,148,253,4 duplicate(Cat Paw Merchants Notice) Cat Paw Merchants Notice::CatPawNotice_iRO 857
-//prt_gld,145,255,6 duplicate(Namis#invest) Namis::Namis_iRO 545,4,4
-//prt_gld,165,50,4 duplicate(Thanks Ticket Machine) Thanks Ticket Machine::ThanksMachine_iRO 564
+//prt_gld,148,253,4 duplicate(Cat Paw Merchants Notice) Cat Paw Merchants Notice::CatPawNotice_iRO 4_BOARD3
+//prt_gld,145,255,6 duplicate(Namis#invest) Namis::Namis_iRO 4_CAT_SAILOR2,4,4
+//prt_gld,165,50,4 duplicate(Thanks Ticket Machine) Thanks Ticket Machine::ThanksMachine_iRO 2_VENDING_MACHINE1
diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt
index a742a405b..89ce64ac4 100644
--- a/npc/re/instances/BakonawaLake.txt
+++ b/npc/re/instances/BakonawaLake.txt
@@ -15,7 +15,7 @@
1@ma_b mapflag src4instance
//============================================================
-ma_scene01,174,179,4 script Taho 541,{
+ma_scene01,174,179,4 script Taho 4_M_DEWZATIMAN,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "You are carrying too many items. Come back after taking off some of them.";
@@ -104,7 +104,7 @@ ma_scene01,174,179,4 script Taho 541,{
}
}
-sec_in02,26,26,4 script Bakonawa's Rage 541,{
+sec_in02,26,26,4 script Bakonawa's Rage 4_M_DEWZATIMAN,{
callfunc "F_GM_NPC";
mes "[Taho]";
mes "My name is Minky.";
@@ -117,7 +117,7 @@ sec_in02,26,26,4 script Bakonawa's Rage 541,{
close;
}
-1@ma_b,62,52,4 script Taho#nf 541,{
+1@ma_b,62,52,4 script Taho#nf 4_M_DEWZATIMAN,{
mes "[Taho]";
mes "Heehee, I could join the Bakonawa hunt, but I'd rather hide behind that rock and cheer you guys on.";
next;
@@ -150,7 +150,7 @@ sec_in02,26,26,4 script Bakonawa's Rage 541,{
}
}
-1@ma_b,36,111,4 script #Bakonawan1 844,{
+1@ma_b,36,111,4 script #Bakonawan1 CLEAR_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Bakonawan1");
@@ -203,7 +203,7 @@ OnAnnounce:
end;
}
-1@ma_b,78,81,0 script #SummonPuppetsn1 139,4,5,{
+1@ma_b,78,81,0 script #SummonPuppetsn1 HIDDEN_WARP_NPC,4,5,{
end;
OnInstanceInit:
disablenpc instance_npcname("#SummonPuppetsn1");
@@ -238,7 +238,7 @@ OnMyMobDead:
end;
}
-1@ma_b,1,5,4 script #BakonawaDeadn1 844,{
+1@ma_b,1,5,4 script #BakonawaDeadn1 CLEAR_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#BakonawaDeadn1");
@@ -264,7 +264,7 @@ OnTimer15000:
end;
}
-1@ma_b,36,111,4 script #Bakonawan2 844,{
+1@ma_b,36,111,4 script #Bakonawan2 CLEAR_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Bakonawan2");
@@ -318,7 +318,7 @@ OnAnnounce:
end;
}
-1@ma_b,36,111,4 script #Bakonawan2-1 844,{
+1@ma_b,36,111,4 script #Bakonawan2-1 CLEAR_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Bakonawan2-1");
@@ -351,7 +351,7 @@ OnMyMobDead:
end;
}
-1@ma_b,36,111,4 script #Bakonawan3 844,{
+1@ma_b,36,111,4 script #Bakonawan3 CLEAR_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Bakonawan3");
@@ -410,7 +410,7 @@ OnAnnounce:
end;
}
-1@ma_b,36,111,4 script #Bakonawan3-1 844,{
+1@ma_b,36,111,4 script #Bakonawan3-1 CLEAR_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Bakonawan3-1");
@@ -459,7 +459,7 @@ OnMobSpawn:
end;
}
-1@ma_b,62,52,4 script Taho#Completed 541,{
+1@ma_b,62,52,4 script Taho#Completed 4_M_DEWZATIMAN,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "It seems you are carrying too many different kinds of items. Please try again after reducing it.";
@@ -504,7 +504,7 @@ OnTimer10000:
end;
}
-1@ma_b,62,52,4 script Taho#Fail 541,{
+1@ma_b,62,52,4 script Taho#Fail 4_M_DEWZATIMAN,{
mes "[Taho]";
mes "HMM. We almost got him but he is one fast creature...";
next;
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index 6f35d64e9..de076489e 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -18,7 +18,7 @@
// Instance Creation
//============================================================
-ma_dun01,147,10,5 script Nurse#ma_dun01 569,{
+ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{
if (BaseLevel < 100) end;
set .@party_id,getcharid(1);
@@ -337,7 +337,7 @@ L_Complete:
return;
}
-sec_in02,27,30,0 script Bangungot Gate 406,{
+sec_in02,27,30,0 script Bangungot Gate 2_MONEMUS,{
callfunc "F_GM_NPC";
mes "Password";
next;
@@ -362,7 +362,7 @@ sec_in02,27,30,0 script Bangungot Gate 406,{
// Instance Scripts
//============================================================
-1@ma_h,43,157,0 script #Memorial Start 139,2,2,{
+1@ma_h,43,157,0 script #Memorial Start HIDDEN_WARP_NPC,2,2,{
end;
OnTouch:
set .@map$, instance_mapname("1@ma_h");
@@ -386,7 +386,7 @@ OnTimer1000:
end;
}
-1@ma_h,43,157,0 script #Memorial Start_time 139,{ //2,2
+1@ma_h,43,157,0 script #Memorial Start_time HIDDEN_WARP_NPC,{ //2,2
end;
OnInstanceInit:
disablenpc instance_npcname("#Memorial Start_time");
@@ -407,7 +407,7 @@ OnTimer10000:
end;
}
-1@ma_h,46,165,0 script #Ward1 Entry 139,{ //3,3
+1@ma_h,46,165,0 script #Ward1 Entry HIDDEN_WARP_NPC,{ //3,3
end;
OnInstanceInit:
disablenpc instance_npcname(strnpcinfo(0));
@@ -474,12 +474,12 @@ OnTimer1000:
stopnpctimer;
end;
}
-1@ma_h,57,147,0 duplicate(#Ward1 Entry) #Ward2 Entry 139 //3,3
-1@ma_h,67,165,0 duplicate(#Ward1 Entry) #Ward3 Entry 139 //3,3
-1@ma_h,79,147,0 duplicate(#Ward1 Entry) #Ward4 Entry 139 //3,3
-1@ma_h,90,165,0 duplicate(#Ward1 Entry) #Ward5 Entry 139 //3,3
+1@ma_h,57,147,0 duplicate(#Ward1 Entry) #Ward2 Entry HIDDEN_WARP_NPC //3,3
+1@ma_h,67,165,0 duplicate(#Ward1 Entry) #Ward3 Entry HIDDEN_WARP_NPC //3,3
+1@ma_h,79,147,0 duplicate(#Ward1 Entry) #Ward4 Entry HIDDEN_WARP_NPC //3,3
+1@ma_h,90,165,0 duplicate(#Ward1 Entry) #Ward5 Entry HIDDEN_WARP_NPC //3,3
-1@ma_h,101,147,0 script #Ward6 Entry 139,{ //2,2
+1@ma_h,101,147,0 script #Ward6 Entry HIDDEN_WARP_NPC,{ //2,2
end;
OnInstanceInit:
disablenpc instance_npcname("#Ward6 Entry");
@@ -515,7 +515,7 @@ OnTimer3000:
end;
}
-1@ma_h,110,177,0 script #Summon Boss 139,{
+1@ma_h,110,177,0 script #Summon Boss HIDDEN_WARP_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Summon Boss");
@@ -539,7 +539,7 @@ OnTimer1000:
end;
}
-1@ma_h,147,143,0 script #Boss Room Entry 139,10,10,{
+1@ma_h,147,143,0 script #Boss Room Entry HIDDEN_WARP_NPC,10,10,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Boss Room Entry");
@@ -595,7 +595,7 @@ OnDisableEntry:
end;
}
-1@ma_h,147,143,0 script #Boss Room Entry_time 139,{ //10,10
+1@ma_h,147,143,0 script #Boss Room Entry_time HIDDEN_WARP_NPC,{ //10,10
end;
OnInstanceInit:
disablenpc instance_npcname("#Boss Room Entry_time");
@@ -671,7 +671,7 @@ OnStopTimer:
end;
}
-1@ma_h,111,177,0 script #Boss Room Entry_2 45,{
+1@ma_h,111,177,0 script #Boss Room Entry_2 WARPNPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Boss Room Entry_2");
@@ -708,7 +708,7 @@ OnTimer10500:
end;
}
-1@ma_h,118,63,0 script #Summon Ward Mob 139,4,4,{
+1@ma_h,118,63,0 script #Summon Ward Mob HIDDEN_WARP_NPC,4,4,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Summon Ward Mob");
@@ -799,7 +799,7 @@ OnTimer1000:
end;
}
-1@ma_h,118,64,0 script #Summon Ward Mob_time 139,{ //4,4
+1@ma_h,118,64,0 script #Summon Ward Mob_time HIDDEN_WARP_NPC,{ //4,4
end;
OnInstanceInit:
disablenpc instance_npcname("#Summon Ward Mob_time");
@@ -830,7 +830,7 @@ OnTimer10000:
end;
}
-1@ma_h,112,177,0 script #Summon Pillar 139,{
+1@ma_h,112,177,0 script #Summon Pillar HIDDEN_WARP_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Summon Pillar");
@@ -865,7 +865,7 @@ OnTimer1000:
end;
}
-1@ma_h,112,178,0 script #Summon Pillar_time 139,{
+1@ma_h,112,178,0 script #Summon Pillar_time HIDDEN_WARP_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Summon Pillar_time");
@@ -906,7 +906,7 @@ OnTimer36000:
end;
}
-1@ma_h,118,171,0 script #Boss Room Entry_a 139,10,10,{
+1@ma_h,118,171,0 script #Boss Room Entry_a HIDDEN_WARP_NPC,10,10,{
end;
OnInstanceInit:
disablenpc instance_npcname(strnpcinfo(0));
@@ -917,15 +917,15 @@ OnTouch:
donpcevent instance_npcname("#Boss Room Entry_time")+"::OnEnable";
end;
}
-1@ma_h,132,171,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_b 139,10,10
-1@ma_h,147,171,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_c 139,10,10
-1@ma_h,118,157,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_d 139,10,10
-1@ma_h,132,157,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_e 139,10,10
-1@ma_h,147,157,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_f 139,10,10
-1@ma_h,118,143,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_g 139,10,10
-1@ma_h,132,143,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_h 139,10,10
+1@ma_h,132,171,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_b HIDDEN_WARP_NPC,10,10
+1@ma_h,147,171,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_c HIDDEN_WARP_NPC,10,10
+1@ma_h,118,157,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_d HIDDEN_WARP_NPC,10,10
+1@ma_h,132,157,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_e HIDDEN_WARP_NPC,10,10
+1@ma_h,147,157,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_f HIDDEN_WARP_NPC,10,10
+1@ma_h,118,143,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_g HIDDEN_WARP_NPC,10,10
+1@ma_h,132,143,0 duplicate(#Boss Room Entry_a) #Boss Room Entry_h HIDDEN_WARP_NPC,10,10
-1@ma_h,131,62,0 script #Boss Effect 139,{ //4,4
+1@ma_h,131,62,0 script #Boss Effect HIDDEN_WARP_NPC,{ //4,4
end;
OnInstanceInit:
disablenpc instance_npcname("#Boss Effect");
@@ -938,7 +938,7 @@ OnTimer3000:
end;
}
-1@ma_h,43,86,4 script Moaning Patient#1 584,{
+1@ma_h,43,86,4 script Moaning Patient#1 4_F_PATIENT,{
end;
OnInstanceInit:
monster instance_mapname("1@ma_h"),131,62,"Bangungot",2318,1;
@@ -965,7 +965,7 @@ OnTimer30000:
end;
}
-1@ma_h,60,87,4 script Screaming Patient#2 585,{
+1@ma_h,60,87,4 script Screaming Patient#2 4_M_PATIENT,{
end;
OnEnable:
switch(atoi(strnpcinfo(2))) {
@@ -1001,29 +1001,29 @@ OnTimer30000:
stopnpctimer;
end;
}
-1@ma_h,60,39,7 duplicate(Screaming Patient#2) Patient in Pain#3 584
-1@ma_h,43,39,7 duplicate(Screaming Patient#2) Passed Out Patient#4 585
-1@ma_h,77,86,4 duplicate(Screaming Patient#2) Patient with Nightmare#5 584
-1@ma_h,69,87,4 duplicate(Screaming Patient#2) Sick Looking Patient#6 585
-1@ma_h,73,39,7 duplicate(Screaming Patient#2) Horrified Patient#7 584
-1@ma_h,65,51,7 duplicate(Screaming Patient#2) Patient in Sorrow#8 585
-1@ma_h,87,86,4 duplicate(Screaming Patient#2) Suffering Patient#9 584
-1@ma_h,104,86,4 duplicate(Screaming Patient#2) Wriggling Patient#10 585
-1@ma_h,99,39,7 duplicate(Screaming Patient#2) Patient in Cold Sweat#11 584
-1@ma_h,87,39,7 duplicate(Screaming Patient#2) Howling Patient#12 585
+1@ma_h,60,39,7 duplicate(Screaming Patient#2) Patient in Pain#3 4_F_PATIENT
+1@ma_h,43,39,7 duplicate(Screaming Patient#2) Passed Out Patient#4 4_M_PATIENT
+1@ma_h,77,86,4 duplicate(Screaming Patient#2) Patient with Nightmare#5 4_F_PATIENT
+1@ma_h,69,87,4 duplicate(Screaming Patient#2) Sick Looking Patient#6 4_M_PATIENT
+1@ma_h,73,39,7 duplicate(Screaming Patient#2) Horrified Patient#7 4_F_PATIENT
+1@ma_h,65,51,7 duplicate(Screaming Patient#2) Patient in Sorrow#8 4_M_PATIENT
+1@ma_h,87,86,4 duplicate(Screaming Patient#2) Suffering Patient#9 4_F_PATIENT
+1@ma_h,104,86,4 duplicate(Screaming Patient#2) Wriggling Patient#10 4_M_PATIENT
+1@ma_h,99,39,7 duplicate(Screaming Patient#2) Patient in Cold Sweat#11 4_F_PATIENT
+1@ma_h,87,39,7 duplicate(Screaming Patient#2) Howling Patient#12 4_M_PATIENT
-1@ma_h,43,181,4 script Moaning Patient#b 584,{ end; }
-1@ma_h,60,182,4 script Screaming Patient#b 585,{ end; }
-1@ma_h,60,132,7 script Patient in Pain#b 584,{ end; }
-1@ma_h,43,132,7 script Passed Out Patient#b 585,{ end; }
-1@ma_h,77,182,4 script Patient with Nightmare#b 584,{ end; }
-1@ma_h,69,182,4 script Sick Looking Patient#b 585,{ end; }
-1@ma_h,73,132,7 script Horrified Patient#b 584,{ end; }
-1@ma_h,65,144,7 script Patient in Sorrow#b 585,{ end; }
-1@ma_h,87,181,4 script Suffering Patient#b 584,{ end; }
-1@ma_h,104,181,4 script Wriggling Patient#b 585,{ end; }
-1@ma_h,99,132,7 script Patient in Cold Sweat#b 584,{ end; }
-1@ma_h,87,132,7 script Howling Patient#b 585,{ end; }
+1@ma_h,43,181,4 script Moaning Patient#b 4_F_PATIENT,{ end; }
+1@ma_h,60,182,4 script Screaming Patient#b 4_M_PATIENT,{ end; }
+1@ma_h,60,132,7 script Patient in Pain#b 4_F_PATIENT,{ end; }
+1@ma_h,43,132,7 script Passed Out Patient#b 4_M_PATIENT,{ end; }
+1@ma_h,77,182,4 script Patient with Nightmare#b 4_F_PATIENT,{ end; }
+1@ma_h,69,182,4 script Sick Looking Patient#b 4_M_PATIENT,{ end; }
+1@ma_h,73,132,7 script Horrified Patient#b 4_F_PATIENT,{ end; }
+1@ma_h,65,144,7 script Patient in Sorrow#b 4_M_PATIENT,{ end; }
+1@ma_h,87,181,4 script Suffering Patient#b 4_F_PATIENT,{ end; }
+1@ma_h,104,181,4 script Wriggling Patient#b 4_M_PATIENT,{ end; }
+1@ma_h,99,132,7 script Patient in Cold Sweat#b 4_F_PATIENT,{ end; }
+1@ma_h,87,132,7 script Howling Patient#b 4_M_PATIENT,{ end; }
// Warp Portals
//============================================================
@@ -1083,7 +1083,7 @@ OnTimer30000:
// Disable select warps.
// Custom, but saves processing and lines.
-1@ma_h,1,1,0 script #ma_hos_warp_init 844,{
+1@ma_h,1,1,0 script #ma_hos_warp_init CLEAR_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Boss Room Exit");
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
index 82875c05e..f20a7e3b5 100644
--- a/npc/re/instances/BuwayaCave.txt
+++ b/npc/re/instances/BuwayaCave.txt
@@ -14,7 +14,7 @@
1@ma_c mapflag src4instance
//============================================================
-ma_fild02,312,317,5 script Guard#buwaya_cave 570,{
+ma_fild02,312,317,5 script Guard#buwaya_cave 4_MAL_SOLDIER,{
if (BaseLevel < 130) {
mes "[Guard]";
mes "People under ^ff0000level 130^000000";
@@ -108,7 +108,7 @@ ma_fild02,312,317,5 script Guard#buwaya_cave 570,{
}
}
-ma_fild02,315,323,0 script Cave Entrance#buwaya 45,2,2,{
+ma_fild02,315,323,0 script Cave Entrance#buwaya WARPNPC,2,2,{
end;
OnTouch:
if (BaseLevel < 130) {
@@ -151,7 +151,7 @@ OnTouch:
}
}
-1@ma_c,33,112,0 script #damage 139,7,7,{
+1@ma_c,33,112,0 script #damage HIDDEN_WARP_NPC,7,7,{
end;
OnInstanceInit:
initnpctimer;
@@ -173,7 +173,7 @@ OnTouch:
end;
}
-1@ma_c,29,110,5 script Kidnapped People#1 575,{
+1@ma_c,29,110,5 script Kidnapped People#1 4_F_BARYO_OLD,{
mes "[Kidnapped Residents]";
mes "Buwaya was running around,";
mes "and new people got caught.";
@@ -205,7 +205,7 @@ OnEnable:
end;
}
-1@ma_c,36,110,5 script Kidnapped People#2 574,{
+1@ma_c,36,110,5 script Kidnapped People#2 4_M_BARYO_OLD,{
mes "[Kidnapped Residents]";
mes "Ahaa! I wish I had a little more power...";
mes "I know its weakness...";
@@ -239,7 +239,7 @@ OnEnable:
end;
}
-1@ma_c,3,3,0 script #box_mob_call 139,1,1,{
+1@ma_c,3,3,0 script #box_mob_call HIDDEN_WARP_NPC,1,1,{
end;
OnInstanceInit:
setcell instance_mapname("1@ma_c"),30,118,35,118,cell_shootable,1; //custom
@@ -262,7 +262,7 @@ OnMyMobDead:
end;
}
-1@ma_c,38,118,0 script #box_out 45,2,2,{
+1@ma_c,38,118,0 script #box_out WARPNPC,2,2,{
OnInstanceInit:
OnDisable:
disablenpc instance_npcname("#box_out");
@@ -277,7 +277,7 @@ OnTouch:
end;
}
-1@ma_c,97,74,0 script #box_call 139,50,50,{
+1@ma_c,97,74,0 script #box_call HIDDEN_WARP_NPC,50,50,{
end;
OnInstanceInit:
disablenpc instance_npcname("#box_call");
@@ -313,7 +313,7 @@ OnDisable:
end;
}
-1@ma_c,97,74,0 script #yunobi1 139,{
+1@ma_c,97,74,0 script #yunobi1 HIDDEN_WARP_NPC,{
end;
OnInstanceInit:
hideonnpc instance_npcname(strnpcinfo(0));
@@ -322,16 +322,16 @@ OnEnable:
specialeffect EF_MAPPILLAR2;
end;
}
-1@ma_c,97,94,0 duplicate(#yunobi1) #yunobi2 139
-1@ma_c,117,94,0 duplicate(#yunobi1) #yunobi3 139
-1@ma_c,117,74,0 duplicate(#yunobi1) #yunobi4 139
-1@ma_c,117,54,0 duplicate(#yunobi1) #yunobi5 139
-1@ma_c,97,54,0 duplicate(#yunobi1) #yunobi6 139
-1@ma_c,77,54,0 duplicate(#yunobi1) #yunobi7 139
-1@ma_c,77,74,0 duplicate(#yunobi1) #yunobi8 139
-1@ma_c,77,94,0 duplicate(#yunobi1) #yunobi9 139
+1@ma_c,97,94,0 duplicate(#yunobi1) #yunobi2 HIDDEN_WARP_NPC
+1@ma_c,117,94,0 duplicate(#yunobi1) #yunobi3 HIDDEN_WARP_NPC
+1@ma_c,117,74,0 duplicate(#yunobi1) #yunobi4 HIDDEN_WARP_NPC
+1@ma_c,117,54,0 duplicate(#yunobi1) #yunobi5 HIDDEN_WARP_NPC
+1@ma_c,97,54,0 duplicate(#yunobi1) #yunobi6 HIDDEN_WARP_NPC
+1@ma_c,77,54,0 duplicate(#yunobi1) #yunobi7 HIDDEN_WARP_NPC
+1@ma_c,77,74,0 duplicate(#yunobi1) #yunobi8 HIDDEN_WARP_NPC
+1@ma_c,77,94,0 duplicate(#yunobi1) #yunobi9 HIDDEN_WARP_NPC
-1@ma_c,1,1,0 script #bunshin 139,{
+1@ma_c,1,1,0 script #bunshin HIDDEN_WARP_NPC,{
end;
OnInstanceInit:
initnpctimer;
@@ -380,7 +380,7 @@ OnDisable:
end;
}
-1@ma_c,2,2,0 script #buwaya_con 139,{
+1@ma_c,2,2,0 script #buwaya_con HIDDEN_WARP_NPC,{
end;
OnInstanceInit:
areamonster instance_mapname("1@ma_c"),90,67,104,81,"Buwaya",2319,1,instance_npcname("#buwaya_con")+"::OnMyMobDead";
@@ -397,7 +397,7 @@ OnMyMobDead:
end;
}
-1@ma_c,3,3,0 script #exit_mob 139,{
+1@ma_c,3,3,0 script #exit_mob HIDDEN_WARP_NPC,{
end;
OnInstanceInit:
initnpctimer;
@@ -423,7 +423,7 @@ OnMyMobDead:
end;
}
-1@ma_c,28,57,0 script #cave_out 45,2,2,{
+1@ma_c,28,57,0 script #cave_out WARPNPC,2,2,{
OnInstanceInit:
disablenpc instance_npcname("#cave_out");
end;
diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt
index 75c6ececd..c76fe2c46 100644
--- a/npc/re/instances/HazyForest.txt
+++ b/npc/re/instances/HazyForest.txt
@@ -18,7 +18,7 @@
// Instance Creation
//============================================================
-bif_fild01,158,340,5 script Laphine Soldier#mist 447,{
+bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{
set .@party_id,getcharid(1);
set .@md_name$,"Mistwood Maze";
@@ -140,7 +140,7 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 447,{
}
}
-bif_fild01,161,355,0 script Log Tunnel 844,{
+bif_fild01,161,355,0 script Log Tunnel CLEAR_NPC,{
mes "I see the forest through the log tunnel.";
mes "It looks like I can enter the forest through the log tunnel.";
next;
@@ -167,7 +167,7 @@ bif_fild01,161,355,0 script Log Tunnel 844,{
// Instance Scripts
//============================================================
-1@mist,89,29,0 script #Whisper_mist 844,1,1,{
+1@mist,89,29,0 script #Whisper_mist CLEAR_NPC,1,1,{
end;
OnInstanceInit:
enablenpc instance_npcname("#Whisper_mist");
@@ -211,8 +211,8 @@ function script F_Mora_Mist {
end;
}
-1@mist,251,121,3 script Tom's Garden 858,{ end; }
-1@mist,247,123,0 script Tom's Garden Tree 527,{
+1@mist,251,121,3 script Tom's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,247,123,0 script Tom's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"a25_a18-1",
"Roaring Cry: Tom's bolt is broken! Watch out, Tomba! Watch out, Tomba!",
@@ -225,8 +225,8 @@ OnMyMobDead:
end;
}
-1@mist,226,95,3 script Tomba's Garden 858,{ end; }
-1@mist,225,98,0 script Tomba's Garden Tree 527,{
+1@mist,226,95,3 script Tomba's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,225,98,0 script Tomba's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"a27-2_af1-2",
"Roaring Cry: Tomba's Garden Tree is gone with Tomba. Remi, what are you going to do now?",
@@ -239,8 +239,8 @@ OnMyMobDead:
end;
}
-1@mist,157,183,3 script Remi's Garden 858,{ end; }
-1@mist,159,184,0 script Remi's Garden Tree 527,{
+1@mist,157,183,3 script Remi's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,159,184,0 script Remi's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"a15-2_a4-1",
"Roaring Cry: Remi, Remi's Garden Tree was chopped down- Rem, it's your turn next. Poor Rem!",
@@ -253,8 +253,8 @@ OnMyMobDead:
end;
}
-1@mist,58,39,3 script Tired Rem's Garden 858,{ end; }
-1@mist,61,39,0 script Tired Rem's Garden Tree 527,{
+1@mist,58,39,3 script Tired Rem's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,61,39,0 script Tired Rem's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"a4-2_a11",
"Rem's Desperate Cry: Argh... Rem will sleep. Rem will sleep now, and won't wake up forever!",
@@ -277,8 +277,8 @@ OnMyMobDead:
end;
}
-1@mist,227,179,3 script Ron's Garden 858,{ end; }
-1@mist,230,179,0 script Ron's Garden Tree 527,{
+1@mist,227,179,3 script Ron's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,230,179,0 script Ron's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"b4-2_b2",
"Ron the Gardener's Cry: I'm getting off work! Don't look for Ron, the second gardener, any more!!",
@@ -291,8 +291,8 @@ OnMyMobDead:
end;
}
-1@mist,288,226,3 script Rover's Garden 858,{ end; }
-1@mist,285,225,0 script Rover's Garden Tree 527,{
+1@mist,288,226,3 script Rover's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,285,225,0 script Rover's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"b7_bf1-2",
"Roaring Whisper: Ron's, and Rover's trees were chopped down as well. Who is forcing his way into the forest? Who is it?",
@@ -305,8 +305,8 @@ OnMyMobDead:
end;
}
-1@mist,159,318,3 script Mona's Garden 858,{ end; }
-1@mist,161,316,0 script Mona's Garden Tree 527,{
+1@mist,159,318,3 script Mona's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,161,316,0 script Mona's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"b31_b16",
"Clamoring Whisper: Mona the Seedseeker's garden tree is gone! Mona is gone too! Namon will be okay, because he is brave, right? Namon, are you okay?",
@@ -319,8 +319,8 @@ OnMyMobDead:
end;
}
-1@mist,205,300,3 script Namon's Garden 858,{ end; }
-1@mist,204,299,0 script Namon's Garden Tree 527,{
+1@mist,205,300,3 script Namon's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,204,299,0 script Namon's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"b27-3_bN-1",
"Clamoring Whisper: Brave Namon met his fate not so bravely... *giggle*",
@@ -333,8 +333,8 @@ OnMyMobDead:
end;
}
-1@mist,219,232,3 script Sad Neoron's Garden 858,{ end; }
-1@mist,221,236,0 script Sad Neoron's Garden Tree 527,{
+1@mist,219,232,3 script Sad Neoron's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,221,236,0 script Sad Neoron's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"b6-1_b33",
"Lamenting Whisper: Sad Neoron has become cheerful! Spyder the Superior Spider, what are you going to do? What are you going to do now?",
@@ -347,8 +347,8 @@ OnMyMobDead:
end;
}
-1@mist,206,202,3 script Spyder's Garden 858,{ end; }
-1@mist,206,200,0 script Spyder's Garden Tree 527,{
+1@mist,206,202,3 script Spyder's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,206,200,0 script Spyder's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"b5_b14",
"Depressed Whisper: Now it's all over with the second deepest forest. Gardeners are dying out-",
@@ -374,8 +374,8 @@ OnMyMobDead:
end;
}
-1@mist,96,288,3 script Tito's Garden 858,{ end; }
-1@mist,95,287,0 script Tito's Garden Tree 527,{
+1@mist,96,288,3 script Tito's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,95,287,0 script Tito's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"c1_c13-1",
"Tito's Cry: *sob* *sob* Tito's gone now! Tito's done for! Boo hoo!!",
@@ -388,8 +388,8 @@ OnMyMobDead:
end;
}
-1@mist,326,325,3 script Pumba's Garden 858,{ end; }
-1@mist,324,325,0 script Pumba's Garden Tree 527,{
+1@mist,326,325,3 script Pumba's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,324,325,0 script Pumba's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"c13-3_c4",
"Roaring Whisper: Tito the Hard Worker was defeated! Stop playing and go to work, Tete! Start working!",
@@ -402,8 +402,8 @@ OnMyMobDead:
end;
}
-1@mist,278,345,3 script Tete's Garden 858,{ end; }
-1@mist,280,344,0 script Tete's Garden Tree 527,{
+1@mist,278,345,3 script Tete's Garden 4_BULLETIN_BOARD2,{ end; }
+1@mist,280,344,0 script Tete's Garden Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"c19_c4",
"Whisper: They are strong, strong indeed. What are we going to do now? Are there any gardeners left? Are there any?",
@@ -416,7 +416,7 @@ OnMyMobDead:
end;
}
-1@mist,345,186,0 script The Gardeners' Tree 527,{
+1@mist,345,186,0 script The Gardeners' Tree 4_CREEPER,{
callfunc "F_Mora_Mist",
"#to_bif02",
"Roaring Whisper: The forest will remember you! It will remember you, the one who broke the clippers of all the gardeners!",
@@ -442,64 +442,64 @@ OnMyMobDead:
end;
}
-1@mist,73,290,0 script Mysterious Flower#1 844,{
+1@mist,73,290,0 script Mysterious Flower#1 CLEAR_NPC,{
specialeffect EF_LEVEL99_4;
disablenpc instance_npcname(strnpcinfo(0));
getitem 12561,1; //Mysterious_Seed
end;
}
-1@mist,69,295,0 duplicate(Mysterious Flower#1) Mysterious Flower#2 844
-1@mist,62,291,0 duplicate(Mysterious Flower#1) Mysterious Flower#3 844
-1@mist,54,293,0 duplicate(Mysterious Flower#1) Mysterious Flower#4 844
-1@mist,48,286,0 duplicate(Mysterious Flower#1) Mysterious Flower#5 844
-1@mist,54,277,0 duplicate(Mysterious Flower#1) Mysterious Flower#6 844
-1@mist,52,270,0 duplicate(Mysterious Flower#1) Mysterious Flower#7 844
-1@mist,62,268,0 duplicate(Mysterious Flower#1) Mysterious Flower#8 844
-1@mist,72,271,0 duplicate(Mysterious Flower#1) Mysterious Flower#9 844
-1@mist,72,276,0 duplicate(Mysterious Flower#1) Mysterious Flower#10 844
-1@mist,118,194,0 duplicate(Mysterious Flower#1) Mysterious Flower#11 844
-1@mist,122,204,0 duplicate(Mysterious Flower#1) Mysterious Flower#12 844
-1@mist,137,209,0 duplicate(Mysterious Flower#1) Mysterious Flower#13 844
-1@mist,144,203,0 duplicate(Mysterious Flower#1) Mysterious Flower#14 844
-1@mist,146,186,0 duplicate(Mysterious Flower#1) Mysterious Flower#15 844
-1@mist,142,182,0 duplicate(Mysterious Flower#1) Mysterious Flower#16 844
-1@mist,132,179,0 duplicate(Mysterious Flower#1) Mysterious Flower#17 844
-1@mist,123,184,0 duplicate(Mysterious Flower#1) Mysterious Flower#18 844
-1@mist,194,118,0 duplicate(Mysterious Flower#1) Mysterious Flower#19 844
-1@mist,188,109,0 duplicate(Mysterious Flower#1) Mysterious Flower#20 844
-1@mist,193,94,0 duplicate(Mysterious Flower#1) Mysterious Flower#21 844
-1@mist,205,92,0 duplicate(Mysterious Flower#1) Mysterious Flower#22 844
-1@mist,213,96,0 duplicate(Mysterious Flower#1) Mysterious Flower#23 844
-1@mist,216,103,0 duplicate(Mysterious Flower#1) Mysterious Flower#24 844
-1@mist,212,116,0 duplicate(Mysterious Flower#1) Mysterious Flower#25 844
-1@mist,207,120,0 duplicate(Mysterious Flower#1) Mysterious Flower#26 844
-1@mist,169,310,0 duplicate(Mysterious Flower#1) Mysterious Flower#27 844
-1@mist,172,296,0 duplicate(Mysterious Flower#1) Mysterious Flower#28 844
-1@mist,191,301,0 duplicate(Mysterious Flower#1) Mysterious Flower#30 844
-1@mist,195,301,0 duplicate(Mysterious Flower#1) Mysterious Flower#31 844
-1@mist,192,316,0 duplicate(Mysterious Flower#1) Mysterious Flower#32 844
-1@mist,187,320,0 duplicate(Mysterious Flower#1) Mysterious Flower#33 844
-1@mist,174,318,0 duplicate(Mysterious Flower#1) Mysterious Flower#34 844
-1@mist,308,136,0 duplicate(Mysterious Flower#1) Mysterious Flower#35 844
-1@mist,314,122,0 duplicate(Mysterious Flower#1) Mysterious Flower#36 844
-1@mist,321,118,0 duplicate(Mysterious Flower#1) Mysterious Flower#37 844
-1@mist,331,123,0 duplicate(Mysterious Flower#1) Mysterious Flower#38 844
-1@mist,335,126,0 duplicate(Mysterious Flower#1) Mysterious Flower#39 844
-1@mist,332,141,0 duplicate(Mysterious Flower#1) Mysterious Flower#40 844
-1@mist,328,144,0 duplicate(Mysterious Flower#1) Mysterious Flower#41 844
-1@mist,314,144,0 duplicate(Mysterious Flower#1) Mysterious Flower#42 844
-1@mist,238,224,0 duplicate(Mysterious Flower#1) Mysterious Flower#43 844
-1@mist,244,231,0 duplicate(Mysterious Flower#1) Mysterious Flower#44 844
-1@mist,257,232,0 duplicate(Mysterious Flower#1) Mysterious Flower#45 844
-1@mist,262,229,0 duplicate(Mysterious Flower#1) Mysterious Flower#46 844
-1@mist,265,216,0 duplicate(Mysterious Flower#1) Mysterious Flower#47 844
-1@mist,260,214,0 duplicate(Mysterious Flower#1) Mysterious Flower#48 844
-1@mist,252,206,0 duplicate(Mysterious Flower#1) Mysterious Flower#49 844
-1@mist,244,211,0 duplicate(Mysterious Flower#1) Mysterious Flower#50 844
+1@mist,69,295,0 duplicate(Mysterious Flower#1) Mysterious Flower#2 CLEAR_NPC
+1@mist,62,291,0 duplicate(Mysterious Flower#1) Mysterious Flower#3 CLEAR_NPC
+1@mist,54,293,0 duplicate(Mysterious Flower#1) Mysterious Flower#4 CLEAR_NPC
+1@mist,48,286,0 duplicate(Mysterious Flower#1) Mysterious Flower#5 CLEAR_NPC
+1@mist,54,277,0 duplicate(Mysterious Flower#1) Mysterious Flower#6 CLEAR_NPC
+1@mist,52,270,0 duplicate(Mysterious Flower#1) Mysterious Flower#7 CLEAR_NPC
+1@mist,62,268,0 duplicate(Mysterious Flower#1) Mysterious Flower#8 CLEAR_NPC
+1@mist,72,271,0 duplicate(Mysterious Flower#1) Mysterious Flower#9 CLEAR_NPC
+1@mist,72,276,0 duplicate(Mysterious Flower#1) Mysterious Flower#10 CLEAR_NPC
+1@mist,118,194,0 duplicate(Mysterious Flower#1) Mysterious Flower#11 CLEAR_NPC
+1@mist,122,204,0 duplicate(Mysterious Flower#1) Mysterious Flower#12 CLEAR_NPC
+1@mist,137,209,0 duplicate(Mysterious Flower#1) Mysterious Flower#13 CLEAR_NPC
+1@mist,144,203,0 duplicate(Mysterious Flower#1) Mysterious Flower#14 CLEAR_NPC
+1@mist,146,186,0 duplicate(Mysterious Flower#1) Mysterious Flower#15 CLEAR_NPC
+1@mist,142,182,0 duplicate(Mysterious Flower#1) Mysterious Flower#16 CLEAR_NPC
+1@mist,132,179,0 duplicate(Mysterious Flower#1) Mysterious Flower#17 CLEAR_NPC
+1@mist,123,184,0 duplicate(Mysterious Flower#1) Mysterious Flower#18 CLEAR_NPC
+1@mist,194,118,0 duplicate(Mysterious Flower#1) Mysterious Flower#19 CLEAR_NPC
+1@mist,188,109,0 duplicate(Mysterious Flower#1) Mysterious Flower#20 CLEAR_NPC
+1@mist,193,94,0 duplicate(Mysterious Flower#1) Mysterious Flower#21 CLEAR_NPC
+1@mist,205,92,0 duplicate(Mysterious Flower#1) Mysterious Flower#22 CLEAR_NPC
+1@mist,213,96,0 duplicate(Mysterious Flower#1) Mysterious Flower#23 CLEAR_NPC
+1@mist,216,103,0 duplicate(Mysterious Flower#1) Mysterious Flower#24 CLEAR_NPC
+1@mist,212,116,0 duplicate(Mysterious Flower#1) Mysterious Flower#25 CLEAR_NPC
+1@mist,207,120,0 duplicate(Mysterious Flower#1) Mysterious Flower#26 CLEAR_NPC
+1@mist,169,310,0 duplicate(Mysterious Flower#1) Mysterious Flower#27 CLEAR_NPC
+1@mist,172,296,0 duplicate(Mysterious Flower#1) Mysterious Flower#28 CLEAR_NPC
+1@mist,191,301,0 duplicate(Mysterious Flower#1) Mysterious Flower#30 CLEAR_NPC
+1@mist,195,301,0 duplicate(Mysterious Flower#1) Mysterious Flower#31 CLEAR_NPC
+1@mist,192,316,0 duplicate(Mysterious Flower#1) Mysterious Flower#32 CLEAR_NPC
+1@mist,187,320,0 duplicate(Mysterious Flower#1) Mysterious Flower#33 CLEAR_NPC
+1@mist,174,318,0 duplicate(Mysterious Flower#1) Mysterious Flower#34 CLEAR_NPC
+1@mist,308,136,0 duplicate(Mysterious Flower#1) Mysterious Flower#35 CLEAR_NPC
+1@mist,314,122,0 duplicate(Mysterious Flower#1) Mysterious Flower#36 CLEAR_NPC
+1@mist,321,118,0 duplicate(Mysterious Flower#1) Mysterious Flower#37 CLEAR_NPC
+1@mist,331,123,0 duplicate(Mysterious Flower#1) Mysterious Flower#38 CLEAR_NPC
+1@mist,335,126,0 duplicate(Mysterious Flower#1) Mysterious Flower#39 CLEAR_NPC
+1@mist,332,141,0 duplicate(Mysterious Flower#1) Mysterious Flower#40 CLEAR_NPC
+1@mist,328,144,0 duplicate(Mysterious Flower#1) Mysterious Flower#41 CLEAR_NPC
+1@mist,314,144,0 duplicate(Mysterious Flower#1) Mysterious Flower#42 CLEAR_NPC
+1@mist,238,224,0 duplicate(Mysterious Flower#1) Mysterious Flower#43 CLEAR_NPC
+1@mist,244,231,0 duplicate(Mysterious Flower#1) Mysterious Flower#44 CLEAR_NPC
+1@mist,257,232,0 duplicate(Mysterious Flower#1) Mysterious Flower#45 CLEAR_NPC
+1@mist,262,229,0 duplicate(Mysterious Flower#1) Mysterious Flower#46 CLEAR_NPC
+1@mist,265,216,0 duplicate(Mysterious Flower#1) Mysterious Flower#47 CLEAR_NPC
+1@mist,260,214,0 duplicate(Mysterious Flower#1) Mysterious Flower#48 CLEAR_NPC
+1@mist,252,206,0 duplicate(Mysterious Flower#1) Mysterious Flower#49 CLEAR_NPC
+1@mist,244,211,0 duplicate(Mysterious Flower#1) Mysterious Flower#50 CLEAR_NPC
// Wandering Guardian Quest
//============================================================
-1@mist,2,2,0 script #Dragon Herder 844,{
+1@mist,2,2,0 script #Dragon Herder CLEAR_NPC,{
end;
OnInstanceInit:
switch(rand(1,6)) {
@@ -529,7 +529,7 @@ OnTimer3000:
end;
}
-1@mist,97,30,3 script Mysterious Young Man#mis 512,{
+1@mist,97,30,3 script Mysterious Young Man#mis 4_M_ROKI2,{
if (BaseLevel < 98) {
mes "[Mysterious Young Man]";
mes "Huh? Do you plan to pass through here?";
@@ -677,7 +677,7 @@ OnDisable:
end;
}
-1@mist,183,304,3 script Loki#mist 512,{
+1@mist,183,304,3 script Loki#mist 4_M_ROKI2,{
if (ep14_1_mistwoods < 2) {
mes "[Loki]";
mes "An adventurer in the forest.";
@@ -731,7 +731,7 @@ OnEnable:
end;
}
-1@mist,181,303,3 script Collapsed Girl#mist 511,{
+1@mist,181,303,3 script Collapsed Girl#mist 4_F_NYDHOG2,{
mes "You see a girl with mysterious hair collapsed on the ground.";
mes "As you approach her, you smell the scent of flowers so strong that it makes you dizzy.";
close;
@@ -744,7 +744,7 @@ OnEnable:
end;
}
-mora,46,152,5 script Flower Smelling Lady 510,{
+mora,46,152,5 script Flower Smelling Lady 4_F_NYDHOG,{
if (ep14_1_mistwoods < 3) {
mes "[Flower Smell Lady]";
mes "I need rest.";
@@ -799,7 +799,7 @@ mora,46,152,5 script Flower Smelling Lady 510,{
}
}
-mora,48,152,3 script Sharp Eyed Man 512,{
+mora,48,152,3 script Sharp Eyed Man 4_M_ROKI2,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "- You have too many items to do this quest. -";
close;
@@ -921,7 +921,7 @@ mora,48,152,3 script Sharp Eyed Man 512,{
// Monster Spawns
//============================================================
-1@mist,1,1,0 script #Mist Mobs Respawn1 844,{
+1@mist,1,1,0 script #Mist Mobs Respawn1 CLEAR_NPC,{
end;
OnInstanceInit:
monster instance_mapname("1@mist"),0,0,"Miming",2137,15,instance_npcname("#Mist Mobs Respawn1")+"::OnMyMobDead";
@@ -934,7 +934,7 @@ OnMyMobDead:
end;
}
-1@mist,1,2,0 script #Mist Mobs Respawn2 844,{
+1@mist,1,2,0 script #Mist Mobs Respawn2 CLEAR_NPC,{
end;
OnInstanceInit:
monster instance_mapname("1@mist"),0,0,"Pom Spider",2132,35,instance_npcname("#Mist Mobs Respawn2")+"::OnMyMobDead";
@@ -947,7 +947,7 @@ OnMyMobDead:
end;
}
-1@mist,1,3,0 script #Mist Mobs Respawn3 844,{
+1@mist,1,3,0 script #Mist Mobs Respawn3 CLEAR_NPC,{
end;
OnInstanceInit:
monster instance_mapname("1@mist"),0,0,"Angra Mantis",2133,35,instance_npcname("#Mist Mobs Respawn3")+"::OnMyMobDead";
@@ -960,7 +960,7 @@ OnMyMobDead:
end;
}
-1@mist,1,4,0 script #Mist Mobs Respawn4 844,{
+1@mist,1,4,0 script #Mist Mobs Respawn4 CLEAR_NPC,{
end;
OnInstanceInit:
monster instance_mapname("1@mist"),0,0,"Parus",2134,35,instance_npcname("#Mist Mobs Respawn4")+"::OnMyMobDead";
@@ -973,7 +973,7 @@ OnMyMobDead:
end;
}
-1@mist,1,5,0 script #Mist Mobs Respawn5 844,{
+1@mist,1,5,0 script #Mist Mobs Respawn5 CLEAR_NPC,{
end;
OnInstanceInit:
monster instance_mapname("1@mist"),0,0,"Little Fatum",2136,15,instance_npcname("#Mist Mobs Respawn5")+"::OnMyMobDead";
@@ -986,7 +986,7 @@ OnMyMobDead:
end;
}
-1@mist,1,6,0 script #Fragments of Memory 844,{
+1@mist,1,6,0 script #Fragments of Memory CLEAR_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("#Fragments of Memory");
@@ -996,7 +996,7 @@ OnInstanceInit:
// Warp Portals
//============================================================
-bif_fild01,38,374,0 script Mysterious Flower#ep14_1 844,{
+bif_fild01,38,374,0 script Mysterious Flower#ep14_1 CLEAR_NPC,{
mes "It's a giant flower with mysterious energy.";
if (countitem(12561)) {
mes "It's reacting to the Mysterious Flower Seeds you have with you.";
@@ -1021,7 +1021,7 @@ bif_fild01,38,374,0 script Mysterious Flower#ep14_1 844,{
1@mist,104,23,0 warp #to_bif01 1,1,bif_fild01,160,352
-1@mist,109,70,0 script a1_a2 45,1,1,{
+1@mist,109,70,0 script a1_a2 WARPNPC,1,1,{
end;
OnTouch:
if (checkquest(7211,PLAYTIME) == -1)
@@ -1125,7 +1125,7 @@ OnTouch:
// Disable Garden Tree warps.
// Custom, but saves processing and lines.
-1@mist,1,1,0 script #mist_warp_init 844,{
+1@mist,1,1,0 script #mist_warp_init CLEAR_NPC,{
end;
OnInstanceInit:
disablenpc instance_npcname("a25_a18-1");
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index 8ab251d4b..f209f409b 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -23,7 +23,7 @@
// Quest NPCs
//============================================================
-mal_in01,172,28,2 script Albo#mal 561,{
+mal_in01,172,28,2 script Albo#mal 4_CAT_SAILOR5,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of objects. Try to continue after reducing those objects.";
close;
@@ -147,7 +147,7 @@ L_GiveQuest:
close;
}
-mal_in01,172,26,2 script Madeca#mal 544,{
+mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of objects. Try to continue after reducing those objects.";
close;
@@ -269,7 +269,7 @@ L_CheckQuest:
// Instance Creation
//============================================================
-mal_in01,160,34,4 script Missing, the Cleaner 545,{
+mal_in01,160,34,4 script Missing, the Cleaner 4_CAT_SAILOR2,{
if (BaseLevel < 90) {
mes "[Missing, the Cleaner]";
mes "Are you talking to me?!";
@@ -461,7 +461,7 @@ L_Enter:
// Instance: Common Scripts
//============================================================
-1@pump,63,100,4 script Missing, the Cleaner#0 545,{
+1@pump,63,100,4 script Missing, the Cleaner#0 4_CAT_SAILOR2,{
if (getcharid(0) != getpartyleader(getcharid(1),2)) {
mes "[Missing, the Cleaner]";
mes "I am trying to have a conversation with your leader now. Please don't disturb and wait!";
@@ -518,7 +518,7 @@ L_Enter:
end;
}
-1@pump,84,105,0 script Culvert Entrance#i 45,3,3,{
+1@pump,84,105,0 script Culvert Entrance#i WARPNPC,3,3,{
end;
OnInstanceInit:
disablenpc instance_npcname("Culvert Entrance#i");
@@ -574,7 +574,7 @@ function script F_mal_missing {
// Instance: Normal Mode
//============================================================
-1@pump,84,105,4 script Missing, the Cleaner#nf 545,{
+1@pump,84,105,4 script Missing, the Cleaner#nf 4_CAT_SAILOR2,{
mes "[Missing, the Cleaner]";
mes "I have the cleaning job for 40 years and I've never seen such a terrible team!!";
next;
@@ -612,7 +612,7 @@ OnInstanceInit:
end;
}
-1@pump,84,105,4 script Missing, the Cleaner#n 545,{
+1@pump,84,105,4 script Missing, the Cleaner#n 4_CAT_SAILOR2,{
callfunc "F_mal_missing";
donpcevent instance_npcname("Missing, the Cleaner#n")+"::OnStart";
close;
@@ -715,7 +715,7 @@ OnClear:
end;
}
-1@pump,36,111,4 script #Culvert_n1 844,14,14,{ //temporary workaround for ALL_SAMEMAP
+1@pump,36,111,4 script #Culvert_n1 CLEAR_NPC,14,14,{ //temporary workaround for ALL_SAMEMAP
progressbar "0xFFFF00",10;
stopnpctimer;
disablenpc instance_npcname(strnpcinfo(0));
@@ -770,11 +770,11 @@ OnTouch:
specialeffect EF_MAPPILLAR2;
end;
}
-1@pump,68,124,4 duplicate(#Culvert_n1) #Culvert_n2 844,14,14
-1@pump,80,114,4 duplicate(#Culvert_n1) #Culvert_n3 844,14,14
-1@pump,40,80,4 duplicate(#Culvert_n1) #Culvert_n4 844,14,14
-1@pump,75,80,4 duplicate(#Culvert_n1) #Culvert_n5 844,14,14
-1@pump,58,101,4 duplicate(#Culvert_n1) #Culvert_n6 844,14,14
+1@pump,68,124,4 duplicate(#Culvert_n1) #Culvert_n2 CLEAR_NPC,14,14
+1@pump,80,114,4 duplicate(#Culvert_n1) #Culvert_n3 CLEAR_NPC,14,14
+1@pump,40,80,4 duplicate(#Culvert_n1) #Culvert_n4 CLEAR_NPC,14,14
+1@pump,75,80,4 duplicate(#Culvert_n1) #Culvert_n5 CLEAR_NPC,14,14
+1@pump,58,101,4 duplicate(#Culvert_n1) #Culvert_n6 CLEAR_NPC,14,14
1@pump,1,1,4 script Boss Creation#n -1,{
end;
@@ -851,7 +851,7 @@ OnMyMobDead:
end;
}
-1@pump,84,105,4 script Missing, the Cleaner#no 545,{
+1@pump,84,105,4 script Missing, the Cleaner#no 4_CAT_SAILOR2,{
set .@i$, charat(strnpcinfo(2),0);
if (.@i$ == "n") {
mes "[Missing, the Cleaner]";
@@ -885,7 +885,7 @@ OnInstanceInit:
end;
}
-1@pump,32,100,0 script Culvert Entrance#n 45,3,3,{
+1@pump,32,100,0 script Culvert Entrance#n WARPNPC,3,3,{
end;
OnInstanceInit:
disablenpc instance_npcname(strnpcinfo(0));
@@ -904,9 +904,9 @@ OnInstanceInit:
// Instance: Hard Mode
//============================================================
-2@pump,39,88,4 duplicate(Missing, the Cleaner#nf) Missing, the Cleaner#hf 545
+2@pump,39,88,4 duplicate(Missing, the Cleaner#nf) Missing, the Cleaner#hf 4_CAT_SAILOR2
-2@pump,39,88,4 script Missing, the Cleaner#h 545,{
+2@pump,39,88,4 script Missing, the Cleaner#h 4_CAT_SAILOR2,{
callfunc "F_mal_missing";
donpcevent instance_npcname("Missing, the Cleaner#h")+"::OnStart";
close;
@@ -983,7 +983,7 @@ OnTimer425000:
end;
}
-2@pump,53,114,4 script #Culvert_h1 844,14,14,{ //temporary workaround for ALL_SAMEMAP
+2@pump,53,114,4 script #Culvert_h1 CLEAR_NPC,14,14,{ //temporary workaround for ALL_SAMEMAP
progressbar "0xFFFF00",15;
stopnpctimer;
disablenpc instance_npcname(strnpcinfo(0));
@@ -1032,20 +1032,20 @@ OnTouch:
specialeffect EF_MAPPILLAR2;
end;
}
-2@pump,79,109,4 duplicate(#Culvert_h1) #Culvert_h2 844,14,14
-2@pump,114,114,4 duplicate(#Culvert_h1) #Culvert_h3 844,14,14
-2@pump,98,98,4 duplicate(#Culvert_h1) #Culvert_h4 844,14,14
-2@pump,62,96,4 duplicate(#Culvert_h1) #Culvert_h5 844,14,14
-2@pump,57,70,4 duplicate(#Culvert_h1) #Culvert_h6 844,14,14
-2@pump,47,49,4 duplicate(#Culvert_h1) #Culvert_h7 844,14,14
-2@pump,81,63,4 duplicate(#Culvert_h1) #Culvert_h8 844,14,14
-2@pump,100,74,4 duplicate(#Culvert_h1) #Culvert_h9 844,14,14
-2@pump,115,50,4 duplicate(#Culvert_h1) #Culvert_h10 844,14,14
+2@pump,79,109,4 duplicate(#Culvert_h1) #Culvert_h2 CLEAR_NPC,14,14
+2@pump,114,114,4 duplicate(#Culvert_h1) #Culvert_h3 CLEAR_NPC,14,14
+2@pump,98,98,4 duplicate(#Culvert_h1) #Culvert_h4 CLEAR_NPC,14,14
+2@pump,62,96,4 duplicate(#Culvert_h1) #Culvert_h5 CLEAR_NPC,14,14
+2@pump,57,70,4 duplicate(#Culvert_h1) #Culvert_h6 CLEAR_NPC,14,14
+2@pump,47,49,4 duplicate(#Culvert_h1) #Culvert_h7 CLEAR_NPC,14,14
+2@pump,81,63,4 duplicate(#Culvert_h1) #Culvert_h8 CLEAR_NPC,14,14
+2@pump,100,74,4 duplicate(#Culvert_h1) #Culvert_h9 CLEAR_NPC,14,14
+2@pump,115,50,4 duplicate(#Culvert_h1) #Culvert_h10 CLEAR_NPC,14,14
2@pump,1,1,4 duplicate(Monster Hole#n) Monster Hole#h -1
2@pump,1,1,4 duplicate(Boss Creation#n) Boss Creation#h -1
-2@pump,39,88,4 duplicate(Missing, the Cleaner#no) Missing, the Cleaner#ho 545
-2@pump,38,100,0 duplicate(Culvert Entrance#n) Culvert Entrance#h 45,3,3
+2@pump,39,88,4 duplicate(Missing, the Cleaner#no) Missing, the Cleaner#ho 4_CAT_SAILOR2
+2@pump,38,100,0 duplicate(Culvert Entrance#n) Culvert Entrance#h WARPNPC,3,3
//MD_Putmob "2@pump" 0 0 0 0 20 HYDRA 0 0 2
2@pump,1,1,4 duplicate(Hydra#n) Hydra#h -1
diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt
index 7d5975e23..43c2ac66f 100644
--- a/npc/re/instances/OctopusCave.txt
+++ b/npc/re/instances/OctopusCave.txt
@@ -17,7 +17,7 @@
// Instance Creation
//============================================================
-mal_dun01,151,235,5 script Starfish 551,{
+mal_dun01,151,235,5 script Starfish 4_ASTER,{
set .@party_id,getcharid(1);
set .@md_name$,"Octopus Cave";
@@ -122,7 +122,7 @@ mal_dun01,151,235,5 script Starfish 551,{
}
}
-mal_dun01,153,237,5 script Weird Entrance 844,{
+mal_dun01,153,237,5 script Weird Entrance CLEAR_NPC,{
mes "There is a strange entrance";
mes "blocked roughly with some boards.";
next;
@@ -162,7 +162,7 @@ mal_dun01,153,237,5 script Weird Entrance 844,{
// Instance Scripts
//============================================================
-1@cash,199,99,0 script oct_enter 139,4,4,{
+1@cash,199,99,0 script oct_enter HIDDEN_WARP_NPC,4,4,{
end;
OnTouch:
donpcevent instance_npcname("oct_enter_broad")+"::OnEnable";
@@ -231,7 +231,7 @@ OnMyMobDead:
end;
}
-1@cash,20,114,0 script oct_foot1 139,6,6,{
+1@cash,20,114,0 script oct_foot1 HIDDEN_WARP_NPC,6,6,{
end;
OnInstanceInit:
donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
@@ -351,11 +351,11 @@ OnMyMobDead:
}
end;
}
-1@cash,88,190,0 duplicate(oct_foot1) oct_foot2 139,6,6
-1@cash,307,215,0 duplicate(oct_foot1) oct_foot3 139,6,6
-1@cash,372,131,0 duplicate(oct_foot1) oct_foot4 139,6,6
+1@cash,88,190,0 duplicate(oct_foot1) oct_foot2 HIDDEN_WARP_NPC,6,6
+1@cash,307,215,0 duplicate(oct_foot1) oct_foot3 HIDDEN_WARP_NPC,6,6
+1@cash,372,131,0 duplicate(oct_foot1) oct_foot4 HIDDEN_WARP_NPC,6,6
-1@cash,16,117,0 script oct_foot_exit1 45,2,2,{
+1@cash,16,117,0 script oct_foot_exit1 WARPNPC,2,2,{
end;
OnInstanceInit:
disablenpc instance_npcname(strnpcinfo(0));
@@ -367,9 +367,9 @@ OnTouch:
warp instance_mapname("1@cash"),198,99;
end;
}
-1@cash,77,193,0 duplicate(oct_foot_exit1) oct_foot_exit2 45,2,2
-1@cash,312,214,0 duplicate(oct_foot_exit1) oct_foot_exit3 45,2,2
-1@cash,370,139,0 duplicate(oct_foot_exit1) oct_foot_exit4 45,2,2
+1@cash,77,193,0 duplicate(oct_foot_exit1) oct_foot_exit2 WARPNPC,2,2
+1@cash,312,214,0 duplicate(oct_foot_exit1) oct_foot_exit3 WARPNPC,2,2
+1@cash,370,139,0 duplicate(oct_foot_exit1) oct_foot_exit4 WARPNPC,2,2
1@cash,15,15,0 script oct_mob_con -1,{
end;
@@ -433,7 +433,7 @@ OnDisable:
end;
}
-1@cash,45,53,0 script oct_backattack1 139,3,3,{
+1@cash,45,53,0 script oct_backattack1 HIDDEN_WARP_NPC,3,3,{
end;
OnInstanceInit:
disablenpc instance_npcname("oct_backattack1");
@@ -456,7 +456,7 @@ OnEnable:
end;
}
-1@cash,78,99,0 script oct_backattack2 139,3,3,{
+1@cash,78,99,0 script oct_backattack2 HIDDEN_WARP_NPC,3,3,{
end;
OnInstanceInit:
disablenpc instance_npcname("oct_backattack2");
@@ -496,7 +496,7 @@ OnEnable:
end;
}
-1@cash,299,144,0 script oct_backattack3 139,3,3,{
+1@cash,299,144,0 script oct_backattack3 HIDDEN_WARP_NPC,3,3,{
end;
OnInstanceInit:
disablenpc instance_npcname("oct_backattack3");
@@ -523,7 +523,7 @@ OnEnable:
end;
}
-1@cash,336,36,0 script oct_backattack4 139,3,3,{
+1@cash,336,36,0 script oct_backattack4 HIDDEN_WARP_NPC,3,3,{
end;
OnInstanceInit:
disablenpc instance_npcname("oct_backattack4");
@@ -674,7 +674,7 @@ OnMyMobDead:
end;
}
-1@cash,198,116,0 script oct_boss_warp 45,2,2,{
+1@cash,198,116,0 script oct_boss_warp WARPNPC,2,2,{
end;
OnInstanceInit:
disablenpc instance_npcname("oct_boss_warp");
@@ -684,7 +684,7 @@ OnTouch:
end;
}
-1@cash,190,208,0 script oct_exit_1 45,2,2,{
+1@cash,190,208,0 script oct_exit_1 WARPNPC,2,2,{
end;
OnInstanceInit:
disablenpc instance_npcname(strnpcinfo(0));
@@ -696,9 +696,9 @@ OnTouch:
warp "mal_dun01",153,233;
close;
}
-1@cash,198,82,0 duplicate(oct_exit_1) oct_exit_2 45,2,2
+1@cash,198,82,0 duplicate(oct_exit_1) oct_exit_2 WARPNPC,2,2
// This is never enabled in the official script.
-//1@cash,200,161,0 duplicate(oct_exit_1) oct_exit_3 45,2,2
+//1@cash,200,161,0 duplicate(oct_exit_1) oct_exit_3 WARPNPC,2,2
// Warp Portals
//============================================================
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 8fb99978f..1e005e43b 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -14,7 +14,7 @@
1@gl_k mapflag src4instance
2@gl_k mapflag src4instance
//============================================================
-glast_01,204,273,6 script Hugin#ghinstance 755,{
+glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{
mes "^ff0000This isn't considered a normal progression dungeon. Please note this point.^000000";
next;
mes "[Hugin]";
@@ -91,7 +91,7 @@ glast_01,204,273,6 script Hugin#ghinstance 755,{
// Floor 1
//============================================================
-1@gl_k,149,41,6 script Varmunt#ghinstance1 654,{
+1@gl_k,149,41,6 script Varmunt#ghinstance1 4_M_BARMUND,{
if (getcharid(0) == getpartyleader(getcharid(1),2)) {
mes "Hey ^0000ffguys^000000, were you sent here to help me?";
npctalk "Hey guys, were you sent here to help me?";
@@ -168,7 +168,7 @@ OnEnable:
end;
}
-1@gl_k,145,54,6 script Khalitzburg Crusader#1 655,{
+1@gl_k,145,54,6 script Khalitzburg Crusader#1 4_F_KHALITZBURG,{
mes "["+strnpcinfo(1)+"]";
switch((atoi(strnpcinfo(2)) + 1) / 2) {
case 1: mes "Would I be recruited?"; break;
@@ -194,29 +194,29 @@ OnEnable:
hideoffnpc instance_npcname(strnpcinfo(0));
end;
}
-1@gl_k,154,54,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#2 655
-1@gl_k,145,59,6 duplicate(Khalitzburg Crusader#1) White Knight#3 657
-1@gl_k,154,59,3 duplicate(Khalitzburg Crusader#1) White Knight#4 657
-1@gl_k,145,64,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#5 655
-1@gl_k,154,64,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#6 655
-1@gl_k,145,69,6 duplicate(Khalitzburg Crusader#1) White Knight#7 657
-1@gl_k,154,69,3 duplicate(Khalitzburg Crusader#1) White Knight#8 657
-1@gl_k,145,74,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#9 655
-1@gl_k,154,74,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#10 655
-1@gl_k,145,79,6 duplicate(Khalitzburg Crusader#1) White Knight#11 657
-1@gl_k,154,79,3 duplicate(Khalitzburg Crusader#1) White Knight#12 657
-1@gl_k,145,84,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#13 655
-1@gl_k,154,84,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#14 655
-1@gl_k,145,89,6 duplicate(Khalitzburg Crusader#1) White Knight#15 657
-1@gl_k,154,89,3 duplicate(Khalitzburg Crusader#1) White Knight#16 657
-1@gl_k,145,94,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#17 655
-1@gl_k,154,94,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#18 655
-1@gl_k,145,99,6 duplicate(Khalitzburg Crusader#1) White Knight#19 657
-1@gl_k,154,99,3 duplicate(Khalitzburg Crusader#1) White Knight#20 657
-1@gl_k,145,104,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#21 655
-1@gl_k,154,104,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#22 655
+1@gl_k,154,54,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#2 4_F_KHALITZBURG
+1@gl_k,145,59,6 duplicate(Khalitzburg Crusader#1) White Knight#3 4_WHITEKNIGHT
+1@gl_k,154,59,3 duplicate(Khalitzburg Crusader#1) White Knight#4 4_WHITEKNIGHT
+1@gl_k,145,64,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#5 4_F_KHALITZBURG
+1@gl_k,154,64,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#6 4_F_KHALITZBURG
+1@gl_k,145,69,6 duplicate(Khalitzburg Crusader#1) White Knight#7 4_WHITEKNIGHT
+1@gl_k,154,69,3 duplicate(Khalitzburg Crusader#1) White Knight#8 4_WHITEKNIGHT
+1@gl_k,145,74,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#9 4_F_KHALITZBURG
+1@gl_k,154,74,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#10 4_F_KHALITZBURG
+1@gl_k,145,79,6 duplicate(Khalitzburg Crusader#1) White Knight#11 4_WHITEKNIGHT
+1@gl_k,154,79,3 duplicate(Khalitzburg Crusader#1) White Knight#12 4_WHITEKNIGHT
+1@gl_k,145,84,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#13 4_F_KHALITZBURG
+1@gl_k,154,84,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#14 4_F_KHALITZBURG
+1@gl_k,145,89,6 duplicate(Khalitzburg Crusader#1) White Knight#15 4_WHITEKNIGHT
+1@gl_k,154,89,3 duplicate(Khalitzburg Crusader#1) White Knight#16 4_WHITEKNIGHT
+1@gl_k,145,94,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#17 4_F_KHALITZBURG
+1@gl_k,154,94,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#18 4_F_KHALITZBURG
+1@gl_k,145,99,6 duplicate(Khalitzburg Crusader#1) White Knight#19 4_WHITEKNIGHT
+1@gl_k,154,99,3 duplicate(Khalitzburg Crusader#1) White Knight#20 4_WHITEKNIGHT
+1@gl_k,145,104,6 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#21 4_F_KHALITZBURG
+1@gl_k,154,104,3 duplicate(Khalitzburg Crusader#1) Khalitzburg Crusader#22 4_F_KHALITZBURG
-1@gl_k,149,100,6 script Heinrich#ghinstance1 652,{
+1@gl_k,149,100,6 script Heinrich#ghinstance1 4_M_HEINRICH,{
if (getcharid(0) == getpartyleader(getcharid(1),2)) {
cutin "gl_heinrich2",2;
select("Heinrich, about the castle...");
@@ -293,7 +293,7 @@ OnEnable:
end;
}
-1@gl_k,152,97,3 script Varmunt#ghinstance2 654,{
+1@gl_k,152,97,3 script Varmunt#ghinstance2 4_M_BARMUND,{
end;
OnInstanceInit:
donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnDisable";
@@ -327,7 +327,7 @@ OnTalk7:
end;
}
-1@gl_k,149,97,6 script Heinrich#ghinstance2 652,{
+1@gl_k,149,97,6 script Heinrich#ghinstance2 4_M_HEINRICH,{
end;
OnInstanceInit:
donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnDisable";
@@ -370,7 +370,7 @@ OnTalk10:
end;
}
-1@gl_k,149,100,6 script Heinrich#ghinstance3 652,{
+1@gl_k,149,100,6 script Heinrich#ghinstance3 4_M_HEINRICH,{
end;
OnInstanceInit:
donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnDisable";
@@ -407,7 +407,7 @@ OnTalk8:
end;
}
-1@gl_k,149,89,1 script Himmelmez#ghinstance1 650,{
+1@gl_k,149,89,1 script Himmelmez#ghinstance1 4_F_HIMEL,{
end;
OnInstanceInit:
donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnDisable";
@@ -746,7 +746,7 @@ OnTalkK:
1@gl_k,145,104,6 duplicate(.#ghinstance1) .#ghinstance21 2471
1@gl_k,154,104,3 duplicate(.#ghinstance1) .#ghinstance22 2471
-1@gl_k,145,59,6 script .#ghinstance3 111,{
+1@gl_k,145,59,6 script .#ghinstance3 HIDDEN_NPC,{
end;
OnInstanceInit:
donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
@@ -762,17 +762,17 @@ OnEffect1:
specialeffect EF_LEXAETERNA;
end;
}
-1@gl_k,154,59,3 duplicate(.#ghinstance3) .#ghinstance4 111
-1@gl_k,145,69,6 duplicate(.#ghinstance3) .#ghinstance7 111
-1@gl_k,154,69,3 duplicate(.#ghinstance3) .#ghinstance8 111
-1@gl_k,145,79,6 duplicate(.#ghinstance3) .#ghinstance11 111
-1@gl_k,154,79,3 duplicate(.#ghinstance3) .#ghinstance12 111
-1@gl_k,145,89,6 duplicate(.#ghinstance3) .#ghinstance15 111
-1@gl_k,154,89,3 duplicate(.#ghinstance3) .#ghinstance16 111
-1@gl_k,145,99,6 duplicate(.#ghinstance3) .#ghinstance19 111
-1@gl_k,154,99,3 duplicate(.#ghinstance3) .#ghinstance20 111
+1@gl_k,154,59,3 duplicate(.#ghinstance3) .#ghinstance4 HIDDEN_NPC
+1@gl_k,145,69,6 duplicate(.#ghinstance3) .#ghinstance7 HIDDEN_NPC
+1@gl_k,154,69,3 duplicate(.#ghinstance3) .#ghinstance8 HIDDEN_NPC
+1@gl_k,145,79,6 duplicate(.#ghinstance3) .#ghinstance11 HIDDEN_NPC
+1@gl_k,154,79,3 duplicate(.#ghinstance3) .#ghinstance12 HIDDEN_NPC
+1@gl_k,145,89,6 duplicate(.#ghinstance3) .#ghinstance15 HIDDEN_NPC
+1@gl_k,154,89,3 duplicate(.#ghinstance3) .#ghinstance16 HIDDEN_NPC
+1@gl_k,145,99,6 duplicate(.#ghinstance3) .#ghinstance19 HIDDEN_NPC
+1@gl_k,154,99,3 duplicate(.#ghinstance3) .#ghinstance20 HIDDEN_NPC
-1@gl_k,96,80,0 script #ghinstancewarp1 45,1,2,{
+1@gl_k,96,80,0 script #ghinstancewarp1 WARPNPC,1,2,{
end;
OnInstanceInit:
donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
@@ -802,17 +802,17 @@ OnTouch:
}
end;
}
-1@gl_k,90,80,0 duplicate(#ghinstancewarp1) #ghinstancewarp2 45,1,2
-1@gl_k,202,79,0 duplicate(#ghinstancewarp1) #ghinstancewarp3 45,1,2
-1@gl_k,206,79,0 duplicate(#ghinstancewarp1) #ghinstancewarp4 45,1,2
-1@gl_k,228,216,0 duplicate(#ghinstancewarp1) #ghinstancewarp5 45,1,2
-1@gl_k,222,216,0 duplicate(#ghinstancewarp1) #ghinstancewarp6 45,1,2
-1@gl_k,150,284,0 duplicate(#ghinstancewarp1) #ghinstancewarp7 45,1,2
-2@gl_k,145,123,0 duplicate(#ghinstancewarp1) #ghinstancewarp8 45,1,2
-2@gl_k,136,122,0 duplicate(#ghinstancewarp1) #ghinstancewarp9 45,1,2
-2@gl_k,154,101,0 duplicate(#ghinstancewarp1) #ghinstancewarp10 45,1,2
-2@gl_k,165,101,0 duplicate(#ghinstancewarp1) #ghinstancewarp11 45,1,2
-2@gl_k,150,163,0 duplicate(#ghinstancewarp1) #ghinstancewarp12 45,1,2
+1@gl_k,90,80,0 duplicate(#ghinstancewarp1) #ghinstancewarp2 WARPNPC,1,2
+1@gl_k,202,79,0 duplicate(#ghinstancewarp1) #ghinstancewarp3 WARPNPC,1,2
+1@gl_k,206,79,0 duplicate(#ghinstancewarp1) #ghinstancewarp4 WARPNPC,1,2
+1@gl_k,228,216,0 duplicate(#ghinstancewarp1) #ghinstancewarp5 WARPNPC,1,2
+1@gl_k,222,216,0 duplicate(#ghinstancewarp1) #ghinstancewarp6 WARPNPC,1,2
+1@gl_k,150,284,0 duplicate(#ghinstancewarp1) #ghinstancewarp7 WARPNPC,1,2
+2@gl_k,145,123,0 duplicate(#ghinstancewarp1) #ghinstancewarp8 WARPNPC,1,2
+2@gl_k,136,122,0 duplicate(#ghinstancewarp1) #ghinstancewarp9 WARPNPC,1,2
+2@gl_k,154,101,0 duplicate(#ghinstancewarp1) #ghinstancewarp10 WARPNPC,1,2
+2@gl_k,165,101,0 duplicate(#ghinstancewarp1) #ghinstancewarp11 WARPNPC,1,2
+2@gl_k,150,163,0 duplicate(#ghinstancewarp1) #ghinstancewarp12 WARPNPC,1,2
// Sector 1 Mobs
@@ -847,7 +847,7 @@ OnMyMobDead:
end;
}
-1@gl_k,17,51,3 script Aspiring Butcher#clearGH 706,{
+1@gl_k,17,51,3 script Aspiring Butcher#clearGH 4_M_KID1,{
if (getcharid(0) == getpartyleader(getcharid(1),2)) {
mes "[Aspiring Butcher]";
mes "Help me! Help me!!!";
@@ -903,7 +903,7 @@ OnEnable:
// Sector 2 Mobs
//============================================================
-1@gl_k,291,145,3 script Hollgrehenn Destroyer 726,{
+1@gl_k,291,145,3 script Hollgrehenn Destroyer 4_F_JOB_BLACKSMITH,{
if (getcharid(0) == getpartyleader(getcharid(1),2)) {
mes "[Hollgrehenn Destroyer]";
mes "Yaaa!! Die!!!";
@@ -989,7 +989,7 @@ OnMyMobDead:
// Tramp Mobs
//============================================================
-1@gl_k,221,82,3 script Breathless Man#GHtramp1 849,4,4,{
+1@gl_k,221,82,3 script Breathless Man#GHtramp1 4_M_DIEMAN,4,4,{
end;
OnTouch:
set .@i, rand(1,10);
@@ -1015,37 +1015,37 @@ OnDisable:
disablenpc instance_npcname(strnpcinfo(0));
end;
}
-1@gl_k,213,63,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp2 849,4,4
-1@gl_k,230,50,2 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp3 849,4,4
-1@gl_k,222,39,2 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp4 849,4,4
-1@gl_k,214,27,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp5 849,4,4
-1@gl_k,223,17,2 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp6 849,4,4
-1@gl_k,235,16,4 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp7 849,4,4
-1@gl_k,251,20,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp8 849,4,4
-1@gl_k,240,43,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp9 849,4,4
-1@gl_k,271,19,1 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp10 849,4,4
-1@gl_k,246,62,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp11 849,4,4
-1@gl_k,282,48,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp12 849,4,4
-1@gl_k,285,81,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp13 849,4,4
-1@gl_k,241,86,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp14 849,4,4
-1@gl_k,249,101,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp15 849,4,4
-1@gl_k,276,106,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp16 849,4,4
-1@gl_k,252,120,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp17 849,4,4
-1@gl_k,258,150,1 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp18 849,4,4
-1@gl_k,255,157,6 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp19 849,4,4
-1@gl_k,261,164,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp20 849,4,4
-1@gl_k,269,173,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp21 849,4,4
-1@gl_k,280,167,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp22 849,4,4
-1@gl_k,293,161,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp23 849,4,4
-1@gl_k,226,96,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp24 849,4,4
-1@gl_k,222,119,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp25 849,4,4
-1@gl_k,233,123,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp26 849,4,4
-2@gl_k,147,203,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp27 849,4,4
-2@gl_k,141,222,1 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp28 849,4,4
-2@gl_k,167,225,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp29 849,4,4
-2@gl_k,145,236,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp30 849,4,4
-2@gl_k,143,260,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp31 849,4,4
-2@gl_k,173,258,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp32 849,4,4
+1@gl_k,213,63,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp2 4_M_DIEMAN,4,4
+1@gl_k,230,50,2 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp3 4_M_DIEMAN,4,4
+1@gl_k,222,39,2 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp4 4_M_DIEMAN,4,4
+1@gl_k,214,27,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp5 4_M_DIEMAN,4,4
+1@gl_k,223,17,2 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp6 4_M_DIEMAN,4,4
+1@gl_k,235,16,4 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp7 4_M_DIEMAN,4,4
+1@gl_k,251,20,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp8 4_M_DIEMAN,4,4
+1@gl_k,240,43,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp9 4_M_DIEMAN,4,4
+1@gl_k,271,19,1 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp10 4_M_DIEMAN,4,4
+1@gl_k,246,62,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp11 4_M_DIEMAN,4,4
+1@gl_k,282,48,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp12 4_M_DIEMAN,4,4
+1@gl_k,285,81,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp13 4_M_DIEMAN,4,4
+1@gl_k,241,86,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp14 4_M_DIEMAN,4,4
+1@gl_k,249,101,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp15 4_M_DIEMAN,4,4
+1@gl_k,276,106,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp16 4_M_DIEMAN,4,4
+1@gl_k,252,120,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp17 4_M_DIEMAN,4,4
+1@gl_k,258,150,1 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp18 4_M_DIEMAN,4,4
+1@gl_k,255,157,6 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp19 4_M_DIEMAN,4,4
+1@gl_k,261,164,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp20 4_M_DIEMAN,4,4
+1@gl_k,269,173,7 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp21 4_M_DIEMAN,4,4
+1@gl_k,280,167,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp22 4_M_DIEMAN,4,4
+1@gl_k,293,161,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp23 4_M_DIEMAN,4,4
+1@gl_k,226,96,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp24 4_M_DIEMAN,4,4
+1@gl_k,222,119,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp25 4_M_DIEMAN,4,4
+1@gl_k,233,123,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp26 4_M_DIEMAN,4,4
+2@gl_k,147,203,5 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp27 4_M_DIEMAN,4,4
+2@gl_k,141,222,1 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp28 4_M_DIEMAN,4,4
+2@gl_k,167,225,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp29 4_M_DIEMAN,4,4
+2@gl_k,145,236,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp30 4_M_DIEMAN,4,4
+2@gl_k,143,260,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp31 4_M_DIEMAN,4,4
+2@gl_k,173,258,3 duplicate(Breathless Man#GHtramp1) Breathless Man#GHtramp32 4_M_DIEMAN,4,4
// Sector 3 Mobs
//============================================================
@@ -1115,7 +1115,7 @@ OnMyMobDead:
end;
}
-1@gl_k,150,257,3 script #GHMclear3 111,9,9,{
+1@gl_k,150,257,3 script #GHMclear3 HIDDEN_NPC,9,9,{
end;
OnTouch:
donpcevent instance_npcname("#controlGH3")+"::OnEnable";
@@ -1195,7 +1195,7 @@ OnTimer38000:
end;
}
-1@gl_k,144,258,6 script Heinrich#ghinstance4 652,{
+1@gl_k,144,258,6 script Heinrich#ghinstance4 4_M_HEINRICH,{
mes "[Heinrich]";
mes "Himmelmez... You made my men get killed and I will never forget that.";
cutin "gl_heinrich1",2;
@@ -1222,7 +1222,7 @@ OnTalk3:
end;
}
-1@gl_k,150,257,3 script Himmelmez#ghinstance2 650,{
+1@gl_k,150,257,3 script Himmelmez#ghinstance2 4_F_HIMEL,{
mes "[Himmelmez]";
mes "No need to stare at me with so insecure eyes. Soon they'll become relaxed...";
cutin "gl_himel2",2;
@@ -1258,7 +1258,7 @@ OnTalk6:
end;
}
-1@gl_k,156,259,3 script Varmunt#ghinstance3 654,{
+1@gl_k,156,259,3 script Varmunt#ghinstance3 4_M_BARMUND,{
if (checkquest(12318,HUNTING) == 2) {
if (checkquest(12319,HUNTING) == -1) {
mes "[Varmunt]";
@@ -1296,7 +1296,7 @@ OnTalk2:
// Floor 2
//============================================================
-2@gl_k,148,67,1 script Heinrich#ghinstance5 652,{
+2@gl_k,148,67,1 script Heinrich#ghinstance5 4_M_HEINRICH,{
mes "[Heinrich]";
mes "Himmelmez's blocking spells";
mes "are everywhere around here...";
@@ -1330,7 +1330,7 @@ OnTalk5:
end;
}
-2@gl_k,151,71,7 script Varmunt#ghinstance4 654,{
+2@gl_k,151,71,7 script Varmunt#ghinstance4 4_M_BARMUND,{
mes "[Varmunt]";
mes "Why am I doing this again? Doesn't seem like the first time. I've seen this place repeatedly dozens of times in my dreams. This feeling...";
cutin "gl_barmund1",2;
@@ -1396,7 +1396,7 @@ OnTalk17:
end;
}
-2@gl_k,150,67,0 script #effectGH01 111,10,10,{
+2@gl_k,150,67,0 script #effectGH01 HIDDEN_NPC,10,10,{
end;
OnTouch:
specialeffect EF_BASH;
@@ -1717,7 +1717,7 @@ OnMyMobDead:
end;
}
-2@gl_k,155,250,7 script Heinrich#ghinstance6 652,{
+2@gl_k,155,250,7 script Heinrich#ghinstance6 4_M_HEINRICH,{
end;
OnInstanceInit:
donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnDisable";
@@ -1748,7 +1748,7 @@ OnTalk6:
end;
}
-2@gl_k,162,250,1 script Varmunt#ghinstance5 654,{
+2@gl_k,162,250,1 script Varmunt#ghinstance5 4_M_BARMUND,{
mes "[Varmunt]";
mes "We can't escape this";
mes "eternal confinement...";
@@ -1770,7 +1770,7 @@ OnTalk1:
end;
}
-2@gl_k,158,252,3 script Himmelmez#ghinstance4 650,4,4,{
+2@gl_k,158,252,3 script Himmelmez#ghinstance4 4_F_HIMEL,4,4,{
end;
OnInstanceInit:
donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnDisable";
@@ -1816,7 +1816,7 @@ OnTalk11:
end;
}
-2@gl_k,150,179,0 script #controlGH6 111,2,2,{
+2@gl_k,150,179,0 script #controlGH6 HIDDEN_NPC,2,2,{
end;
OnTouch:
mapannounce instance_mapname("2@gl_k"), "???: Do not come! There are traps everywhere here... Aaaaack!!!!",bc_map,"0xFF0000";
@@ -1838,7 +1838,7 @@ OnEnable:
end;
}
-2@gl_k,158,252,1 script Himmelmez#ghinstance3 650,7,7,{
+2@gl_k,158,252,1 script Himmelmez#ghinstance3 4_F_HIMEL,7,7,{
end;
OnTouch:
specialeffect EF_BASH;
@@ -1857,7 +1857,7 @@ OnEnable:
end;
}
-2@gl_k,158,255,3 script Gerhard#ghinstance1 651,{
+2@gl_k,158,255,3 script Gerhard#ghinstance1 4_LEVITATEMAN,{
end;
OnInstanceInit:
donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnDisable";
@@ -1997,7 +1997,7 @@ OnTimer80000:
end;
}
-2@gl_k,158,241,1 script Hugin#ghinstance1 755,{
+2@gl_k,158,241,1 script Hugin#ghinstance1 4_M_SAGE_C,{
if (checkquest(12319,HUNTING) == 2) {
mes "[Hugin]";
mes "Well, you are pretty ridiculous. Beginners shouldn't get the loot Amdarias drops.";
diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt
index ca80fda9c..07c37a07c 100644
--- a/npc/re/jobs/1-1/acolyte.txt
+++ b/npc/re/jobs/1-1/acolyte.txt
@@ -12,7 +12,7 @@
//= 1.2 Added Baby Job compatibility [Streusel]
//= 1.3 Rewrote bits [Euphy]
//============================================================
-prt_church,184,41,4 script Cleric#aco 60,{
+prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{
if (Upper == 1) {
if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) {
if (Class == Job_Novice_High) {
@@ -110,7 +110,7 @@ prt_church,184,41,4 script Cleric#aco 60,{
}
}
-prt_fild03,365,255,2 script Ascetic#aco 89,{
+prt_fild03,365,255,2 script Ascetic#aco 4_M_ORIENT02,{
mes "[Father Rubalkabara]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 6) {
@@ -187,7 +187,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
}
}
-moc_fild07,41,355,4 script Ascetic#2aco 95,{
+moc_fild07,41,355,4 script Ascetic#2aco 4_F_SISTER,{
mes "[Mother Mathilda]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 7) {
@@ -256,7 +256,7 @@ moc_fild07,41,355,4 script Ascetic#2aco 95,{
}
}
-prt_fild00,208,218,6 script Ascetic#3aco 98,{
+prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{
mes "[Father Yosuke]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 8) {
diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt
index d22e85f04..71df65889 100644
--- a/npc/re/jobs/1-1/archer.txt
+++ b/npc/re/jobs/1-1/archer.txt
@@ -11,7 +11,7 @@
//= 1.1 Added Baby Job compatibility [Streusel]
//= 1.2 Rewrote bits [Euphy]
//============================================================
-payon_in02,64,71,4 script Archer Guildsman#archer 85,{
+payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
mes "[Archer Guildsman]";
diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt
index ef60603f0..e87f89328 100644
--- a/npc/re/jobs/1-1/mage.txt
+++ b/npc/re/jobs/1-1/mage.txt
@@ -11,7 +11,7 @@
//= 1.1 Added Baby Job compatibility [Streusel]
//= 1.2 Rewrote bits [Euphy]
//============================================================
-geffen_in,164,124,4 script Mage Guildsman#mage 123,{
+geffen_in,164,124,4 script Mage Guildsman#mage 2_F_MAGICMASTER,{
if (Upper == 1) {
if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) {
if (Class == Job_Novice_High) {
diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt
index 05b82ec66..619a2a465 100644
--- a/npc/re/jobs/1-1/merchant.txt
+++ b/npc/re/jobs/1-1/merchant.txt
@@ -11,7 +11,7 @@
//= 1.1 Added Baby Job compatibility [Streusel]
//= 1.2 Rewrote bits [Euphy]
//============================================================
-alberta_in,53,43,6 script Merchant#mer 86,{
+alberta_in,53,43,6 script Merchant#mer 4_M_04,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) {
mes "[Chief Mahnsoo]";
diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt
index fffebe722..d8bd67711 100644
--- a/npc/re/jobs/1-1/swordman.txt
+++ b/npc/re/jobs/1-1/swordman.txt
@@ -11,7 +11,7 @@
//= 1.1 Added Baby Job compatibility [Streusel]
//= 1.2 Rewrote bits [Euphy]
//============================================================
-izlude_in,74,172,4 script Swordman#swd 119,{
+izlude_in,74,172,4 script Swordman#swd 2_M_SWORDMASTER,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
mes "[Swordman]";
diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt
index c99368b8c..c42888a66 100644
--- a/npc/re/jobs/1-1/thief.txt
+++ b/npc/re/jobs/1-1/thief.txt
@@ -11,7 +11,7 @@
//= 1.1 Added Baby Job compatibility [Streusel]
//= 1.2 Rewrote bits [Euphy]
//============================================================
-moc_prydb1,39,129,2 script Thief Guide#thief 69,{
+moc_prydb1,39,129,2 script Thief Guide#thief 1_F_04,{
if (Upper == 1) {
if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) {
if (Class == Job_Novice_High) {
@@ -155,7 +155,7 @@ moc_prydb1,39,129,2 script Thief Guide#thief 69,{
close;
}
-moc_prydb1,42,133,2 script Thief Guildsman#thief 118,{
+moc_prydb1,42,133,2 script Thief Guildsman#thief 2_M_THIEFMASTER,{
if(q_job_thief == 1) {
mes "[Thief Guildsman]";
mes "Alright. You must have passed the job interview, huh?";
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index ccc03b7f2..26782eb94 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -24,7 +24,7 @@
//= 1.9 Added GM management function. [Euphy]
//============================================================
-prt_church,103,88,3 script Praying Minister#arch 60,{
+prt_church,103,88,3 script Praying Minister#arch 1_M_PASTOR,{
if (BaseJob != Job_Priest) {
if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Bishop) {
mes "[Praying Minister]";
@@ -162,13 +162,13 @@ prt_church,103,88,3 script Praying Minister#arch 60,{
close;
}
-umbala,137,227,5 script Utan Boy#arch 787,{
+umbala,137,227,5 script Utan Boy#arch 4_M_UMKID,{
mes "[Utan Boy]";
mes "........";
close;
}
-umbala,139,227,3 script Priest#arch 60,{
+umbala,139,227,3 script Priest#arch 1_M_PASTOR,{
if (job_arch == 0) {
mes "[Priest]";
mes "Un...ba... Unba?";
@@ -414,7 +414,7 @@ umbala,139,227,3 script Priest#arch 60,{
close;
}
-yggdrasil01,220,47,0 script #arch_pilgrimage 139,5,5,{
+yggdrasil01,220,47,0 script #arch_pilgrimage HIDDEN_WARP_NPC,5,5,{
OnTouch:
if (job_arch == 2) {
mes "[" + strcharinfo(0) + "]";
@@ -573,7 +573,7 @@ OnTouch:
end;
}
-hu_in01,205,204,7 script Praying Nun#benew 79,{
+hu_in01,205,204,7 script Praying Nun#benew 1_F_PRIEST,{
if (job_arch == 4) {
mes "- There is a nun closing her eyes as she murmurs something which sounds like a prayer. -";
next;
@@ -722,14 +722,14 @@ hu_in01,205,204,7 script Praying Nun#benew 79,{
close;
}
-odin_tem02,282,263,0 script #find_val 139,3,3,{
+odin_tem02,282,263,0 script #find_val HIDDEN_WARP_NPC,3,3,{
OnTouch:
if ((job_arch > 4) && (job_arch < 100))
hideoffnpc "Valkyrie Illusion#arch";
end;
}
-odin_tem02,281,275,3 script Valkyrie Illusion#arch 403,{
+odin_tem02,281,275,3 script Valkyrie Illusion#arch 4_F_VALKYRIE2,{
if ((job_arch > 4) && (job_arch < 100)) {
mes "You can see Valkyrie who has a despairing face.";
next;
@@ -754,7 +754,7 @@ OnInit:
end;
}
-job3_arch01,29,34,3 script Valkyrie#arch 403,{
+job3_arch01,29,34,3 script Valkyrie#arch 4_F_VALKYRIE2,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
mes "- Wait a Sec !! -";
mes "- You are carrying too many items, -";
@@ -980,7 +980,7 @@ OnBc:
end;
}
-job3_arch02,119,49,0 script #arch_1_start 139,6,6,{
+job3_arch02,119,49,0 script #arch_1_start HIDDEN_WARP_NPC,6,6,{
OnTouch:
if (countitem(12381) == 0)
getitem 12381,1; //ValkyrieA_Scroll
@@ -1008,20 +1008,20 @@ OnTouch:
mapwarp "job3_arch02","job3_arch01",29,29;
end;
}
-job3_arch02,112,73,0 duplicate(archbjcq) #arch_1_01 139,5,5
-job3_arch02,94,123,0 duplicate(archbjcq) #arch_1_02 139,5,5
-job3_arch02,93,173,0 duplicate(archbjcq) #arch_1_03 139,5,5
-job3_arch02,114,186,0 duplicate(archbjcq) #arch_1_04 139,5,5
-job3_arch02,134,201,0 duplicate(archbjcq) #arch_1_05 139,5,5
-job3_arch02,154,211,0 duplicate(archbjcq) #arch_1_06 139,5,5
-job3_arch02,175,227,0 duplicate(archbjcq) #arch_1_07 139,5,5
-job3_arch02,201,240,0 duplicate(archbjcq) #arch_1_08 139,5,5
-job3_arch02,223,252,0 duplicate(archbjcq) #arch_1_09 139,5,5
-job3_arch02,255,268,0 duplicate(archbjcq) #arch_1_10 139,5,5
-job3_arch02,269,302,0 duplicate(archbjcq) #arch_1_11 139,5,5
-job3_arch02,245,289,0 duplicate(archbjcq) #arch_1_12 139,5,5
+job3_arch02,112,73,0 duplicate(archbjcq) #arch_1_01 HIDDEN_WARP_NPC,5,5
+job3_arch02,94,123,0 duplicate(archbjcq) #arch_1_02 HIDDEN_WARP_NPC,5,5
+job3_arch02,93,173,0 duplicate(archbjcq) #arch_1_03 HIDDEN_WARP_NPC,5,5
+job3_arch02,114,186,0 duplicate(archbjcq) #arch_1_04 HIDDEN_WARP_NPC,5,5
+job3_arch02,134,201,0 duplicate(archbjcq) #arch_1_05 HIDDEN_WARP_NPC,5,5
+job3_arch02,154,211,0 duplicate(archbjcq) #arch_1_06 HIDDEN_WARP_NPC,5,5
+job3_arch02,175,227,0 duplicate(archbjcq) #arch_1_07 HIDDEN_WARP_NPC,5,5
+job3_arch02,201,240,0 duplicate(archbjcq) #arch_1_08 HIDDEN_WARP_NPC,5,5
+job3_arch02,223,252,0 duplicate(archbjcq) #arch_1_09 HIDDEN_WARP_NPC,5,5
+job3_arch02,255,268,0 duplicate(archbjcq) #arch_1_10 HIDDEN_WARP_NPC,5,5
+job3_arch02,269,302,0 duplicate(archbjcq) #arch_1_11 HIDDEN_WARP_NPC,5,5
+job3_arch02,245,289,0 duplicate(archbjcq) #arch_1_12 HIDDEN_WARP_NPC,5,5
-job3_arch02,203,286,0 script #arch_1_boss 139,5,5,{
+job3_arch02,203,286,0 script #arch_1_boss HIDDEN_WARP_NPC,5,5,{
OnTouch:
if (countitem(12381)) {
delitem 12381,1; //ValkyrieA_Scroll
@@ -1051,7 +1051,7 @@ OnRed:
end;
}
-job3_arch02,390,389,1 script #arch_val01 844,{
+job3_arch02,390,389,1 script #arch_val01 CLEAR_NPC,{
end;
OnEnable:
areamonster "job3_arch02",111,325,115,329,"Valkyrie's Nightmare",2036,1,"#arch_val01::OnMyMobDead";
@@ -1082,7 +1082,7 @@ OnKill:
end;
}
-job3_arch02,390,387,1 script #arch_val02 844,{
+job3_arch02,390,387,1 script #arch_val02 CLEAR_NPC,{
end;
OnEnable:
areamonster "job3_arch02",242,44,246,48,"Valkyrie's Nightmare",2036,1,"#arch_val02::OnMyMobDead";
@@ -1100,7 +1100,7 @@ OnKill:
end;
}
-job3_arch02,113,327,5 script Valkyrie#arch_01 403,{
+job3_arch02,113,327,5 script Valkyrie#arch_01 4_F_VALKYRIE2,{
if (getmercinfo(1)) {
mes "[Valkyrie]";
mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have.";
@@ -1135,7 +1135,7 @@ job3_arch02,113,327,5 script Valkyrie#arch_01 403,{
end;
}
-job3_arch02,244,46,5 script Valkyrie#arch_02 403,{
+job3_arch02,244,46,5 script Valkyrie#arch_02 4_F_VALKYRIE2,{
mes "[Valkyrie Anguhilde]";
mes "Did you find the rest of the pieces?";
next;
@@ -1172,7 +1172,7 @@ job3_arch02,244,46,5 script Valkyrie#arch_02 403,{
end;
}
-job3_arch02,279,234,0 script #arch_end 139,7,7,{
+job3_arch02,279,234,0 script #arch_end HIDDEN_WARP_NPC,7,7,{
end;
OnTouch:
donpcevent "#arch_3_01::OnKill";
@@ -1304,14 +1304,14 @@ OnInit:
end;
}
-job3_arch02,281,232,1 script Valkyrie Anguhilde#end 403,{
+job3_arch02,281,232,1 script Valkyrie Anguhilde#end 4_F_VALKYRIE2,{
end;
OnInit:
hideonnpc "Valkyrie Anguhilde#end";
end;
}
-job3_arch02,273,235,5 script Valkyrie of the heavens 811,{
+job3_arch02,273,235,5 script Valkyrie of the heavens 4_F_VALKYRIE,{
if (job_arch == 100) {
mes "[Valkyrie of the heavens]";
mes "Now, go back to your world.";
@@ -1330,7 +1330,7 @@ OnInit:
end;
}
-job3_arch02,132,323,0 script #arch_2_01 139,5,5,{
+job3_arch02,132,323,0 script #arch_2_01 HIDDEN_WARP_NPC,5,5,{
end;
OnTouch:
if (countitem(12382))
@@ -1357,33 +1357,33 @@ OnTouch:
mapwarp "job3_arch02","job3_arch01",29,29;
end;
}
-job3_arch02,167,313,0 duplicate(archbjcq2) #arch_2_02 139,5,5
-job3_arch02,127,304,0 duplicate(archbjcq2) #arch_2_03 139,5,5
-job3_arch02,207,279,0 duplicate(archbjcq2) #arch_2_04 139,5,5
-job3_arch02,239,281,0 duplicate(archbjcq2) #arch_2_05 139,5,5
-job3_arch02,269,303,0 duplicate(archbjcq2) #arch_2_06 139,5,5
-job3_arch02,288,283,0 duplicate(archbjcq2) #arch_2_07 139,5,5
-job3_arch02,278,234,0 duplicate(archbjcq2) #arch_2_08 139,5,5
-job3_arch02,234,179,0 duplicate(archbjcq2) #arch_2_09 139,5,5
-job3_arch02,227,169,0 duplicate(archbjcq2) #arch_2_10 139,5,5
-job3_arch02,190,146,0 duplicate(archbjcq2) #arch_2_11 139,5,5
+job3_arch02,167,313,0 duplicate(archbjcq2) #arch_2_02 HIDDEN_WARP_NPC,5,5
+job3_arch02,127,304,0 duplicate(archbjcq2) #arch_2_03 HIDDEN_WARP_NPC,5,5
+job3_arch02,207,279,0 duplicate(archbjcq2) #arch_2_04 HIDDEN_WARP_NPC,5,5
+job3_arch02,239,281,0 duplicate(archbjcq2) #arch_2_05 HIDDEN_WARP_NPC,5,5
+job3_arch02,269,303,0 duplicate(archbjcq2) #arch_2_06 HIDDEN_WARP_NPC,5,5
+job3_arch02,288,283,0 duplicate(archbjcq2) #arch_2_07 HIDDEN_WARP_NPC,5,5
+job3_arch02,278,234,0 duplicate(archbjcq2) #arch_2_08 HIDDEN_WARP_NPC,5,5
+job3_arch02,234,179,0 duplicate(archbjcq2) #arch_2_09 HIDDEN_WARP_NPC,5,5
+job3_arch02,227,169,0 duplicate(archbjcq2) #arch_2_10 HIDDEN_WARP_NPC,5,5
+job3_arch02,190,146,0 duplicate(archbjcq2) #arch_2_11 HIDDEN_WARP_NPC,5,5
/*
// Not in official script.
-job3_arch02,252,267,0 script #arch_2_12 139,5,5,{
+job3_arch02,252,267,0 script #arch_2_12 HIDDEN_WARP_NPC,5,5,{
OnTouch:
mapannounce "job3_arch02","Whispering of an impersonation: It's a crossroad. Let's go to the left side. I have to find my pipe.",bc_map,"0xFFCE00";
end;
}
-job3_arch02,250,290,0 script #arch_2_13 139,5,5,{
+job3_arch02,250,290,0 script #arch_2_13 HIDDEN_WARP_NPC,5,5,{
OnTouch:
mapannounce "job3_arch02","Whispering of an impersonation: I can see a ruined shrine. Take a rest in there.",bc_map,"0xFFCE00";
end;
}
*/
-job3_arch02,206,113,0 script #arch_2_boss 139,5,5,{
+job3_arch02,206,113,0 script #arch_2_boss HIDDEN_WARP_NPC,5,5,{
OnTouch:
if (countitem(12382)) {
delitem 12382,1; //ValkyrieB_Scroll
@@ -1397,7 +1397,7 @@ OnTouch:
end;
}
-job3_arch02,284,159,0 script #arch_3_01 139,20,20,{
+job3_arch02,284,159,0 script #arch_3_01 HIDDEN_WARP_NPC,20,20,{
OnTouch:
if (Class != Job_Priest) {
mapannounce "job3_arch02","Frus: Do you want to see God? Okay, I'll send you to the land of the dead by myself!",bc_map,"0xFF0000";
@@ -1415,7 +1415,7 @@ OnKill:
// end;
}
-job3_arch02,307,200,0 script #arch_3_02 139,5,5,{
+job3_arch02,307,200,0 script #arch_3_02 HIDDEN_WARP_NPC,5,5,{
OnTouch:
if (BaseJob == Job_Priest) {
mapannounce "job3_arch02","Skogul: You are my guest!",bc_map,"0xFF0000";
@@ -1433,7 +1433,7 @@ OnKill:
// end;
}
-job3_arch02,296,216,0 script #arch_3_03 139,5,5,{
+job3_arch02,296,216,0 script #arch_3_03 HIDDEN_WARP_NPC,5,5,{
OnTouch:
mapannounce "job3_arch02","Frus: I like your face... Can I steal it?",bc_map,"0xFF0000";
monster "job3_arch02",296,216,"Frus",1762,1,"#arch_3_03::OnMyMobDead";
@@ -1449,7 +1449,7 @@ OnInit:
end;
}
-job3_arch02,389,390,1 script mob#arch_1 844,{
+job3_arch02,389,390,1 script mob#arch_1 CLEAR_NPC,{
end;
OnEnable:
monster "job3_arch02",100,102,"Shrine Invader",1394,2,"mob#arch_1::OnMyMobDead";
@@ -1470,7 +1470,7 @@ OnKill:
end;
}
-job3_arch02,389,389,1 script mob#arch_2 844,{
+job3_arch02,389,389,1 script mob#arch_2 CLEAR_NPC,{
end;
OnEnable:
monster "job3_arch02",156,321,"Shrine Invader",1480,2,"mob#arch_2::OnMyMobDead";
@@ -1493,7 +1493,7 @@ OnKill:
end;
}
-job3_arch02,389,388,1 script start#arch 844,{
+job3_arch02,389,388,1 script start#arch CLEAR_NPC,{
end;
OnInit:
mapwarp "job3_arch02","job3_arch01",29,29;
@@ -1581,7 +1581,7 @@ OnTimer605000:
end;
}
-job3_arch02,390,388,1 script #arch_2_start 844,{
+job3_arch02,390,388,1 script #arch_2_start CLEAR_NPC,{
end;
OnInit:
disablenpc "#arch_2_01";
@@ -1615,7 +1615,7 @@ OnEnable:
end;
}
-job3_arch02,390,386,1 script #arch_3_start 844,{
+job3_arch02,390,386,1 script #arch_3_start CLEAR_NPC,{
end;
OnEnable:
enablenpc "#arch_3_01";
@@ -1626,14 +1626,14 @@ OnEnable:
end;
}
-job3_arch02,290,221,0 script #arch_end_eff 139,5,5,{
+job3_arch02,290,221,0 script #arch_end_eff HIDDEN_WARP_NPC,5,5,{
OnTouch:
specialeffect EF_MAPPILLAR2,"#arch_end";
end;
}
/*
-job_arch01,26,25,0 script #archremove 139,3,3,{
+job_arch01,26,25,0 script #archremove HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (countitem(6154)) delitem 6154, countitem(6154); //Broken_Horn_Pipe
if (countitem(12381)) delitem 12381, countitem(12381); //ValkyrieA_Scroll
@@ -1643,7 +1643,7 @@ OnTouch:
}
*/
-job3_arch01,1,1,1 script control#arch 844,{
+job3_arch01,1,1,1 script control#arch CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "[Troll]";
mes "Password please.";
@@ -1671,14 +1671,14 @@ job3_arch01,1,1,1 script control#arch 844,{
}
}
-odin_tem02,30,181,0 script #wherearch01 139,10,10,{
+odin_tem02,30,181,0 script #wherearch01 HIDDEN_WARP_NPC,10,10,{
OnTouch:
if (job_arch == 5)
viewpoint 1,282,263,1,0xFFFF99;
end;
}
-odin_tem02,30,335,0 script #wherearch02 139,10,10,{
+odin_tem02,30,335,0 script #wherearch02 HIDDEN_WARP_NPC,10,10,{
OnTouch:
if (job_arch == 5)
viewpoint 1,282,263,1,0xFFFF99;
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 904c04148..c206599bb 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -18,7 +18,7 @@
//= 1.5 Added GM management function. [Euphy]
//============================================================
-que_job01,75,96,3 script Guild Member#3rdgc01 997,{
+que_job01,75,96,3 script Guild Member#3rdgc01 4_M_MOCASS1,{
if (job_3rd_gc == 0) {
if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
if (BaseLevel == 99) {
@@ -222,7 +222,7 @@ function script func_3rdgc {
close;
}
-job3_guil01,82,95,3 script Daora#3rdgc02 940,{
+job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{
mes "[Daora]";
if (Class == Job_Assassin || Class == Job_Assassin_Cross || Class == Job_Baby_Assassin) {
if (job_3rd_gc < 4) {
@@ -825,7 +825,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 940,{
}
}
-job3_guil01,16,20,4 script Mayshell#3rdgc03 894,{
+job3_guil01,16,20,4 script Mayshell#3rdgc03 4_F_KHELLISIA,{
if (!checkweight(1201,2)) {
mes "- You can't continue this quest because you have too many items. -";
close;
@@ -1097,7 +1097,7 @@ job3_guil01,16,20,4 script Mayshell#3rdgc03 894,{
}
}
-ve_in,228,108,3 script Waitress#3rdgc04 80,{
+ve_in,228,108,3 script Waitress#3rdgc04 1_F_PUBGIRL,{
mes "[Waitress]";
if (job_3rd_gc < 6) {
mes "Welcome~";
@@ -1330,7 +1330,7 @@ ve_in,228,108,3 script Waitress#3rdgc04 80,{
}
}
-ve_in,246,303,3 script Young Merchant#3rdgc05 930,{
+ve_in,246,303,3 script Young Merchant#3rdgc05 4_M_RACHMAN2,{
if (job_3rd_gc < 6) {
mes "[Young Merchant]";
mes "If you want to buy stuff, go to this person.";
@@ -1526,7 +1526,7 @@ ve_in,246,303,3 script Young Merchant#3rdgc05 930,{
}
}
-veins,291,215,3 script Vigilante#3rdgc06 939,{
+veins,291,215,3 script Vigilante#3rdgc06 4_DST_SOLDIER,{
if (job_3rd_gc < 6) {
mes "[Vigilante]";
mes "Do you have any inconveniences while you are traveling?";
@@ -1690,7 +1690,7 @@ veins,291,215,3 script Vigilante#3rdgc06 939,{
}
}
-veins,187,143,5 script Peddler#3rdgc07 892,{
+veins,187,143,5 script Peddler#3rdgc07 4_F_HUGRANMA,{
mes "[Peddler]";
if (job_3rd_gc < 6) {
mes "What a huge sandstorm.";
@@ -1793,7 +1793,7 @@ veins,187,143,5 script Peddler#3rdgc07 892,{
}
}
-veins,235,126,3 script Old Man#3rdgc07 945,{
+veins,235,126,3 script Old Man#3rdgc07 4_M_DST_GRAND,{
mes "[Old Man]";
if (job_3rd_gc < 6) {
mes "Haha... I can remember my past when I see a young adventurer like you...";
@@ -1900,7 +1900,7 @@ veins,235,126,3 script Old Man#3rdgc07 945,{
}
}
-veins,223,180,3 script Girl#3rdgc09 941,{
+veins,223,180,3 script Girl#3rdgc09 4_F_DST_CHILD,{
mes "[Melissa]";
if (job_3rd_gc == 8) {
mes "Hi?";
@@ -2071,7 +2071,7 @@ veins,223,180,3 script Girl#3rdgc09 941,{
}
}
-veins,337,284,0 script #ghostestilla_3rdgc 139,3,3,{
+veins,337,284,0 script #ghostestilla_3rdgc HIDDEN_WARP_NPC,3,3,{
end;
OnTouch:
if (job_3rd_gc == 9) {
@@ -2184,7 +2184,7 @@ OnTouch:
end;
}
-veins,341,287,3 script Estillda#3rdgc10 919,{
+veins,341,287,3 script Estillda#3rdgc10 4_F_SHABBY,{
OnInit:
OnDisable:
disablenpc "Estillda#3rdgc10";
@@ -2194,7 +2194,7 @@ OnEnable:
end;
}
-job3_guil01,79,15,1 script Estillda#3rdgc11 919,{
+job3_guil01,79,15,1 script Estillda#3rdgc11 4_F_SHABBY,{
if (job_3rd_gc == 11) {
mes "Estillda is looking around with an anxious expression on her face.";
next;
@@ -2313,7 +2313,7 @@ job3_guil01,79,15,1 script Estillda#3rdgc11 919,{
end;
}
-veins,206,56,0 script #3rdgc_battleroom01 139,1,1,{
+veins,206,56,0 script #3rdgc_battleroom01 HIDDEN_WARP_NPC,1,1,{
end;
OnInit:
set $@3rdgc_room01, 0;
@@ -2352,7 +2352,7 @@ OnTouch:
end;
}
-job3_guil02,34,44,0 script #3rdgc_room01_mag01 139,2,2,{
+job3_guil02,34,44,0 script #3rdgc_room01_mag01 HIDDEN_WARP_NPC,2,2,{
end;
OnEnable:
enablenpc "#3rdgc_room01_mag01";
@@ -2397,7 +2397,7 @@ OnTimer300000:
end;
}
-job3_guil02,51,43,7 script A man with black clothes 456,4,4,{
+job3_guil02,51,43,7 script A man with black clothes 4_M_DSTMAN,4,4,{
end;
OnInit:
OnDisable:
@@ -2452,7 +2452,7 @@ OnMyMobDead:
end;
}
-job3_guil02,1,1,0 script #3rdgc_2nd_timer 844,{
+job3_guil02,1,1,0 script #3rdgc_2nd_timer CLEAR_NPC,{
end;
OnEnable:
initnpctimer;
@@ -2472,7 +2472,7 @@ OnTimer61000:
end;
}
-job3_guil02,49,43,5 script Dandelion#3rdgc12 457,{
+job3_guil02,49,43,5 script Dandelion#3rdgc12 4_M_DSTMANDEAD,{
if (!checkweight(1201,2)) {
mes "- You can't continue this quest because you have too many items. -";
close;
@@ -2517,7 +2517,7 @@ OnEnable:
end;
}
-rachel,115,77,3 script Girke#3rdgc13 85,{
+rachel,115,77,3 script Girke#3rdgc13 4_M_03,{
mes "[Girke]";
mes "Oh~ young man.";
mes "I'm Girke Sara.";
@@ -2564,7 +2564,7 @@ rachel,115,77,3 script Girke#3rdgc13 85,{
close;
}
-ra_in01,175,196,3 script Oresa Rava#3rdgc13 866,{
+ra_in01,175,196,3 script Oresa Rava#3rdgc13 4_M_LGTGRAND,{
mes "[Oresa Rava]";
if (job_3rd_gc == 13) {
mes "I don't know why you are visiting me, but I'm not crafting anymore.";
@@ -2649,7 +2649,7 @@ ra_in01,175,196,3 script Oresa Rava#3rdgc13 866,{
}
//Pre-RE: ve_fild05 (327,308)
-ve_fild02,330,384,3 script Girl#3rdgc14 466,{
+ve_fild02,330,384,3 script Girl#3rdgc14 4_F_GUILLOTINE,{
if (job_3rd_gc > 14 && job_3rd_gc < 18) {
mes "[Renzak]";
if (job_3rd_gc == 15) {
@@ -2728,7 +2728,7 @@ OnInit:
end;
}
-job3_guil03,22,70,0 script #3rdgc_event01 139,3,3,{
+job3_guil03,22,70,0 script #3rdgc_event01 HIDDEN_WARP_NPC,3,3,{
end;
OnEnable:
enablenpc "#3rdgc_event01";
@@ -2763,7 +2763,7 @@ OnTimer902000:
end;
}
-job3_guil03,1,4,0 script #3rdgc_event_master 844,{
+job3_guil03,1,4,0 script #3rdgc_event_master CLEAR_NPC,{
end;
OnEnable:
donpcevent "Barbed-Wire Entanglement::OnEnable";
@@ -2814,7 +2814,7 @@ OnReset:
}
//Original name: Barbed-Wire Entanglements#3rdgc_door01
-job3_guil03,55,79,0 script Barbed-Wire Entanglement 844,1,1,{
+job3_guil03,55,79,0 script Barbed-Wire Entanglement CLEAR_NPC,1,1,{
end;
OnEnable:
enablenpc "Barbed-Wire Entanglement";
@@ -2836,7 +2836,7 @@ OnTouch:
close;
}
-job3_guil03,98,46,0 script #3rdgc_hide01 139,1,4,{
+job3_guil03,98,46,0 script #3rdgc_hide01 HIDDEN_WARP_NPC,1,4,{
end;
OnStop:
killmonster "job3_guil03","#3rdgc_hide01::OnMyMobDead";
@@ -2863,7 +2863,7 @@ OnMyMobDead:
end;
}
-job3_guil03,98,55,0 script #3rdgc_hide02 139,1,4,{
+job3_guil03,98,55,0 script #3rdgc_hide02 HIDDEN_WARP_NPC,1,4,{
end;
OnStop:
killmonster "job3_guil03","#3rdgc_hide02::OnMyMobDead";
@@ -2890,7 +2890,7 @@ OnMyMobDead:
end;
}
-job3_guil03,98,64,0 script #3rdgc_hide03 139,1,4,{
+job3_guil03,98,64,0 script #3rdgc_hide03 HIDDEN_WARP_NPC,1,4,{
end;
OnStop:
killmonster "job3_guil03","#3rdgc_hide03::OnMyMobDead";
@@ -2917,7 +2917,7 @@ OnMyMobDead:
end;
}
-job3_guil03,1,2,0 script #3rdgc_guard 844,{
+job3_guil03,1,2,0 script #3rdgc_guard CLEAR_NPC,{
end;
OnEnable:
initnpctimer;
@@ -2958,7 +2958,7 @@ OnTimer16000:
end;
}
-job3_guil03,1,3,0 script #3rdgc_guardoff 844,{
+job3_guil03,1,3,0 script #3rdgc_guardoff CLEAR_NPC,{
end;
OnDisable:
initnpctimer;
@@ -3033,7 +3033,7 @@ OnEnable:
end;
}
-job3_guil03,93,35,3 script Front Gate Guard#g01 456,5,5,{
+job3_guil03,93,35,3 script Front Gate Guard#g01 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3060,11 +3060,11 @@ OnTouch:
OnMyMobDead:
end;
}
-job3_guil03,93,36,3 duplicate(#3rdgc_guard00) Front Gate Guard#g03 456
-job3_guil03,93,34,3 duplicate(#3rdgc_guard00) Front Gate Guard#g04 456
-job3_guil03,93,33,3 duplicate(#3rdgc_guard00) Front Gate Guard#g05 456
+job3_guil03,93,36,3 duplicate(#3rdgc_guard00) Front Gate Guard#g03 4_M_DSTMAN
+job3_guil03,93,34,3 duplicate(#3rdgc_guard00) Front Gate Guard#g04 4_M_DSTMAN
+job3_guil03,93,33,3 duplicate(#3rdgc_guard00) Front Gate Guard#g05 4_M_DSTMAN
-job3_guil03,133,52,5 script Back Gate Guard#g01 456,5,5,{
+job3_guil03,133,52,5 script Back Gate Guard#g01 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3091,11 +3091,11 @@ OnTouch:
OnMyMobDead:
end;
}
-job3_guil03,133,53,5 duplicate(#3rdgc_guard00) Back Gate Guard#g03 456
-job3_guil03,133,51,5 duplicate(#3rdgc_guard00) Back Gate Guard#g04 456
-job3_guil03,133,50,5 duplicate(#3rdgc_guard00) Back Gate Guard#g05 456
+job3_guil03,133,53,5 duplicate(#3rdgc_guard00) Back Gate Guard#g03 4_M_DSTMAN
+job3_guil03,133,51,5 duplicate(#3rdgc_guard00) Back Gate Guard#g04 4_M_DSTMAN
+job3_guil03,133,50,5 duplicate(#3rdgc_guard00) Back Gate Guard#g05 4_M_DSTMAN
-job3_guil03,117,51,4 script Interior Guard#g01 456,5,5,{
+job3_guil03,117,51,4 script Interior Guard#g01 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3122,11 +3122,11 @@ OnTouch:
OnMyMobDead:
end;
}
-job3_guil03,117,52,4 duplicate(#3rdgc_guard00) Interior Guard#g03 456
-job3_guil03,117,50,4 duplicate(#3rdgc_guard00) Interior Guard#g04 456
-job3_guil03,117,49,4 duplicate(#3rdgc_guard00) Interior Guard#g05 456
+job3_guil03,117,52,4 duplicate(#3rdgc_guard00) Interior Guard#g03 4_M_DSTMAN
+job3_guil03,117,50,4 duplicate(#3rdgc_guard00) Interior Guard#g04 4_M_DSTMAN
+job3_guil03,117,49,4 duplicate(#3rdgc_guard00) Interior Guard#g05 4_M_DSTMAN
-job3_guil03,88,44,4 script Exterior Guard#g01 456,5,5,{
+job3_guil03,88,44,4 script Exterior Guard#g01 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3149,7 +3149,7 @@ OnMyMobDead:
end;
}
-job3_guil03,88,55,4 script Exterior Guard#g02 456,5,5,{
+job3_guil03,88,55,4 script Exterior Guard#g02 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3172,7 +3172,7 @@ OnMyMobDead:
end;
}
-job3_guil03,88,64,4 script Exterior Guard#g03 456,5,5,{
+job3_guil03,88,64,4 script Exterior Guard#g03 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3195,7 +3195,7 @@ OnMyMobDead:
end;
}
-job3_guil03,73,62,4 script Exterior Guard#g04 456,5,5,{
+job3_guil03,73,62,4 script Exterior Guard#g04 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3218,7 +3218,7 @@ OnMyMobDead:
end;
}
-job3_guil03,77,51,4 script Exterior Guard#g05 456,5,5,{
+job3_guil03,77,51,4 script Exterior Guard#g05 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3241,7 +3241,7 @@ OnMyMobDead:
end;
}
-job3_guil03,73,34,4 script Exterior Guard#g06 456,5,5,{
+job3_guil03,73,34,4 script Exterior Guard#g06 4_M_DSTMAN,5,5,{
end;
OnInit:
OnDisable:
@@ -3310,7 +3310,7 @@ OnMyMobDead:
end;
}
-job3_guil03,2,1,0 script #3rdgc_sunchal_nomal 844,{
+job3_guil03,2,1,0 script #3rdgc_sunchal_nomal CLEAR_NPC,{
end;
OnEnable:
monster "job3_guil03",62,35,"Guard",1985,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
@@ -3347,7 +3347,7 @@ OnMyMobDead:
end;
}
-job3_guil03,2,2,0 script #3rdgc_sunchal_kill01 844,{
+job3_guil03,2,2,0 script #3rdgc_sunchal_kill01 CLEAR_NPC,{
end;
OnEnable:
set .@i, atoi(charat(strnpcinfo(0),20));
@@ -3377,10 +3377,10 @@ OnTimer10000:
stopnpctimer;
end;
}
-job3_guil03,2,3,0 duplicate(#3rdgc_sunchal_kill01) #3rdgc_sunchal_kill02 844
-job3_guil03,2,4,0 duplicate(#3rdgc_sunchal_kill01) #3rdgc_sunchal_kill03 844
+job3_guil03,2,3,0 duplicate(#3rdgc_sunchal_kill01) #3rdgc_sunchal_kill02 CLEAR_NPC
+job3_guil03,2,4,0 duplicate(#3rdgc_sunchal_kill01) #3rdgc_sunchal_kill03 CLEAR_NPC
-job3_guil03,64,68,3 script #3rdgc_gojung_kill01 456,7,7,{
+job3_guil03,64,68,3 script #3rdgc_gojung_kill01 4_M_DSTMAN,7,7,{
end;
OnEnable:
enablenpc strnpcinfo(0);
@@ -3415,10 +3415,10 @@ OnTimer10000:
stopnpctimer;
end;
}
-job3_guil03,86,63,1 duplicate(#3rdgc_gojung_kill01) #3rdgc_gojung_kill02 456,8,8
-job3_guil03,83,36,5 duplicate(#3rdgc_gojung_kill01) #3rdgc_gojung_kill03 456,6,6
+job3_guil03,86,63,1 duplicate(#3rdgc_gojung_kill01) #3rdgc_gojung_kill02 4_M_DSTMAN,8,8
+job3_guil03,83,36,5 duplicate(#3rdgc_gojung_kill01) #3rdgc_gojung_kill03 4_M_DSTMAN,6,6
-job3_guil03,88,71,0 script #3rdgc_safezone01 139,1,1,{
+job3_guil03,88,71,0 script #3rdgc_safezone01 HIDDEN_WARP_NPC,1,1,{
end;
OnTouch:
mes "It's a good bush to hide yourself.";
@@ -3440,10 +3440,10 @@ OnTimer:
donpcevent "#3rdgc_guardoff::OnDisable";
end;
}
-job3_guil03,82,45,0 duplicate(#3rdgc_safezone01) #3rdgc_safezone02 139,1,1
-job3_guil03,72,53,0 duplicate(#3rdgc_safezone01) #3rdgc_safezone03 139,1,1
+job3_guil03,82,45,0 duplicate(#3rdgc_safezone01) #3rdgc_safezone02 HIDDEN_WARP_NPC,1,1
+job3_guil03,72,53,0 duplicate(#3rdgc_safezone01) #3rdgc_safezone03 HIDDEN_WARP_NPC,1,1
-job3_guil03,111,51,7 script Priest from Rachel 928,{
+job3_guil03,111,51,7 script Priest from Rachel 4_M_MIDDLE1,{
if (!.on) end;
mes "[Priest from Rachel]";
if (job_3rd_gc == 17) {
@@ -3538,7 +3538,7 @@ OnTimer61500:
end;
}
-job3_guil03,146,70,3 script Renzak#3rdgc16 466,{
+job3_guil03,146,70,3 script Renzak#3rdgc16 4_F_GUILLOTINE,{
mes "[Renzak]";
if (checkquest(7110,HUNTING) == 2) {
mes "My peers will come here to settle this affair.";
@@ -3575,7 +3575,7 @@ OnDisable:
end;
}
-job3_guil01,148,53,3 script Bercasell#3rdgc16 467,{
+job3_guil01,148,53,3 script Bercasell#3rdgc16 4_M_GUILLOTINE,{
if (!checkweight(1201,2)) {
mes "- You can't continue this quest because you have too many items. -";
close;
@@ -3788,7 +3788,7 @@ L_Info:
// Warp Portals
//============================================================
-job3_guil01,80,77,0 script #gate_to_guil05 45,1,1,{
+job3_guil01,80,77,0 script #gate_to_guil05 WARPNPC,1,1,{
end;
OnTouch:
if (job_3rd_gc > 3)
@@ -3801,7 +3801,7 @@ OnTouch:
}
end;
}
-job3_guil01,51,55,0 script #gate_to_guil07 45,1,1,{
+job3_guil01,51,55,0 script #gate_to_guil07 WARPNPC,1,1,{
end;
OnTouch:
if (job_3rd_gc == 4 || job_3rd_gc == 14 || job_3rd_gc > 17)
@@ -3818,7 +3818,7 @@ OnTouch:
}
end;
}
-job3_guil01,51,44,0 script #gate_to_guil09 45,1,1,{
+job3_guil01,51,44,0 script #gate_to_guil09 WARPNPC,1,1,{
end;
OnTouch:
if (job_3rd_gc == 11 || job_3rd_gc == 12)
@@ -3832,7 +3832,7 @@ OnTouch:
end;
}
-job3_guil02,1,3,0 script #GMhelper01_gc 844,{
+job3_guil02,1,3,0 script #GMhelper01_gc CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "What can I do for you?";
next;
@@ -3871,7 +3871,7 @@ job3_guil02,1,3,0 script #GMhelper01_gc 844,{
}
}
-job3_guil03,1,8,0 script #GMhelper02_gc 844,{
+job3_guil03,1,8,0 script #GMhelper02_gc CLEAR_NPC,{
callfunc "F_GM_NPC";
mes "What can I do for you?";
next;
diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt
index 2133a227a..8300576f2 100644
--- a/npc/re/jobs/3-1/mechanic.txt
+++ b/npc/re/jobs/3-1/mechanic.txt
@@ -13,7 +13,7 @@
//= 1.2 Updated script. [Euphy]
//============================================================
-yuno,129,156,3 script Chainheart 923,{
+yuno,129,156,3 script Chainheart 4_M_DOCTOR,{
mes "[Chainheart]";
if (BaseLevel > 99) {
mes "Living as a Mechanic is tough,";
@@ -293,7 +293,7 @@ yuno,129,156,3 script Chainheart 923,{
close;
}
-jupe_cave,37,55,5 script Scholar#Mechanic 883,{
+jupe_cave,37,55,5 script Scholar#Mechanic 4_M_ALCHE_D,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 300) {
mes "- Your pack is too heavy. -";
mes "- Lighten your body first -";
@@ -384,7 +384,7 @@ jupe_cave,37,55,5 script Scholar#Mechanic 883,{
close;
}
-jupe_core2,149,273,3 script Ghostfire#1 802,{
+jupe_core2,149,273,3 script Ghostfire#1 4_NFWISP,{
mes "[?]";
if (job__mechanic == 11) {
mes "I've lost my body and all that's left is my spirit in this place.";
@@ -470,7 +470,7 @@ jupe_core2,149,273,3 script Ghostfire#1 802,{
end;
}
-jupe_core2,53,75,3 script Ghostfire#2 802,{
+jupe_core2,53,75,3 script Ghostfire#2 4_NFWISP,{
mes "[?]";
if (job__mechanic > 5) {
mes "Juperos... I...";
@@ -532,7 +532,7 @@ jupe_core2,53,75,3 script Ghostfire#2 802,{
end;
}
-jupe_core2,242,62,3 script Ghostfire#3 802,{
+jupe_core2,242,62,3 script Ghostfire#3 4_NFWISP,{
mes "[?]";
if (job__mechanic > 6) {
mes "I want to know more about the knowledge...";
@@ -573,7 +573,7 @@ jupe_core2,242,62,3 script Ghostfire#3 802,{
end;
}
-jupe_core2,29,150,0 script #Foothold 139,1,1,{
+jupe_core2,29,150,0 script #Foothold HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job__mechanic == 8) {
percentheal 0,-30;
@@ -612,7 +612,7 @@ OnTouch:
end;
}
-jupe_core2,272,149,0 script #Foothold2 139,1,1,{
+jupe_core2,272,149,0 script #Foothold2 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job__mechanic == 9) {
mes "-I had a feeling that power-";
@@ -647,7 +647,7 @@ OnTouch:
end;
}
-jupe_core2,288,142,3 script #Door 844,1,1,{
+jupe_core2,288,142,3 script #Door CLEAR_NPC,1,1,{
end;
OnInit:
OnDisable:
@@ -701,7 +701,7 @@ OnTouch:
end;
}
-jupe_core2,149,34,0 script #Acquiring Knowledge 139,1,0,{
+jupe_core2,149,34,0 script #Acquiring Knowledge HIDDEN_WARP_NPC,1,0,{
OnTouch:
if (job__mechanic == 9) {
mes "-The moment I stepped on-";
@@ -726,6 +726,6 @@ OnTouch:
}
end;
}
-jupe_core2,150,33,0 duplicate(#Acquiring Knowledge) #Acquiring Knowledge2 139,1,0
+jupe_core2,150,33,0 duplicate(#Acquiring Knowledge) #Acquiring Knowledge2 HIDDEN_WARP_NPC,1,0
jupe_core2,0,0,0,0 monster Dimik 1669,100,0,0,0 \ No newline at end of file
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index b35c8ebfc..0b52df91f 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -21,7 +21,7 @@
//= 1.6 Added GM management function. [Euphy]
//============================================================
-tur_dun01,156,36,5 script Survival Instructor#jr01 59,{
+tur_dun01,156,36,5 script Survival Instructor#jr01 1_M_ORIENT01,{
mes "[Survival Instructor, Rescue]";
if (BaseJob == Job_Hunter) {
if (job_ranger01 < 1) {
@@ -304,7 +304,7 @@ tur_dun01,156,36,5 script Survival Instructor#jr01 59,{
close;
}
-tur_dun01,91,169,3 script Test Instructor#jr02 732,{
+tur_dun01,91,169,3 script Test Instructor#jr02 4_M_JOB_HUNTER,{
mes "[Test Instructor, Teardrop]";
if (BaseJob == Job_Hunter) {
if (job_ranger01 < 3) {
@@ -672,7 +672,7 @@ L_Start:
end;
}
-job3_rang01,30,44,3 script Test Waiting Room#jr_03 88,{
+job3_rang01,30,44,3 script Test Waiting Room#jr_03 4_M_ORIENT01,{
mes "[Staff DTS]";
mes "Please wait at the practical test waiting room to start the test process.";
next;
@@ -798,7 +798,7 @@ OnDisable:
end;
}
-job3_rang02,100,95,0 script Test Supervisor#jr_04 139,{
+job3_rang02,100,95,0 script Test Supervisor#jr_04 HIDDEN_WARP_NPC,{
OnInit:
set $@job_rang_point01,0;
disablenpc "Test Supervisor#jr_04";
@@ -841,7 +841,7 @@ OnTimer18000:
end;
}
-job3_rang02,102,95,0 script First Test Timer#jr_05 139,{
+job3_rang02,102,95,0 script First Test Timer#jr_05 HIDDEN_WARP_NPC,{
OnInit:
disablenpc "First Test Timer#jr_05";
end;
@@ -942,7 +942,7 @@ OnTimer157000:
end;
}
-job3_rang02,104,95,0 script CallCorrectAnswer#jr 139,{
+job3_rang02,104,95,0 script CallCorrectAnswer#jr HIDDEN_WARP_NPC,{
OnInit:
OnDisable:
disablenpc "CallCorrectAnswer#jr";
@@ -969,7 +969,7 @@ OnMyMobDead:
end;
}
-job3_rang02,106,95,0 script CallWrongAnswer#jr 139,{
+job3_rang02,106,95,0 script CallWrongAnswer#jr HIDDEN_WARP_NPC,{
OnInit:
OnDisable:
disablenpc "CallWrongAnswer#jr";
@@ -1059,7 +1059,7 @@ OnMyMobDead:
end;
}
-job3_rang02,100,93,0 script Second Test Timer#jr_08 139,{
+job3_rang02,100,93,0 script Second Test Timer#jr_08 HIDDEN_WARP_NPC,{
OnInit:
disablenpc "Second Test Timer#jr_08";
end;
@@ -1166,7 +1166,7 @@ OnTimer223000:
end;
}
-job3_rang02,111,56,3 script Staff Rust#jr_09 89,{
+job3_rang02,111,56,3 script Staff Rust#jr_09 4_M_ORIENT02,{
if (job_ranger01 == 6) {
if (countitem(12258) < 1) {
percentheal 100,0;
@@ -1211,7 +1211,7 @@ OnDisable:
end;
}
-job3_rang02,136,21,0 script Summon Monster#jr_10 139,5,5,{
+job3_rang02,136,21,0 script Summon Monster#jr_10 HIDDEN_WARP_NPC,5,5,{
OnInit:
disablenpc "Summon Monster#jr_10";
end;
@@ -1260,7 +1260,7 @@ OnMyMobDead:
end;
}
-job3_rang02,180,78,3 script Test Supervisor#jr_11 882,1,1,{
+job3_rang02,180,78,3 script Test Supervisor#jr_11 4_F_SITDOWN,1,1,{
mes "[Test Supervisor, Caution]";
mes "Come, come near, nearer, nearer!!";
close;
@@ -1360,7 +1360,7 @@ OnTimer105000:
end;
}
-job3_rang02,104,93,0 script Third Test Timer#jr_12 139,{
+job3_rang02,104,93,0 script Third Test Timer#jr_12 HIDDEN_WARP_NPC,{
OnInit:
disablenpc "Third Test Timer#jr_12";
end;
@@ -1447,7 +1447,7 @@ OnTimer130000:
end;
}
-job3_rang02,251,49,3 script Test Supervisor#jr_13 732,{
+job3_rang02,251,49,3 script Test Supervisor#jr_13 4_M_JOB_HUNTER,{
mes "[Test Supervisor, Freeze]";
if (job_ranger01 == 6) {
if (checkquest(8261) == -1) {
@@ -1602,23 +1602,23 @@ OnTimer10000:
donpcevent strnpcinfo(0)+"::OnDisable";
end;
}
-job3_rang02,246,42,0 duplicate(Egg Bomb#0) Egg Bomb#14 139
-job3_rang02,249,46,0 duplicate(Egg Bomb#0) Egg Bomb#15 139
-job3_rang02,256,43,0 duplicate(Egg Bomb#0) Egg Bomb#16 139
-job3_rang02,243,54,0 duplicate(Egg Bomb#0) Egg Bomb#17 139
-job3_rang02,246,58,0 duplicate(Egg Bomb#0) Egg Bomb#18 139
-job3_rang02,255,56,0 duplicate(Egg Bomb#0) Egg Bomb#19 139
-job3_rang02,260,48,0 duplicate(Egg Bomb#0) Egg Bomb#20 139
-job3_rang02,244,53,0 duplicate(Egg Bomb#0) Egg Bomb#21 139
-job3_rang02,254,50,0 duplicate(Egg Bomb#0) Egg Bomb#22 139
-job3_rang02,241,41,0 duplicate(Egg Bomb#0) Egg Bomb#23 139
-job3_rang02,259,41,0 duplicate(Egg Bomb#0) Egg Bomb#24 139
-job3_rang02,256,52,0 duplicate(Egg Bomb#0) Egg Bomb#25 139
-job3_rang02,259,58,0 duplicate(Egg Bomb#0) Egg Bomb#26 139
-job3_rang02,254,52,0 duplicate(Egg Bomb#0) Egg Bomb#27 139
-job3_rang02,247,42,0 duplicate(Egg Bomb#0) Egg Bomb#28 139
+job3_rang02,246,42,0 duplicate(Egg Bomb#0) Egg Bomb#14 HIDDEN_WARP_NPC
+job3_rang02,249,46,0 duplicate(Egg Bomb#0) Egg Bomb#15 HIDDEN_WARP_NPC
+job3_rang02,256,43,0 duplicate(Egg Bomb#0) Egg Bomb#16 HIDDEN_WARP_NPC
+job3_rang02,243,54,0 duplicate(Egg Bomb#0) Egg Bomb#17 HIDDEN_WARP_NPC
+job3_rang02,246,58,0 duplicate(Egg Bomb#0) Egg Bomb#18 HIDDEN_WARP_NPC
+job3_rang02,255,56,0 duplicate(Egg Bomb#0) Egg Bomb#19 HIDDEN_WARP_NPC
+job3_rang02,260,48,0 duplicate(Egg Bomb#0) Egg Bomb#20 HIDDEN_WARP_NPC
+job3_rang02,244,53,0 duplicate(Egg Bomb#0) Egg Bomb#21 HIDDEN_WARP_NPC
+job3_rang02,254,50,0 duplicate(Egg Bomb#0) Egg Bomb#22 HIDDEN_WARP_NPC
+job3_rang02,241,41,0 duplicate(Egg Bomb#0) Egg Bomb#23 HIDDEN_WARP_NPC
+job3_rang02,259,41,0 duplicate(Egg Bomb#0) Egg Bomb#24 HIDDEN_WARP_NPC
+job3_rang02,256,52,0 duplicate(Egg Bomb#0) Egg Bomb#25 HIDDEN_WARP_NPC
+job3_rang02,259,58,0 duplicate(Egg Bomb#0) Egg Bomb#26 HIDDEN_WARP_NPC
+job3_rang02,254,52,0 duplicate(Egg Bomb#0) Egg Bomb#27 HIDDEN_WARP_NPC
+job3_rang02,247,42,0 duplicate(Egg Bomb#0) Egg Bomb#28 HIDDEN_WARP_NPC
-job3_rang01,90,43,3 script Ranger Master#jr_29 832,{
+job3_rang01,90,43,3 script Ranger Master#jr_29 4_M_REIDIN_KURS,{
mes "[Ranger Master, Neveragain]";
if (job_ranger01 < 6) {
mes "... ...Huh?";
@@ -1756,7 +1756,7 @@ job3_rang01,90,43,3 script Ranger Master#jr_29 832,{
}
}
-job3_rang01,58,1,0 script Worker#job_ranger 88,{
+job3_rang01,58,1,0 script Worker#job_ranger 4_M_ORIENT01,{
callfunc "F_GM_NPC";
switch(select("Enable Waiting Room:Disable Waiting Room:Enable 1st Test:Disable 1st Test:Enable 2nd Test:Disable 2nd Test:Enable 3rd Test:Disable 3rd Test:Cancel")) {
case 1:
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index f9264574a..ffb395e07 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -17,7 +17,7 @@
//= 1.5 Added GM management function. [Euphy]
//============================================================
-prt_in,162,24,3 script Splendid-Looking Knight 470,2,2,{
+prt_in,162,24,3 script Splendid-Looking Knight 4_M_KNIGHT_SILVER,2,2,{
mes "[Rune Knight Manuel]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "You are now a member of our select brethren. I can still remember when I first met you.";
@@ -125,7 +125,7 @@ prt_in,162,24,3 script Splendid-Looking Knight 470,2,2,{
close;
}
-glast_01,44,363,3 script Guide, Jungberg 468,2,2,{
+glast_01,44,363,3 script Guide, Jungberg 4_M_KNIGHT_BLACK,2,2,{
mes "[Guide, Jungberg]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Oh, you must be "+strcharinfo(0)+".";
@@ -249,7 +249,7 @@ glast_01,44,363,3 script Guide, Jungberg 468,2,2,{
}
}
-gl_knt02,150,55,3 script Rune Knight Staff 83,2,2,{
+gl_knt02,150,55,3 script Rune Knight Staff 4_M_01,2,2,{
mes "[Rune Knight Staff]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Welcome, "+strcharinfo(0)+". Are you going to the gathering place?";
@@ -296,7 +296,7 @@ gl_knt02,150,55,3 script Rune Knight Staff 83,2,2,{
close;
}
-job3_rune01,80,60,3 script Rune Knight Captain 470,2,2,{
+job3_rune01,80,60,3 script Rune Knight Captain 4_M_KNIGHT_SILVER,2,2,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "You've got too many things. You cannot proceed anymore. Please try again after losing some weight.";
close;
@@ -574,7 +574,7 @@ L_Warning:
return;
}
-job3_rune01,90,50,3 script Rune Knight Lunarea 469,2,2,{
+job3_rune01,90,50,3 script Rune Knight Lunarea 4_M_KNIGHT_GOLD,2,2,{
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "She holds up her chin quietly, nods lightly and notices me.";
next;
@@ -688,7 +688,7 @@ L_Test:
close;
}
-job3_rune01,55,50,3 script Rune Knight, Renoa 469,2,2,{
+job3_rune01,55,50,3 script Rune Knight, Renoa 4_M_KNIGHT_GOLD,2,2,{
mes "[Rune Knight, Renoa]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Congratulations for becoming one of us. Junior Rune Knight, "+strcharinfo(0)+".";
@@ -904,7 +904,7 @@ job3_rune01,55,50,3 script Rune Knight, Renoa 469,2,2,{
close;
}
-job3_rune01,58,51,1 script Rune Furnace 844,{
+job3_rune01,58,51,1 script Rune Furnace CLEAR_NPC,{
if (job_rune_edq < 15) {
mes "[Rune Knight Renoa]";
mes "You don't want to touch that thing. Believe me, I'm not kidding.";
@@ -976,7 +976,7 @@ job3_rune01,58,51,1 script Rune Furnace 844,{
close;
}
-job3_rune01,40,54,1 script Runes and Rune Knights 844,{
+job3_rune01,40,54,1 script Runes and Rune Knights CLEAR_NPC,{
if (job_rune_edq < 8) {
mes "[Rune Knight Renoa]";
mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1035,7 +1035,7 @@ job3_rune01,40,54,1 script Runes and Rune Knights 844,{
}
}
-job3_rune01,43,44,1 script The Principles of Runes 844,{
+job3_rune01,43,44,1 script The Principles of Runes CLEAR_NPC,{
if (job_rune_edq < 8) {
mes "[Rune Knight Renoa]";
mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1082,7 +1082,7 @@ job3_rune01,43,44,1 script The Principles of Runes 844,{
}
}
-job3_rune01,50,36,1 script Runes, Make & Use 844,{
+job3_rune01,50,36,1 script Runes, Make & Use CLEAR_NPC,{
if (job_rune_edq < 8) {
mes "[Rune Knight Renoa]";
mes "Besides touching stuff in this place without permission. Would you be able to understand the contents of the book?";
@@ -1181,7 +1181,7 @@ job3_rune01,50,36,1 script Runes, Make & Use 844,{
}
}
-mid_camp,238,250,3 script Rune Knight Sage Guard 468,2,2,{
+mid_camp,238,250,3 script Rune Knight Sage Guard 4_M_KNIGHT_BLACK,2,2,{
mes "[Rune Knight Sage Guard]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "The sage Serpeone is the one who has been with us since the beginning of the Rune Knights.";
@@ -1208,7 +1208,7 @@ mid_camp,238,250,3 script Rune Knight Sage Guard 468,2,2,{
close;
}
-mid_camp,13,138,3 script Dispatched Rune Knight#1 83,2,2,{
+mid_camp,13,138,3 script Dispatched Rune Knight#1 4_M_01,2,2,{
mes "[Dispatched Rune Knight]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Thanks for your work. We will continue our mission for the Rune Knight testers.";
@@ -1236,9 +1236,9 @@ mid_camp,13,138,3 script Dispatched Rune Knight#1 83,2,2,{
mes "Shh... Our mission is not something to be revealed to the public. Please just move along.";
close;
}
-spl_fild01,361,327,3 duplicate(Dispatched Rune Knight#1) Dispatched Rune Knight#2 83,2,2
+spl_fild01,361,327,3 duplicate(Dispatched Rune Knight#1) Dispatched Rune Knight#2 4_M_01,2,2
-spl_fild02,13,241,0 script #Barricade1 139,10,10,{
+spl_fild02,13,241,0 script #Barricade1 HIDDEN_WARP_NPC,10,10,{
end;
OnTouch:
if (job_rune_edq > 0 && job_rune_edq < 23) {
@@ -1256,7 +1256,7 @@ OnTouch:
end;
}
-mid_camp,235,250,3 script Sage Serpeone 435,2,2,{
+mid_camp,235,250,3 script Sage Serpeone 4_F_FAIRY,2,2,{
mes "[Sage Serpeone]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Finally you are an honorable Rune Knight. I'm happy to help you.";
@@ -1420,7 +1420,7 @@ mid_camp,235,250,3 script Sage Serpeone 435,2,2,{
close;
}
-job3_rune01,114,50,3 script Rune Knight Velpino 468,{
+job3_rune01,114,50,3 script Rune Knight Velpino 4_M_KNIGHT_BLACK,{
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "[Rune Knight Velpino]";
mes "You still smell like a fledging. Bring honor to the Rune Knights and raise your power...";
@@ -1554,7 +1554,7 @@ job3_rune01,114,50,3 script Rune Knight Velpino 468,{
close;
}
-job3_rune02,38,40,0 script #RK Test Hidden Portal 1 139,15,15,{
+job3_rune02,38,40,0 script #RK Test Hidden Portal 1 HIDDEN_WARP_NPC,15,15,{
end;
OnEnable:
enablenpc "#RK Test Hidden Portal 1";
@@ -1588,7 +1588,7 @@ OnTouch:
}
}
-job3_rune02,1,1,0 script job_rune_edq#1st_tb 139,{
+job3_rune02,1,1,0 script job_rune_edq#1st_tb HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#1st_tb";
@@ -1617,7 +1617,7 @@ OnTimer14000:
end;
}
-job3_rune02,1,2,0 script job_rune_edq#1st_tc 139,{
+job3_rune02,1,2,0 script job_rune_edq#1st_tc HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#1st_tc";
@@ -1653,7 +1653,7 @@ OnTimer305000:
end;
}
-job3_rune02,3,10,0 script job_rune_edq#1st_tcmc 139,{
+job3_rune02,3,10,0 script job_rune_edq#1st_tcmc HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#1st_tcmc";
@@ -1706,7 +1706,7 @@ OnMyMobDead:
end;
}
-job3_rune02,3,11,0 script job_rune_edq#1st_tcmc2 139,{
+job3_rune02,3,11,0 script job_rune_edq#1st_tcmc2 HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#1st_tcmc2";
@@ -1756,7 +1756,7 @@ OnMyMobDead:
end;
}
-job3_rune02,1,10,0 script job_rune_edq#1st_tcnc 139,{
+job3_rune02,1,10,0 script job_rune_edq#1st_tcnc HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#1st_tcnc";
@@ -1802,7 +1802,7 @@ OnTimer60000:
end;
}
-job3_rune02,34,46,5 script Captain Tigris#jrt1 470,2,2,{
+job3_rune02,34,46,5 script Captain Tigris#jrt1 4_M_KNIGHT_SILVER,2,2,{
if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
donpcevent "job_rune_edq#1st_tcnc::OnUse";
end;
@@ -1848,7 +1848,7 @@ OnTimer5000:
end;
}
-job3_rune02,43,46,3 script Rune Knight Lunarea#jrt1 469,2,2,{
+job3_rune02,43,46,3 script Rune Knight Lunarea#jrt1 4_M_KNIGHT_GOLD,2,2,{
if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
donpcevent "job_rune_edq#1st_tcnc::OnUse";
end;
@@ -1893,7 +1893,7 @@ OnTimer5000:
end;
}
-job3_rune02,43,34,1 script Rune Knight Renoa#jrt1 469,2,2,{
+job3_rune02,43,34,1 script Rune Knight Renoa#jrt1 4_M_KNIGHT_GOLD,2,2,{
if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
donpcevent "job_rune_edq#1st_tcnc::OnUse";
end;
@@ -1939,7 +1939,7 @@ OnTimer5000:
end;
}
-job3_rune02,34,34,7 script Rune Knight Velpino#jrt1 468,2,2,{
+job3_rune02,34,34,7 script Rune Knight Velpino#jrt1 4_M_KNIGHT_BLACK,2,2,{
if (job_rune_edq != 4 || $@job_rune_test2 != 0) {
donpcevent "job_rune_edq#1st_tcnc::OnUse";
end;
@@ -1984,7 +1984,7 @@ OnTimer5000:
end;
}
-job3_rune02,2,1,0 script job_rune_edq#3rd_tb 139,{
+job3_rune02,2,1,0 script job_rune_edq#3rd_tb HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#3rd_tb";
@@ -2013,7 +2013,7 @@ OnTimer14000:
end;
}
-job3_rune02,2,2,0 script job_rune_edq#3rd_tc 139,{
+job3_rune02,2,2,0 script job_rune_edq#3rd_tc HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#3rd_tc";
@@ -2050,7 +2050,7 @@ OnTimer482000:
end;
}
-job3_rune02,2,3,0 script job_rune_edq#3rd_tc1 139,{
+job3_rune02,2,3,0 script job_rune_edq#3rd_tc1 HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#3rd_tc1";
@@ -2074,7 +2074,7 @@ OnMyMobDead:
end;
}
-job3_rune02,2,4,0 script job_rune_edq#3rd_tc2 139,{
+job3_rune02,2,4,0 script job_rune_edq#3rd_tc2 HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#3rd_tc2";
@@ -2098,7 +2098,7 @@ OnMyMobDead:
end;
}
-job3_rune02,2,5,0 script job_rune_edq#3rd_tc3 139,{
+job3_rune02,2,5,0 script job_rune_edq#3rd_tc3 HIDDEN_WARP_NPC,{
end;
OnInit:
disablenpc "job_rune_edq#3rd_tc3";
@@ -2134,7 +2134,7 @@ OnMyMobDead:
end;
}
-sec_in02,34,167,3 script R.Knight Job Manager 470,1,1,{
+sec_in02,34,167,3 script R.Knight Job Manager 4_M_KNIGHT_SILVER,1,1,{
callfunc "F_GM_NPC";
mes "Enter the Password.";
next;
@@ -2154,4 +2154,4 @@ sec_in02,34,167,3 script R.Knight Job Manager 470,1,1,{
}
close;
}
-job3_rune01,1,1,3 duplicate(R.Knight Job Manager) #renshucheck 844
+job3_rune01,1,1,3 duplicate(R.Knight Job Manager) #renshucheck CLEAR_NPC
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index 263ccd9b0..0efc323c8 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -66,9 +66,9 @@ OnTouch:
}
end;
}
-//morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1
-morocc,95,132,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1
-splendide,141,284,0 duplicate(#distorted_space_) #distorted_space_2 139,1,1
+//morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 HIDDEN_WARP_NPC,1,1
+morocc,95,132,0 duplicate(#distorted_space_) #distorted_space_1 HIDDEN_WARP_NPC,1,1
+splendide,141,284,0 duplicate(#distorted_space_) #distorted_space_2 HIDDEN_WARP_NPC,1,1
function script F_Warlock {
mes "[Assistant]";
@@ -203,7 +203,7 @@ function script F_Warlock {
end;
}
-spl_in02,77,107,5 script Assistant#Warlock1 446,{
+spl_in02,77,107,5 script Assistant#Warlock1 4_M_FAIRYKID5,{
if (job_wl == 0) {
callfunc "F_Warlock";
end;
@@ -321,7 +321,7 @@ L_Quest:
return;
}
-spl_in02,60,231,5 script Yoop#Warlock 446,{
+spl_in02,60,231,5 script Yoop#Warlock 4_M_FAIRYKID5,{
mes "[Yoop]";
if (job_wl < 4) {
mes "Who are you?";
@@ -450,7 +450,7 @@ spl_in02,60,231,5 script Yoop#Warlock 446,{
}
}
-spl_in02,84,103,3 script Assistant#Warlock2 439,{
+spl_in02,84,103,3 script Assistant#Warlock2 4_F_FAIRYKID4,{
if (job_wl == 0) {
callfunc "F_Warlock";
end;
@@ -541,7 +541,7 @@ spl_in02,84,103,3 script Assistant#Warlock2 439,{
}
}
-spl_in02,78,110,5 script Assistant#Warlock3 437,{
+spl_in02,78,110,5 script Assistant#Warlock3 4_F_FAIRYKID2,{
if (job_wl == 0) {
callfunc "F_Warlock";
end;
@@ -568,7 +568,7 @@ spl_in02,78,110,5 script Assistant#Warlock3 437,{
}
}
-spl_in02,80,108,5 script Guild Master#Warlock 465,{
+spl_in02,80,108,5 script Guild Master#Warlock 4_F_FAIRY1,{
if (job_wl == 0) {
callfunc "F_Warlock";
end;
@@ -710,14 +710,14 @@ spl_in02,80,108,5 script Guild Master#Warlock 465,{
}
}
-job3_war01,22,22,7 script Yoop#WRR 439,{
+job3_war01,22,22,7 script Yoop#WRR 4_F_FAIRYKID4,{
mes "[Yoop]";
mes "If you ask Ebein to be sent to the magical room, he would send you there.";
mes "Wait in the queue to enter the Chamber of Magic.";
close;
}
-job3_war01,29,25,0 script Ebein#WRR 437,{
+job3_war01,29,25,0 script Ebein#WRR 4_F_FAIRYKID2,{
mes "[Ebein]";
mes "Would you like to take a test?";
mes "If you stand by in the waiting room, you'll be able to go into the Chamber of Magic.";
@@ -742,7 +742,7 @@ job3_war01,29,25,0 script Ebein#WRR 437,{
}
}
-job3_war01,29,25,5 script The chamber of magic#1 437,{
+job3_war01,29,25,5 script The chamber of magic#1 4_F_FAIRYKID2,{
end;
OnInit:
disablenpc "The chamber of magic#1";
@@ -1054,7 +1054,7 @@ OnTimer6000:
end;
}
-job3_war01,1,2,0 script Button Girl#wl 66,{
+job3_war01,1,2,0 script Button Girl#wl 1_F_01,{
callfunc "F_GM_NPC";
switch(select("Open Arena:Close Arena:Open the Chamber of Magic:Close the Chamber of Magic:Hollow Stone On:Hollow Stone Off:Cancel")) {
case 1:
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index 44124a1d8..21dfc943a 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -15,7 +15,7 @@
//= 1.3a Moved warps to separate file. [Euphy]
//============================================================
-alde_alche,35,186,5 script Alchemist Union Member 805,{
+alde_alche,35,186,5 script Alchemist Union Member 1_M_SIGNALCHE,{
mes "[Alchemist Union Member]";
if (BaseLevel > 98 && JobLevel > 49){
if (BaseJob == Job_Alchemist) {
@@ -83,7 +83,7 @@ alde_alche,35,186,5 script Alchemist Union Member 805,{
close;
}
-job3_gen01,25,58,3 script Devries#gen 865,{
+job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{
if (SkillPoint != 0) {
mes "- You still have some unused skill points. -";
close;
@@ -573,7 +573,7 @@ job3_gen01,25,58,3 script Devries#gen 865,{
close;
}
-job3_gen01,83,72,3 script Delivery Box#generic 111,{
+job3_gen01,83,72,3 script Delivery Box#generic HIDDEN_NPC,{
mes "- There's a big box. -";
if (job_gen == 2) {
next;
@@ -602,7 +602,7 @@ job3_gen01,83,72,3 script Delivery Box#generic 111,{
close;
}
-job3_gen01,12,56,3 script Plant Guide#generic 111,{
+job3_gen01,12,56,3 script Plant Guide#generic HIDDEN_NPC,{
mes "<The Easiest Alchemy in the World>";
mes "Written by Bob Ross.";
next;
@@ -666,32 +666,32 @@ function script Genetic_Job_Plant {
close;
}
-job3_gen01,36,55,3 script Bigibigi Grass#gen 844,{
+job3_gen01,36,55,3 script Bigibigi Grass#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2209,"Bigibigi Grass","The size is quite big to be normal grass so it's called Bigibigi Grass.";
end;
}
-job3_gen01,36,45,3 script Muka Tree#gen 844,{
+job3_gen01,36,45,3 script Muka Tree#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2210,"Muka Tree","This is the Muka Tree which protects its delicate inside with sharp thorns.",1;
end;
}
-job3_gen01,42,55,3 script Bogi Vine#gen 844,{
+job3_gen01,42,55,3 script Bogi Vine#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2211,"Bogi Vine","This is a Bogi Vine which has a very fast growth speed.",1;
end;
}
-job3_gen01,30,58,3 script Aolatura#gen 844,{
+job3_gen01,30,58,3 script Aolatura#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2212,"Aolatura","This is known to blossom then thousand flowers as it only blooms once per lifetime.";
end;
}
-job3_gen01,30,63,3 script Congra#gen 844,{
+job3_gen01,30,63,3 script Congra#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2213,"Congra","It's a plant that has a big and solid stem with enormous leaves.";
end;
}
-job3_gen01,32,38,3 script Sticky Grass#gen 844,{
+job3_gen01,32,38,3 script Sticky Grass#gen CLEAR_NPC,{
callfunc "Genetic_Job_Plant",2214,"Sticky Grass","I may not know the name but it's sticky and can stick to just about anything.";
end;
}
-job3_gen01,7,50,3 script Testing Table#gen 844,{
+job3_gen01,7,50,3 script Testing Table#gen CLEAR_NPC,{
if (job_gen == 7) {
mes "- This is a testing table with a lot of equipment. I think I can study the combinations here with plants. -";
next;
@@ -771,11 +771,11 @@ job3_gen01,7,50,3 script Testing Table#gen 844,{
close;
}
-job3_gen01,21,67,3 script Super Cultivator#gen 844,{
+job3_gen01,21,67,3 script Super Cultivator#gen CLEAR_NPC,{
end;
}
-job3_gen01,91,48,3 script Demi Calberine#gen 982,{
+job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{
mes "[Demi Calberine]";
if (job_gen < 62) {
mes "Hmm~ Where'd that bolt go?";
@@ -967,15 +967,15 @@ OnTimer7000:
stopnpctimer;
end;
}
-job3_gen01,84,45,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen1 111
-job3_gen01,77,41,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen2 111
-job3_gen01,78,57,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen3 111
-job3_gen01,89,59,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen4 111
-job3_gen01,90,51,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen5 111
-job3_gen01,83,27,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen6 111
-job3_gen01,74,45,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen7 111
+job3_gen01,84,45,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen1 HIDDEN_NPC
+job3_gen01,77,41,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen2 HIDDEN_NPC
+job3_gen01,78,57,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen3 HIDDEN_NPC
+job3_gen01,89,59,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen4 HIDDEN_NPC
+job3_gen01,90,51,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen5 HIDDEN_NPC
+job3_gen01,83,27,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen6 HIDDEN_NPC
+job3_gen01,74,45,3 duplicate(Scattered Stuff#gen) Scattered Stuff#gen7 HIDDEN_NPC
-job3_gen01,18,39,3 script Warning#gen 837,{
+job3_gen01,18,39,3 script Warning#gen 2_BULLETIN_BOARD,{
mes "= Warning =";
mes "If you bully my spores, I'll scream!!!";
if (job_gen < 75) close;
@@ -992,30 +992,30 @@ job3_gen01,18,39,3 script Warning#gen 837,{
}
}
-job3_gen01,80,12,1 script Stacked Magazines#gen 111,{
+job3_gen01,80,12,1 script Stacked Magazines#gen HIDDEN_NPC,{
mes "- 'Monthly Bang!' magazines are piled up in disorder. -";
close;
}
-job3_gen01,83,20,1 script Bed#gen 111,{
+job3_gen01,83,20,1 script Bed#gen HIDDEN_NPC,{
mes "- A checker patterned blanket set which looks like it was picked carefully is too good for this dirty bed. -";
close;
}
-job3_gen01,85,25,1 script Opened Book#gen 111,{
+job3_gen01,85,25,1 script Opened Book#gen HIDDEN_NPC,{
mes "< Do you want to have my pretty room? Do you have enough zeny? Is there enough room? Run to the Lighthalzen Department Store right away and get the most high-end wall papers and interior accessories! >";
next;
mes "< Luxurious candles that'll lighten up your room, a huge golden mirror that every lady owns, you cannot miss any of them! >";
close;
}
-job3_gen01,81,81,0 script #dbroom 139,2,2,{
+job3_gen01,81,81,0 script #dbroom HIDDEN_WARP_NPC,2,2,{
OnTouch:
mes "- It's a room that looks like a storehouse, thanks to so many parcels piled up in the room. -";
close;
}
-job3_gen01,24,32,0 script The gaze of Devries 139,2,2,{
+job3_gen01,24,32,0 script The gaze of Devries HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (checkquest(2223,HUNTING) == 2) {
mapannounce "job3_gen01","Devries: Whoa? Was there a lost kitty in the spore pen?",bc_map,"0x99CC00"; //FW_NORMAL 12 0 0
diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt
index 5ddb5bf5d..8b9288ad6 100644
--- a/npc/re/jobs/3-2/minstrel.txt
+++ b/npc/re/jobs/3-2/minstrel.txt
@@ -14,7 +14,7 @@
//= 1.3 Updated script. [Euphy]
//============================================================
-alberta,196,133,4 script Bard#job_min 486,{
+alberta,196,133,4 script Bard#job_min 4_M_BARD,{
if (job_min == 0) {
if (BaseJob == Job_Bard && BaseLevel > 98 && JobLevel > 49) {
mes "[Bard]";
@@ -237,7 +237,7 @@ alberta,196,133,4 script Bard#job_min 486,{
close;
}
-prontera,141,97,4 script Warmhearted woman 701,{
+prontera,141,97,4 script Warmhearted woman 4_F_GODEMOM,{
mes "[Warmhearted woman]";
if (job_min == 1) {
mes "Maestro Song?";
@@ -268,7 +268,7 @@ prontera,141,97,4 script Warmhearted woman 701,{
close;
}
-prontera,140,331,6 script Glasses-wearing Man 883,{
+prontera,140,331,6 script Glasses-wearing Man 4_M_ALCHE_D,{
mes "[Glasses-wearing Man]";
if (job_min == 2) {
mes "You mean Maestro Song?";
@@ -301,7 +301,7 @@ prontera,140,331,6 script Glasses-wearing Man 883,{
close;
}
-prontera,146,218,4 script Woman#job_min 90,{
+prontera,146,218,4 script Woman#job_min 4_F_01,{
if (job_min == 3) {
mes "[Woman]";
mes "Do you know who Maestro Song is?";
@@ -340,7 +340,7 @@ prontera,146,218,4 script Woman#job_min 90,{
close;
}
-airplane,222,67,6 script Karian#job_min1 486,{
+airplane,222,67,6 script Karian#job_min1 4_M_BARD,{
mes "[Karian]";
mes "Yup!!!!!!!!!!!!!!!!!!";
next;
@@ -360,7 +360,7 @@ airplane,222,67,6 script Karian#job_min1 486,{
close;
}
-hu_in01,267,5,3 script Karian#job_min2 486,{
+hu_in01,267,5,3 script Karian#job_min2 4_M_BARD,{
mes "[Karian]";
if (job_min == 6) {
mes "Eeeeh it's so painful.";
@@ -485,7 +485,7 @@ hu_in01,267,5,3 script Karian#job_min2 486,{
close;
}
-hu_in01,361,103,3 script Tone-deaf person 995,{
+hu_in01,361,103,3 script Tone-deaf person 4_M_CASMAN1,{
if (job_min == 7) {
mes "[Tone-deaf person]";
mes "Lala~ lala~";
@@ -705,7 +705,7 @@ hu_in01,361,103,3 script Tone-deaf person 995,{
close;
}
-tha_scene01,140,200,0 script #min_receipt 139,3,3,{
+tha_scene01,140,200,0 script #min_receipt HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (job_min == 10 || (job_min == 11 && countitem(6271) == 0)) {
mes "-There is a piece of paper on the ground.-";
@@ -747,7 +747,7 @@ OnTouch:
end;
}
-tha_scene01,139,204,6 script Karian#cmd1 486,{
+tha_scene01,139,204,6 script Karian#cmd1 4_M_BARD,{
end;
OnInit:
disablenpc "Karian#cmd1";
@@ -766,7 +766,7 @@ OnTimer15000:
end;
}
-ve_fild07,129,132,5 script Karian#cmd5 486,{
+ve_fild07,129,132,5 script Karian#cmd5 4_M_BARD,{
end;
OnInit:
disablenpc "Karian#cmd5";
@@ -785,7 +785,7 @@ OnTimer30000:
end;
}
-prontera,155,49,4 script Karian#cmd9 486,{
+prontera,155,49,4 script Karian#cmd9 4_M_BARD,{
end;
OnInit:
disablenpc "Karian#cmd9";
@@ -804,7 +804,7 @@ OnTimer300000:
end;
}
-yuno,146,168,0 script Karian#cmd2 486,{
+yuno,146,168,0 script Karian#cmd2 4_M_BARD,{
end;
OnInit:
disablenpc strnpcinfo(0);
@@ -822,13 +822,13 @@ OnTimer100000:
stopnpctimer;
end;
}
-lighthalzen,160,124,6 duplicate(Karian#cmd2) Karian#cmd3 486
-ra_in01,357,128,0 duplicate(Karian#cmd2) Karian#cmd4 486
-comodo,184,109,0 duplicate(Karian#cmd2) Karian#cmd6 486
-moc_fild16,204,231,0 duplicate(Karian#cmd2) Karian#cmd7 486
-aldebaran,142,128,2 duplicate(Karian#cmd2) Karian#cmd8 486
+lighthalzen,160,124,6 duplicate(Karian#cmd2) Karian#cmd3 4_M_BARD
+ra_in01,357,128,0 duplicate(Karian#cmd2) Karian#cmd4 4_M_BARD
+comodo,184,109,0 duplicate(Karian#cmd2) Karian#cmd6 4_M_BARD
+moc_fild16,204,231,0 duplicate(Karian#cmd2) Karian#cmd7 4_M_BARD
+aldebaran,142,128,2 duplicate(Karian#cmd2) Karian#cmd8 4_M_BARD
-yuno,143,170,6 script Mr. Click#job_min 748,{
+yuno,143,170,6 script Mr. Click#job_min 4_M_ALCHE_A,{
mes "[Mr. Click]";
if (job_min == 11) {
mes "Hi~ welcome~";
@@ -952,7 +952,7 @@ yuno,143,170,6 script Mr. Click#job_min 748,{
close;
}
-lighthalzen,155,119,3 script Little girl#job_min 891,3,3,{
+lighthalzen,155,119,3 script Little girl#job_min 4_F_HUGIRL,3,3,{
OnTouch:
if (checkquest(11145,HUNTING) == 2) {
if (job_min == 12) {
@@ -1082,7 +1082,7 @@ OnTouch:
close;
}
-ice_dun01,157,15,0 script #Minsicecave1 139,2,2,{
+ice_dun01,157,15,0 script #Minsicecave1 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-A long time ago-";
@@ -1093,7 +1093,7 @@ OnTouch:
end;
}
-ice_dun01,157,23,0 script #Minsicecave2 139,2,2,{
+ice_dun01,157,23,0 script #Minsicecave2 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-The giant born to ice-";
@@ -1104,7 +1104,7 @@ OnTouch:
end;
}
-ice_dun01,141,41,0 script #Minsicecave3 139,2,2,{
+ice_dun01,141,41,0 script #Minsicecave3 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-died-";
@@ -1115,7 +1115,7 @@ OnTouch:
end;
}
-ice_dun01,120,35,0 script #Minsicecave4 139,2,2,{
+ice_dun01,120,35,0 script #Minsicecave4 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His body became the ground-";
@@ -1126,7 +1126,7 @@ OnTouch:
end;
}
-ice_dun01,104,30,0 script #Minsicecave5 139,2,2,{
+ice_dun01,104,30,0 script #Minsicecave5 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His bones became a mountain-";
@@ -1137,7 +1137,7 @@ OnTouch:
end;
}
-ice_dun01,86,23,0 script #Minsicecave6 139,2,2,{
+ice_dun01,86,23,0 script #Minsicecave6 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His skin became soil-";
@@ -1148,7 +1148,7 @@ OnTouch:
end;
}
-ice_dun01,75,19,0 script #Minsicecave7 139,2,2,{
+ice_dun01,75,19,0 script #Minsicecave7 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His blood became a river-";
@@ -1159,7 +1159,7 @@ OnTouch:
end;
}
-ice_dun01,56,12,0 script #Minsicecave8 139,2,2,{
+ice_dun01,56,12,0 script #Minsicecave8 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His hair became a plant-";
@@ -1170,7 +1170,7 @@ OnTouch:
end;
}
-ice_dun01,29,26,0 script #Minsicecave9 139,2,2,{
+ice_dun01,29,26,0 script #Minsicecave9 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His head became the sky-";
@@ -1181,7 +1181,7 @@ OnTouch:
end;
}
-ice_dun01,25,46,0 script #Minsicecave10 139,2,2,{
+ice_dun01,25,46,0 script #Minsicecave10 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-His tears from his-";
@@ -1192,7 +1192,7 @@ OnTouch:
end;
}
-ice_dun01,20,66,0 script #Minsicecave11 139,2,2,{
+ice_dun01,20,66,0 script #Minsicecave11 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-eyes became dew-";
@@ -1203,7 +1203,7 @@ OnTouch:
end;
}
-ice_dun01,22,85,0 script #Minsicecave12 139,2,2,{
+ice_dun01,22,85,0 script #Minsicecave12 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 13) {
mes "-on the leaves-";
@@ -1217,7 +1217,7 @@ OnTouch:
end;
}
-ra_in01,361,129,0 script #jmRachelHotel 139,2,2,{
+ra_in01,361,129,0 script #jmRachelHotel HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 14) {
mes "[Old Woman]";
@@ -1232,7 +1232,7 @@ OnTouch:
end;
}
-ra_in01,358,130,4 script Old Woman#job_min 979,{
+ra_in01,358,130,4 script Old Woman#job_min 4_F_CAVE1,{
mes "[Old Woman]";
if (job_min == 14) {
mes "Huu!!";
@@ -1329,7 +1329,7 @@ ra_in01,358,130,4 script Old Woman#job_min 979,{
close;
}
-ve_fild07,131,132,5 script =Notice=#job_min 837,{
+ve_fild07,131,132,5 script =Notice=#job_min 2_BULLETIN_BOARD,{
function Choice;
if (job_min == 16) {
mes "===Notice===";
@@ -1468,7 +1468,7 @@ function Choice;
}
}
-comodo,184,108,0 script #jmComodo Almost Dead 139,2,2,{
+comodo,184,108,0 script #jmComodo Almost Dead HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 17) {
mes "["+strcharinfo(0)+"]";
@@ -1508,7 +1508,7 @@ OnTouch:
end;
}
-comodo,192,119,0 script Kayak Master#job_min 98,{
+comodo,192,119,0 script Kayak Master#job_min 4W_M_02,{
mes "[Kayak Master]";
if (job_min == 18) {
mes "What?";
@@ -1533,7 +1533,7 @@ comodo,192,119,0 script Kayak Master#job_min 98,{
close;
}
-comodo,159,316,4 script Woman Roasting Meat 701,{
+comodo,159,316,4 script Woman Roasting Meat 4_F_GODEMOM,{
mes "[Woman Roasting Meat]";
if (job_min == 19) {
mes "Maestro Song?";
@@ -1577,7 +1577,7 @@ comodo,159,316,4 script Woman Roasting Meat 701,{
close;
}
-moc_fild16,206,232,0 script #jmTransfer news 139,3,3,{
+moc_fild16,206,232,0 script #jmTransfer news HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (job_min == 20) {
mes "["+strcharinfo(0)+"]";
@@ -1653,7 +1653,7 @@ OnTouch:
end;
}
-aldebaran,140,130,0 script #jmAldebaran Clock Tower 139,3,3,{
+aldebaran,140,130,0 script #jmAldebaran Clock Tower HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (job_min == 21) {
mes "["+strcharinfo(0)+"]";
@@ -1718,7 +1718,7 @@ OnTouch:
end;
}
-prontera,155,40,0 script #jmprt1 139,2,2,{
+prontera,155,40,0 script #jmprt1 HIDDEN_WARP_NPC,2,2,{
OnTouch:
if (job_min == 22) {
mes "[Karian]";
@@ -1736,7 +1736,7 @@ OnTouch:
end;
}
-prontera,155,42,0 script #prtjm1 139,1,1,{
+prontera,155,42,0 script #prtjm1 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job_min == 23) {
mes "-Let me go back to my hometown.-";
@@ -1748,7 +1748,7 @@ OnTouch:
end;
}
-prontera,155,44,0 script #prtjm2 139,1,1,{
+prontera,155,44,0 script #prtjm2 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job_min == 24) {
mes "-There are many beautiful flowers.-";
@@ -1760,7 +1760,7 @@ OnTouch:
end;
}
-prontera,155,46,0 script #prtjm3 139,1,1,{
+prontera,155,46,0 script #prtjm3 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job_min == 25) {
mes "-The birds sing for me.-";
@@ -1772,7 +1772,7 @@ OnTouch:
end;
}
-prontera,155,48,0 script #prtjm4 139,1,1,{
+prontera,155,48,0 script #prtjm4 HIDDEN_WARP_NPC,1,1,{
OnTouch:
if (job_min == 26 || job_min == 27) {
mes "-It's this old town.-";
@@ -1822,7 +1822,7 @@ OnTouch:
end;
}
-prt_in,94,172,4 script Karian#job_min3 480,{
+prt_in,94,172,4 script Karian#job_min3 4_M_MINSTREL1,{
if (job_min == 27) {
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) {
mes "While you are on a trip, you gain lots of stuff. Make yourself lighter.";
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index f98861461..82632ed36 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -13,7 +13,7 @@
//= 1.2 Added GM management function. [Euphy]
//============================================================
-prt_castle,48,161,3 script Middle-aged Gentleman#rg 57,{
+prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "- Your pack is too heavy. -";
mes "- Lighten your body first -";
@@ -333,7 +333,7 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 57,{
}
}
-glast_01,240,366,5 script Memory of King Schmidtz 844,{
+glast_01,240,366,5 script Memory of King Schmidtz CLEAR_NPC,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "- Your pack is too heavy. -";
mes "- Lighten your body first -";
@@ -434,7 +434,7 @@ glast_01,240,366,5 script Memory of King Schmidtz 844,{
end;
}
-gl_church,173,88,0 script Delicate trace#01 844,{
+gl_church,173,88,0 script Delicate trace#01 CLEAR_NPC,{
if (job_royal == 4 && countitem(6274) == 0) {
progressbar "ffff00",5;
set .@roy_ran, rand(1,70);
@@ -464,18 +464,18 @@ OnTimer40000:
specialeffect EF_MAPPILLAR;
end;
}
-gl_church,158,103,0 duplicate(Delicate trace#01) Delicate trace#02 844
-gl_church,139,90,0 duplicate(Delicate trace#01) Delicate trace#03 844
-gl_church,126,62,0 duplicate(Delicate trace#01) Delicate trace#04 844
-gl_church,148,5,0 duplicate(Delicate trace#01) Delicate trace#05 844
-gl_church,185,72,0 duplicate(Delicate trace#01) Delicate trace#06 844
-gl_church,185,72,0 duplicate(Delicate trace#01) Delicate trace#07 844
-gl_church,211,94,0 duplicate(Delicate trace#01) Delicate trace#08 844
-gl_church,185,125,0 duplicate(Delicate trace#01) Delicate trace#09 844
-gl_church,143,125,0 duplicate(Delicate trace#01) Delicate trace#10 844
-gl_church,105,115,0 duplicate(Delicate trace#01) Delicate trace#11 844
+gl_church,158,103,0 duplicate(Delicate trace#01) Delicate trace#02 CLEAR_NPC
+gl_church,139,90,0 duplicate(Delicate trace#01) Delicate trace#03 CLEAR_NPC
+gl_church,126,62,0 duplicate(Delicate trace#01) Delicate trace#04 CLEAR_NPC
+gl_church,148,5,0 duplicate(Delicate trace#01) Delicate trace#05 CLEAR_NPC
+gl_church,185,72,0 duplicate(Delicate trace#01) Delicate trace#06 CLEAR_NPC
+gl_church,185,72,0 duplicate(Delicate trace#01) Delicate trace#07 CLEAR_NPC
+gl_church,211,94,0 duplicate(Delicate trace#01) Delicate trace#08 CLEAR_NPC
+gl_church,185,125,0 duplicate(Delicate trace#01) Delicate trace#09 CLEAR_NPC
+gl_church,143,125,0 duplicate(Delicate trace#01) Delicate trace#10 CLEAR_NPC
+gl_church,105,115,0 duplicate(Delicate trace#01) Delicate trace#11 CLEAR_NPC
-gl_church,158,100,0 script #Clue of traces 111,4,4,{
+gl_church,158,100,0 script #Clue of traces HIDDEN_NPC,4,4,{
end;
OnTouch:
if (job_royal == 4 && countitem(6274) == 0) {
@@ -496,7 +496,7 @@ OnTouch:
end;
}
-sec_in02,12,43,3 script sorcereryal 57,1,1,{
+sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{
callfunc "F_GM_NPC";
switch(select("Royal Guard:Rune Knight:Sorcerer")) {
case 1:
diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt
index 30d10abdb..201a7fb4f 100644
--- a/npc/re/jobs/3-2/shadow_chaser.txt
+++ b/npc/re/jobs/3-2/shadow_chaser.txt
@@ -14,7 +14,7 @@
//= 1.3 Updated to official script. [Euphy]
//============================================================
-morocc,156,70,3 script Girl#sc00 93,3,3,{
+morocc,156,70,3 script Girl#sc00 4_F_04,3,3,{
mes "[Girl]";
if (BaseJob == Job_Rogue) {
if (job_sha == 0) {
@@ -73,7 +73,7 @@ OnTouch:
end;
}
-in_rogue,376,100,5 script Guild Member#sc01 828,{
+in_rogue,376,100,5 script Guild Member#sc01 4_M_ROGUE,{
if (BaseJob == Job_Rogue) {
if (job_sha < 2) {
set @job_sha,0;
@@ -143,7 +143,7 @@ in_rogue,376,100,5 script Guild Member#sc01 828,{
close;
}
-in_rogue,379,99,1 script Guild Member#sc02 747,{
+in_rogue,379,99,1 script Guild Member#sc02 4_F_ROGUE,{
if (BaseJob == Job_Rogue) {
if (job_sha < 2) {
set @job_sha,1;
@@ -173,7 +173,7 @@ in_rogue,379,99,1 script Guild Member#sc02 747,{
close;
}
-in_rogue,379,101,3 script Scary Man#sc03 810,{
+in_rogue,379,101,3 script Scary Man#sc03 1_M_SIGNROGUE,{
if (job_sha == 0) {
if (BaseJob == Job_Rogue && BaseLevel > 98 && JobLevel > 49) {
mes "[Scary man]";
@@ -292,7 +292,7 @@ L_Code:
return;
}
-s_atelier,65,123,5 script Manager#sc04_prt 903,{
+s_atelier,65,123,5 script Manager#sc04_prt 4_M_KHKYEL,{
if (job_sha == 2) {
mes "[Manager]";
mes "Where's Max!?";
@@ -611,7 +611,7 @@ L_Code:
close;
}
-s_atelier,168,65,5 script Manager#sc08_ra 923,{
+s_atelier,168,65,5 script Manager#sc08_ra 4_M_DOCTOR,{
if (job_sha < 10) {
mes "[Manager]";
mes "Who are you?";
@@ -883,7 +883,7 @@ L_Code:
close;
}
-s_atelier,167,129,3 script Manager#sc06_yuno 806,{
+s_atelier,167,129,3 script Manager#sc06_yuno 1_M_SIGNART,{
if (job_sha < 19) {
mes "[Manager]";
mes "What?";
@@ -1118,7 +1118,7 @@ L_Code:
return;
}
-s_atelier,25,75,3 script Manager#sc10_lgt 899,{
+s_atelier,25,75,3 script Manager#sc10_lgt 4_M_HUMAN_02,{
if (job_sha < 26) {
mes "[Manager]";
mes "You are?";
@@ -1312,7 +1312,7 @@ s_atelier,25,75,3 script Manager#sc10_lgt 899,{
close;
}
-s_atelier,73,65,3 script Vicente#sc12_lgt 899,{
+s_atelier,73,65,3 script Vicente#sc12_lgt 4_M_HUMAN_02,{
mes "[Vicente]";
if (job_sha < 29) {
mes "If you don't have anything special to do here, you'd better leave.";
@@ -1338,7 +1338,7 @@ s_atelier,73,65,3 script Vicente#sc12_lgt 899,{
close;
}
-s_atelier,70,66,4 script Dumk#sc13_lgh 481,{
+s_atelier,70,66,4 script Dumk#sc13_lgh 4_M_SHADOWCHASER,{
if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
mes "[Dumk]";
mes "What is it?";
@@ -1668,7 +1668,7 @@ s_atelier,70,66,4 script Dumk#sc13_lgh 481,{
// Flames
//============================================================
-tur_dun03,38,209,1 script Blue Flame#sc_f01 802,{
+tur_dun03,38,209,1 script Blue Flame#sc_f01 4_NFWISP,{
if (job_sha == 5) {
mes "A blue flame is roaring.";
mes "The deciphered code means...";
@@ -1753,7 +1753,7 @@ tur_dun03,38,209,1 script Blue Flame#sc_f01 802,{
close;
}
-ice_dun02,206,223,1 script Red Flame#sc_f02 802,{
+ice_dun02,206,223,1 script Red Flame#sc_f02 4_NFWISP,{
if (job_sha < 11) {
mes "An unknown red flame is roaring.";
close;
@@ -1817,7 +1817,7 @@ ice_dun02,206,223,1 script Red Flame#sc_f02 802,{
close;
}
-niflheim,230,276,1 script Red Flame#sc_f03 802,{
+niflheim,230,276,1 script Red Flame#sc_f03 4_NFWISP,{
if (job_sha < 21) {
mes "That's a mysterious flame.";
mes "It looks like cursing.";
@@ -1920,7 +1920,7 @@ niflheim,230,276,1 script Red Flame#sc_f03 802,{
// Boxes
//============================================================
-job3_sha01,22,78,0 script ????#keybox01 844,{
+job3_sha01,22,78,0 script ????#keybox01 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You can't continue on in this quest because you are overweight. -";
close;
@@ -1990,7 +1990,7 @@ job3_sha01,22,78,0 script ????#keybox01 844,{
close;
}
-job3_sha01,25,28,0 script ????#keybox02 844,{
+job3_sha01,25,28,0 script ????#keybox02 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You can't continue on in this quest because you are overweight. -";
close;
@@ -2069,7 +2069,7 @@ job3_sha01,25,28,0 script ????#keybox02 844,{
end;
}
-job3_sha01,73,80,0 script ????#keybox03 844,{
+job3_sha01,73,80,0 script ????#keybox03 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You can't continue on in this quest because you are overweight. -";
close;
@@ -2206,7 +2206,7 @@ job3_sha01,73,80,0 script ????#keybox03 844,{
end;
}
-job3_sha01,71,27,0 script ????#keybox04 844,{
+job3_sha01,71,27,0 script ????#keybox04 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You can't continue on in this quest because you are overweight. -";
close;
@@ -2267,7 +2267,7 @@ job3_sha01,71,27,0 script ????#keybox04 844,{
// Brush Shops
//============================================================
-s_atelier,29,119,3 script Max#sc05_prt 97,{
+s_atelier,29,119,3 script Max#sc05_prt 4W_M_01,{
mes "[Max]";
mes "Welcome~";
if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2332,7 +2332,7 @@ s_atelier,29,119,3 script Max#sc05_prt 97,{
}
}
-s_atelier,136,70,3 script Titika#sc09_ra 914,{
+s_atelier,136,70,3 script Titika#sc09_ra 4_F_CHILD,{
mes "[Titika]";
mes "Welcome.";
if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2383,7 +2383,7 @@ s_atelier,136,70,3 script Titika#sc09_ra 914,{
}
}
-s_atelier,124,128,3 script RimiGX#sc07_yuno 862,{
+s_atelier,124,128,3 script RimiGX#sc07_yuno 4_F_LGTGIRL,{
mes "[RimiGX]";
mes "Welcome.";
if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2432,7 +2432,7 @@ s_atelier,124,128,3 script RimiGX#sc07_yuno 862,{
}
}
-s_atelier,26,68,3 script Vito#sc11_lgt 904,{
+s_atelier,26,68,3 script Vito#sc11_lgt 4_M_KHMAN,{
mes "[Vito]";
mes "Welcome.";
if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) {
@@ -2483,7 +2483,7 @@ s_atelier,26,68,3 script Vito#sc11_lgt 904,{
// Warp Portal
//============================================================
-tha_t01,149,228,0 script #shadowc02 45,2,2,{
+tha_t01,149,228,0 script #shadowc02 WARPNPC,2,2,{
end;
OnTouch:
mes "You can feel weird power.";
diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt
index de934d394..af38058a3 100644
--- a/npc/re/jobs/3-2/sorcerer.txt
+++ b/npc/re/jobs/3-2/sorcerer.txt
@@ -13,7 +13,7 @@
//= 1.2 Updated script, optimized. [Euphy]
//============================================================
-gef_tower,102,34,5 script Merito 742,{
+gef_tower,102,34,5 script Merito 2_M_SAGE_B,{
mes "[Merito]";
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "You packed so much in your bag. Try again after emptying your bag.";
@@ -125,7 +125,7 @@ gef_tower,102,34,5 script Merito 742,{
}
}
-gef_tower,113,161,5 script Karacas 754,{
+gef_tower,113,161,5 script Karacas 4_M_SAGE_A,{
mes "[Karacas]";
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "Oh, it seems that you're too heavy. Empty your bag and then come again.";
@@ -412,7 +412,7 @@ gef_tower,113,161,5 script Karacas 754,{
}
close;
}
-thor_v01,64,252,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#1 836
-ice_dun01,274,274,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#2 836
-mjo_dun03,200,141,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#3 836
-gon_dun02,195,190,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#4 836 \ No newline at end of file
+thor_v01,64,252,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#1 2_BOARD2
+ice_dun01,274,274,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#2 2_BOARD2
+mjo_dun03,200,141,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#3 2_BOARD2
+gon_dun02,195,190,0 duplicate(Spirit Detecting Staff#0) Spirit Detecting Staff#4 2_BOARD2 \ No newline at end of file
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index 240b453e2..8bbc45cfe 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -14,7 +14,7 @@
//= 1.3 Added GM management function. [Euphy]
//============================================================
-ve_in,237,125,0 script King Crab#job_shu 107,{
+ve_in,237,125,0 script King Crab#job_shu 1_M_PAY_ELDER,{
if (job_shu == 0) {
mes "[King Crab]";
mes "Khh ha ha ha ha ha ha.";
@@ -155,9 +155,9 @@ ve_in,237,125,0 script King Crab#job_shu 107,{
close;
}
}
-ve_in,241,128,4 duplicate(King Crab#job_shu) Sludge Worm#job_shu 110
+ve_in,241,128,4 duplicate(King Crab#job_shu) Sludge Worm#job_shu 4_M_MINISTER
-ve_in,244,126,3 script Waitress#job_shu 69,{
+ve_in,244,126,3 script Waitress#job_shu 1_F_04,{
mes "[Waitress]";
if (job_shu == 0) {
mes "Oh no~";
@@ -192,7 +192,7 @@ ve_in,244,126,3 script Waitress#job_shu 69,{
close;
}
-ve_in,240,131,0 script ???#bcmd 484,{
+ve_in,240,131,0 script ???#bcmd 4_F_SURA,{
end;
OnInit:
disablenpc "???#bcmd";
@@ -211,7 +211,7 @@ OnTimer600000:
end;
}
-ve_in,97,149,0 script #Suraryokan 139,3,3,{
+ve_in,97,149,0 script #Suraryokan HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (job_shu == 1) {
set .@n$, "["+strcharinfo(0)+"]";
@@ -269,7 +269,7 @@ OnTouch:
end;
}
-ve_in,98,159,0 script Fighter#job_shu 484,{
+ve_in,98,159,0 script Fighter#job_shu 4_F_SURA,{
if (job_shu < 2) {
mes "[Fighter]";
mes "Ahhhh~ I'm so tired.";
@@ -431,7 +431,7 @@ ve_in,98,159,0 script Fighter#job_shu 484,{
close;
}
-yuno_fild07,254,176,7 script Buddy#job_shu 753,{
+yuno_fild07,254,176,7 script Buddy#job_shu 4_M_MONK,{
if (job_shu < 4) {
mes "[Buddy]";
mes "Haaap!!! Haaaap!!! Whoo!! Haahhp!!!";
@@ -505,7 +505,7 @@ yuno_fild07,254,176,7 script Buddy#job_shu 753,{
end;
}
-sword_1-1,223,243,4 script Drawing Room 753,{
+sword_1-1,223,243,4 script Drawing Room 4_M_MONK,{
end;
OnInit:
waitingroom "Drawing Room",20,"Drawing Room::OnStartArena",1;
@@ -524,7 +524,7 @@ OnDisable:
end;
}
-sword_1-1,223,243,4 script Buddy#job_shu_Salong 753,{
+sword_1-1,223,243,4 script Buddy#job_shu_Salong 4_M_MONK,{
mes "[Buddy]";
mes "My master doesn't like noise, so please ^f57d7dwait in the living room silently.^000000";
next;
@@ -542,7 +542,7 @@ sword_1-1,223,243,4 script Buddy#job_shu_Salong 753,{
}
}
-sword_2-1,1,1,0 script Buddy#Sura_Salon 66,{
+sword_2-1,1,1,0 script Buddy#Sura_Salon 1_F_01,{
end;
OnInit:
disablenpc "Buddy#Sura_Salon";
@@ -643,7 +643,7 @@ OnTimer320000:
end;
}
-sword_2-1,223,205,7 script Buddy#job_shuaneh 753,{
+sword_2-1,223,205,7 script Buddy#job_shuaneh 4_M_MONK,{
if (job_shu > 4) {
mes "I'll show you the way. This way.";
close2;
@@ -664,7 +664,7 @@ OnEnable:
end;
}
-sword_2-1,223,205,0 script #Sura_garajjom 139,10,10,{
+sword_2-1,223,205,0 script #Sura_garajjom HIDDEN_WARP_NPC,10,10,{
OnTouch:
warp "sword_1-1",216,168;
end;
@@ -677,7 +677,7 @@ OnEnable:
end;
}
-sword_1-1,222,169,5 script Bruno#job_shu 484,{
+sword_1-1,222,169,5 script Bruno#job_shu 4_F_SURA,{
if (job_shu > 4) {
mes "[Bruno]";
mes "Hey~ "+strcharinfo(0)+", what's up?";
@@ -742,7 +742,7 @@ sword_1-1,222,169,5 script Bruno#job_shu 484,{
end;
}
-sword_1-1,223,167,2 script Master#job_shu 483,{
+sword_1-1,223,167,2 script Master#job_shu 4_M_SURA,{
mes "[Master]";
if (job_shu == 5) {
mes "You must have bright eyes to see that you finally came to this room.";
@@ -828,7 +828,7 @@ sword_1-1,223,167,2 script Master#job_shu 483,{
end;
}
-sword_2-1,1,2,0 script Button Girl#sura 66,{
+sword_2-1,1,2,0 script Button Girl#sura 1_F_01,{
callfunc "F_GM_NPC";
switch(select("Turn on arena.:Turn off arena.:Turn on the living room.:Turn on Buddy.:Turn on Gara.:Turn off all.:Close")) {
case 1:
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index 3c6e097c6..5926b7bcb 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -15,7 +15,7 @@
//= 1.4 Updated script, optimized. [Euphy]
//============================================================
-xmas,162,209,5 script Aspiring Wanderer, Soy 714,{
+xmas,162,209,5 script Aspiring Wanderer, Soy 4_F_06,{
if (job_wan == 0) {
mes "[Soy]";
mes "Mimi, what should I do?";
@@ -109,9 +109,9 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 714,{
close;
}
}
-xmas,163,209,3 duplicate(Aspiring Wanderer, Soy) Aspiring Wanderer, Mimi 714
+xmas,163,209,3 duplicate(Aspiring Wanderer, Soy) Aspiring Wanderer, Mimi 4_F_06
-xmas,132,143,5 script Performance Manager#wnd 713,{
+xmas,132,143,5 script Performance Manager#wnd 4_M_06,{
mes "[Performance Manager]";
if (job_wan == 0) {
mes "Oh, what should I do?";
@@ -289,7 +289,7 @@ xmas,132,143,5 script Performance Manager#wnd 713,{
close;
}
-comodo,140,86,5 script Cheerless Maestro 479,{
+comodo,140,86,5 script Cheerless Maestro 4_M_MINSTREL,{
if (job_wan < 2) {
mes "[Cheerless Maestro]";
mes "You can dance ~";
@@ -558,7 +558,7 @@ comodo,140,86,5 script Cheerless Maestro 479,{
close;
}
-hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
+hu_in01,305,251,5 script Vacant Looking Lady#wnd 4_F_CAPEGIRL,{
if (job_wan < 4) {
mes "[Vacant Looking Lady]";
mes "(blank...)";
@@ -746,7 +746,7 @@ hu_in01,305,251,5 script Vacant Looking Lady#wnd 879,{
close;
}
-hu_fild05,342,130,5 script Dancer Kim#fild 879,{
+hu_fild05,342,130,5 script Dancer Kim#fild 4_F_CAPEGIRL,{
if (job_wan == 6) {
mes "[Dancer Kim]";
mes "Exercising together is good but if we compete for it, I think we'll get a better effect!";
@@ -858,18 +858,18 @@ OnTouch:
}
end;
}
-hu_fild05,81,111,0 duplicate(wandererjcq) #fildshout01 139,20,20
-hu_fild05,193,98,0 duplicate(wandererjcq) #fildshout02 139,20,20
-hu_fild05,252,74,0 duplicate(wandererjcq) #fildshout03 139,20,20
-hu_fild05,323,175,0 duplicate(wandererjcq) #fildshout04 139,20,20
-hu_fild05,334,225,0 duplicate(wandererjcq) #fildshout05 139,20,20
-hu_fild05,301,287,0 duplicate(wandererjcq) #fildshout06 139,20,20
-hu_fild05,229,315,0 duplicate(wandererjcq) #fildshout07 139,20,20
-hu_fild05,146,309,0 duplicate(wandererjcq) #fildshout08 139,20,20
-hu_fild05,80,239,0 duplicate(wandererjcq) #fildshout09 139,20,20
-hu_fild05,69,147,0 duplicate(wandererjcq) #fildshout10 139,20,20
+hu_fild05,81,111,0 duplicate(wandererjcq) #fildshout01 HIDDEN_WARP_NPC,20,20
+hu_fild05,193,98,0 duplicate(wandererjcq) #fildshout02 HIDDEN_WARP_NPC,20,20
+hu_fild05,252,74,0 duplicate(wandererjcq) #fildshout03 HIDDEN_WARP_NPC,20,20
+hu_fild05,323,175,0 duplicate(wandererjcq) #fildshout04 HIDDEN_WARP_NPC,20,20
+hu_fild05,334,225,0 duplicate(wandererjcq) #fildshout05 HIDDEN_WARP_NPC,20,20
+hu_fild05,301,287,0 duplicate(wandererjcq) #fildshout06 HIDDEN_WARP_NPC,20,20
+hu_fild05,229,315,0 duplicate(wandererjcq) #fildshout07 HIDDEN_WARP_NPC,20,20
+hu_fild05,146,309,0 duplicate(wandererjcq) #fildshout08 HIDDEN_WARP_NPC,20,20
+hu_fild05,80,239,0 duplicate(wandererjcq) #fildshout09 HIDDEN_WARP_NPC,20,20
+hu_fild05,69,147,0 duplicate(wandererjcq) #fildshout10 HIDDEN_WARP_NPC,20,20
-xmas,148,131,0 script #wandergogo 139,3,3,{
+xmas,148,131,0 script #wandergogo HIDDEN_WARP_NPC,3,3,{
OnTouch:
if (job_wan == 9) {
enablenpc "Dancer Kim#xmas";
@@ -884,7 +884,7 @@ OnTouch:
end;
}
-xmas,147,135,5 script Dancer Kim#xmas 485,{
+xmas,147,135,5 script Dancer Kim#xmas 4_F_WANDERER,{
if (job_wan == 9) {
if (BaseJob != Job_Dancer && BaseLevel < 99 && JobLevel < 50) {
mes "- You can't continue the quest because the condition for the quest is not appropriate. -";
@@ -1026,10 +1026,10 @@ OnInit:
disablenpc strnpcinfo(0);
end;
}
-xmas,149,135,3 duplicate(#wander_xmas) Guitar Song#xmas 479
-xmas,142,130,7 duplicate(#wander_xmas) Spectator#xmas1 711
-xmas,145,127,7 duplicate(#wander_xmas) Spectator#xmas2 712
-xmas,148,127,7 duplicate(#wander_xmas) Soy#xmas 714
-xmas,149,127,1 duplicate(#wander_xmas) Mimi#xmas 714
-xmas,151,127,1 duplicate(#wander_xmas) Spectator#xmas3 716
-xmas,154,129,1 duplicate(#wander_xmas) Spectator#xmas4 797 \ No newline at end of file
+xmas,149,135,3 duplicate(#wander_xmas) Guitar Song#xmas 4_M_MINSTREL
+xmas,142,130,7 duplicate(#wander_xmas) Spectator#xmas1 4_F_05
+xmas,145,127,7 duplicate(#wander_xmas) Spectator#xmas2 4_M_05
+xmas,148,127,7 duplicate(#wander_xmas) Soy#xmas 4_F_06
+xmas,149,127,1 duplicate(#wander_xmas) Mimi#xmas 4_F_06
+xmas,151,127,1 duplicate(#wander_xmas) Spectator#xmas3 4_M_KID2
+xmas,154,129,1 duplicate(#wander_xmas) Spectator#xmas4 4_M_NFLOSTMAN \ No newline at end of file
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index 95add76e2..b7a4bd492 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -77,11 +77,11 @@
close;
}
}
-new_1-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv1a 90
-new_2-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv2a 90
-new_3-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv3a 90
-new_4-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv4a 90
-new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 90
+new_1-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv1a 4_F_01
+new_2-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv2a 4_F_01
+new_3-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv3a 4_F_01
+new_4-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv4a 4_F_01
+new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 4_F_01
- script Sprakki#newbe05::NvSprakkiB -1,{
if (job_novice_q == 0) {
@@ -208,11 +208,11 @@ new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 90
end;
}
}
-new_1-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv1b 90
-new_2-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv2b 90
-new_3-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv3b 90
-new_4-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv4b 90
-new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 90
+new_1-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv1b 4_F_01
+new_2-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv2b 4_F_01
+new_3-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv3b 4_F_01
+new_4-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv4b 4_F_01
+new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01
- script Brade#newbe02::NvBradeA -1,{
if (job_novice_q < 2) {
@@ -478,11 +478,11 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 90
}
}
}
-new_1-2,100,105,3 duplicate(NvBradeA) Brade#nv1a 733
-new_2-2,100,105,3 duplicate(NvBradeA) Brade#nv2a 733
-new_3-2,100,105,3 duplicate(NvBradeA) Brade#nv3a 733
-new_4-2,100,105,3 duplicate(NvBradeA) Brade#nv4a 733
-new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 733
+new_1-2,100,105,3 duplicate(NvBradeA) Brade#nv1a 4_M_JOB_KNIGHT1
+new_2-2,100,105,3 duplicate(NvBradeA) Brade#nv2a 4_M_JOB_KNIGHT1
+new_3-2,100,105,3 duplicate(NvBradeA) Brade#nv3a 4_M_JOB_KNIGHT1
+new_4-2,100,105,3 duplicate(NvBradeA) Brade#nv4a 4_M_JOB_KNIGHT1
+new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 4_M_JOB_KNIGHT1
- script Jinha#newbe03::NvJinha -1,{
if (job_novice_q < 5) {
@@ -573,11 +573,11 @@ new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 733
close;
}
}
-new_1-2,115,120,3 duplicate(NvJinha) Jinha#nv1 59
-new_2-2,115,120,3 duplicate(NvJinha) Jinha#nv2 59
-new_3-2,115,120,3 duplicate(NvJinha) Jinha#nv3 59
-new_4-2,115,120,3 duplicate(NvJinha) Jinha#nv4 59
-new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 59
+new_1-2,115,120,3 duplicate(NvJinha) Jinha#nv1 1_M_ORIENT01
+new_2-2,115,120,3 duplicate(NvJinha) Jinha#nv2 1_M_ORIENT01
+new_3-2,115,120,3 duplicate(NvJinha) Jinha#nv3 1_M_ORIENT01
+new_4-2,115,120,3 duplicate(NvJinha) Jinha#nv4 1_M_ORIENT01
+new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01
// People/Services in Ragnarok
//============================================================
@@ -757,11 +757,11 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 59
}
}
}
-new_1-2,33,172,4 duplicate(NvChocolat) Chocolat#nv1 96
-new_2-2,33,172,4 duplicate(NvChocolat) Chocolat#nv2 96
-new_3-2,33,172,4 duplicate(NvChocolat) Chocolat#nv3 96
-new_4-2,33,172,4 duplicate(NvChocolat) Chocolat#nv4 96
-new_5-2,33,172,4 duplicate(NvChocolat) Chocolat#nv5 96
+new_1-2,33,172,4 duplicate(NvChocolat) Chocolat#nv1 4W_KID
+new_2-2,33,172,4 duplicate(NvChocolat) Chocolat#nv2 4W_KID
+new_3-2,33,172,4 duplicate(NvChocolat) Chocolat#nv3 4W_KID
+new_4-2,33,172,4 duplicate(NvChocolat) Chocolat#nv4 4W_KID
+new_5-2,33,172,4 duplicate(NvChocolat) Chocolat#nv5 4W_KID
- script Kafra Employee#newbe07::NvKafra -1,{
if (job_novice_q < 8) {
@@ -1001,11 +1001,11 @@ L_Services:
}
return;
}
-new_1-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv1 117
-new_2-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv2 117
-new_3-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv3 117
-new_4-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv4 117
-new_5-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv5 117
+new_1-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv1 4_F_KAFRA1
+new_2-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv2 4_F_KAFRA1
+new_3-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv3 4_F_KAFRA1
+new_4-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv4 4_F_KAFRA1
+new_5-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv5 4_F_KAFRA1
- script Cool Event Corp. Staff::NvCool -1,{
if (job_novice_q < 9) {
@@ -1041,11 +1041,11 @@ new_5-2,30,176,4 duplicate(NvKafra) Kafra Employee#nv5 117
close;
}
}
-new_1-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool1 874
-new_2-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool2 874
-new_3-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool3 874
-new_4-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool4 874
-new_5-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool5 874
+new_1-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool1 4_M_ZONDAMAN
+new_2-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool2 4_M_ZONDAMAN
+new_3-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool3 4_M_ZONDAMAN
+new_4-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool4 4_M_ZONDAMAN
+new_5-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool5 4_M_ZONDAMAN
- script Guide::NvGuide -1,{
if (job_novice_q < 10) {
@@ -1095,11 +1095,11 @@ new_5-2,33,176,4 duplicate(NvCool) Cool Event Corp. Staff::NvCool5 874
}
}
}
-new_1-2,36,176,4 duplicate(NvGuide) Guide#nv1 105
-new_2-2,36,176,4 duplicate(NvGuide) Guide#nv2 105
-new_3-2,36,176,4 duplicate(NvGuide) Guide#nv3 105
-new_4-2,36,176,4 duplicate(NvGuide) Guide#nv4 105
-new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 105
+new_1-2,36,176,4 duplicate(NvGuide) Guide#nv1 8W_SOLDIER
+new_2-2,36,176,4 duplicate(NvGuide) Guide#nv2 8W_SOLDIER
+new_3-2,36,176,4 duplicate(NvGuide) Guide#nv3 8W_SOLDIER
+new_4-2,36,176,4 duplicate(NvGuide) Guide#nv4 8W_SOLDIER
+new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER
// Real Combat Training
//============================================================
@@ -1309,11 +1309,11 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 105
}
}
}
-new_1-3,96,30,4 duplicate(NvBradeB) Brade#nv1b 733
-new_2-3,96,30,4 duplicate(NvBradeB) Brade#nv2b 733
-new_3-3,96,30,4 duplicate(NvBradeB) Brade#nv3b 733
-new_4-3,96,30,4 duplicate(NvBradeB) Brade#nv4b 733
-new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 733
+new_1-3,96,30,4 duplicate(NvBradeB) Brade#nv1b 4_M_JOB_KNIGHT1
+new_2-3,96,30,4 duplicate(NvBradeB) Brade#nv2b 4_M_JOB_KNIGHT1
+new_3-3,96,30,4 duplicate(NvBradeB) Brade#nv3b 4_M_JOB_KNIGHT1
+new_4-3,96,30,4 duplicate(NvBradeB) Brade#nv4b 4_M_JOB_KNIGHT1
+new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 4_M_JOB_KNIGHT1
- script Swordman Guide#newbe10::NvSwordman -1,{
if (job_novice_q < 15) {
@@ -1469,11 +1469,11 @@ new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 733
close;
}
}
-new_1-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv1 728
-new_2-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv2 728
-new_3-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv3 728
-new_4-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv4 728
-new_5-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv5 728
+new_1-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv1 4_F_JOB_KNIGHT
+new_2-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv2 4_F_JOB_KNIGHT
+new_3-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv3 4_F_JOB_KNIGHT
+new_4-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv4 4_F_JOB_KNIGHT
+new_5-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv5 4_F_JOB_KNIGHT
- script Acolyte Guide#newbe10::NvAcolyte -1,{
if (job_novice_q < 15) {
@@ -1559,11 +1559,11 @@ new_5-3,97,41,3 duplicate(NvSwordman) Swordman Guide#nv5 728
close;
}
}
-new_1-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv1 95
-new_2-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv2 95
-new_3-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv3 95
-new_4-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv4 95
-new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 95
+new_1-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv1 4_F_SISTER
+new_2-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv2 4_F_SISTER
+new_3-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv3 4_F_SISTER
+new_4-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv4 4_F_SISTER
+new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 4_F_SISTER
- script Thief Guide#newbe10::NvThief -1,{
if (job_novice_q < 15) {
@@ -1696,11 +1696,11 @@ new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 95
close;
}
}
-new_1-3,105,41,3 duplicate(NvThief) Thief Guide#nv1 118
-new_2-3,105,41,3 duplicate(NvThief) Thief Guide#nv2 118
-new_3-3,105,41,3 duplicate(NvThief) Thief Guide#nv3 118
-new_4-3,105,41,3 duplicate(NvThief) Thief Guide#nv4 118
-new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 118
+new_1-3,105,41,3 duplicate(NvThief) Thief Guide#nv1 2_M_THIEFMASTER
+new_2-3,105,41,3 duplicate(NvThief) Thief Guide#nv2 2_M_THIEFMASTER
+new_3-3,105,41,3 duplicate(NvThief) Thief Guide#nv3 2_M_THIEFMASTER
+new_4-3,105,41,3 duplicate(NvThief) Thief Guide#nv4 2_M_THIEFMASTER
+new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 2_M_THIEFMASTER
- script Merchant Guide#newbe10::NvMerchant -1,{
if (job_novice_q < 15) {
@@ -1852,11 +1852,11 @@ new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 118
close;
}
}
-new_1-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv1 97
-new_2-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv2 97
-new_3-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv3 97
-new_4-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv4 97
-new_5-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv5 97
+new_1-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv1 4W_M_01
+new_2-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv2 4W_M_01
+new_3-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv3 4W_M_01
+new_4-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv4 4W_M_01
+new_5-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv5 4W_M_01
- script Archer Guide#newbe10::NvArcher -1,{
if (job_novice_q < 15) {
@@ -1949,11 +1949,11 @@ new_5-3,109,41,3 duplicate(NvMerchant) Merchant Guide#nv5 97
close;
}
}
-new_1-3,113,41,3 duplicate(NvArcher) Archer Guide#nv1 727
-new_2-3,113,41,3 duplicate(NvArcher) Archer Guide#nv2 727
-new_3-3,113,41,3 duplicate(NvArcher) Archer Guide#nv3 727
-new_4-3,113,41,3 duplicate(NvArcher) Archer Guide#nv4 727
-new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 727
+new_1-3,113,41,3 duplicate(NvArcher) Archer Guide#nv1 4_F_JOB_HUNTER
+new_2-3,113,41,3 duplicate(NvArcher) Archer Guide#nv2 4_F_JOB_HUNTER
+new_3-3,113,41,3 duplicate(NvArcher) Archer Guide#nv3 4_F_JOB_HUNTER
+new_4-3,113,41,3 duplicate(NvArcher) Archer Guide#nv4 4_F_JOB_HUNTER
+new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 4_F_JOB_HUNTER
- script Mage Guide#newbe10::NvMage -1,{
if (job_novice_q < 15) {
@@ -2099,11 +2099,11 @@ new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 727
close;
}
}
-new_1-3,117,41,3 duplicate(NvMage) Mage Guide#nv1 123
-new_2-3,117,41,3 duplicate(NvMage) Mage Guide#nv2 123
-new_3-3,117,41,3 duplicate(NvMage) Mage Guide#nv3 123
-new_4-3,117,41,3 duplicate(NvMage) Mage Guide#nv4 123
-new_5-3,117,41,3 duplicate(NvMage) Mage Guide#nv5 123
+new_1-3,117,41,3 duplicate(NvMage) Mage Guide#nv1 2_F_MAGICMASTER
+new_2-3,117,41,3 duplicate(NvMage) Mage Guide#nv2 2_F_MAGICMASTER
+new_3-3,117,41,3 duplicate(NvMage) Mage Guide#nv3 2_F_MAGICMASTER
+new_4-3,117,41,3 duplicate(NvMage) Mage Guide#nv4 2_F_MAGICMASTER
+new_5-3,117,41,3 duplicate(NvMage) Mage Guide#nv5 2_F_MAGICMASTER
- script Bruce#nv::NvBruce -1,{
mes "[Bruce]";
@@ -2162,11 +2162,11 @@ new_5-3,117,41,3 duplicate(NvMage) Mage Guide#nv5 123
}
}
}
-new_1-3,121,41,3 duplicate(NvBruce) Bruce#nv1 57
-new_2-3,121,41,3 duplicate(NvBruce) Bruce#nv2 57
-new_3-3,121,41,3 duplicate(NvBruce) Bruce#nv3 57
-new_4-3,121,41,3 duplicate(NvBruce) Bruce#nv4 57
-new_5-3,121,41,3 duplicate(NvBruce) Bruce#nv5 57
+new_1-3,121,41,3 duplicate(NvBruce) Bruce#nv1 1_M_LIBRARYMASTER
+new_2-3,121,41,3 duplicate(NvBruce) Bruce#nv2 1_M_LIBRARYMASTER
+new_3-3,121,41,3 duplicate(NvBruce) Bruce#nv3 1_M_LIBRARYMASTER
+new_4-3,121,41,3 duplicate(NvBruce) Bruce#nv4 1_M_LIBRARYMASTER
+new_5-3,121,41,3 duplicate(NvBruce) Bruce#nv5 1_M_LIBRARYMASTER
// Eden Group Officer (iRO only)
//============================================================
@@ -2272,11 +2272,11 @@ OnTouch:
emotion e_gasp;
end;
}
-new_1-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv1 729,5,5
-new_2-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv2 729,5,5
-new_3-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv3 729,5,5
-new_4-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv4 729,5,5
-new_5-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv5 729,5,5
+new_1-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv1 4_F_NOVICE,5,5
+new_2-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv2 4_F_NOVICE,5,5
+new_3-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv3 4_F_NOVICE,5,5
+new_4-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv4 4_F_NOVICE,5,5
+new_5-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv5 4_F_NOVICE,5,5
*/
// Trainer
@@ -2337,11 +2337,11 @@ new_5-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv5 729,5,5
close;
}
}
-new_1-3,103,50,4 duplicate(NvBrutus) Level 1 Trainer#nv1 84
-new_2-3,103,50,4 duplicate(NvBrutus) Level 2 Trainer#nv2 84
-new_3-3,103,50,4 duplicate(NvBrutus) Level 3 Trainer#nv3 84
-new_4-3,103,50,4 duplicate(NvBrutus) Level 4 Trainer#nv4 84
-new_5-3,103,50,4 duplicate(NvBrutus) Level 5 Trainer#nv5 84
+new_1-3,103,50,4 duplicate(NvBrutus) Level 1 Trainer#nv1 4_M_02
+new_2-3,103,50,4 duplicate(NvBrutus) Level 2 Trainer#nv2 4_M_02
+new_3-3,103,50,4 duplicate(NvBrutus) Level 3 Trainer#nv3 4_M_02
+new_4-3,103,50,4 duplicate(NvBrutus) Level 4 Trainer#nv4 4_M_02
+new_5-3,103,50,4 duplicate(NvBrutus) Level 5 Trainer#nv5 4_M_02
// Monster Spawns
//============================================================
@@ -2371,13 +2371,13 @@ new_5-3,0,0,0,0 monster Picky 1049,15,0,0,0
// Potato Merchant
//============================================================
-- shop Potato Merchant#newbe09::NvPotato 93,516:-1
+- shop Potato Merchant#newbe09::NvPotato 4_F_04,516:-1
-new_1-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv1 93
-new_2-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv2 93
-new_3-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv3 93
-new_4-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv4 93
-new_5-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv5 93
+new_1-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv1 4_F_04
+new_2-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv2 4_F_04
+new_3-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv3 4_F_04
+new_4-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv4 4_F_04
+new_5-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv5 4_F_04
// Random Stuff
//============================================================
@@ -2387,11 +2387,11 @@ new_5-3,100,50,3 duplicate(NvPotato) Potato Merchant#nv5 93
mes "^FF0000=================================^000000";
close;
}
-new_1-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv1 111
-new_2-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv2 111
-new_3-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv3 111
-new_4-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv4 111
-new_5-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv5 111
+new_1-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv1 HIDDEN_NPC
+new_2-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv2 HIDDEN_NPC
+new_3-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv3 HIDDEN_NPC
+new_4-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv4 HIDDEN_NPC
+new_5-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv5 HIDDEN_NPC
- script Guard::NvGuardA -1,{
mes "[Training Grounds Guard]";
@@ -2399,11 +2399,11 @@ new_5-1,66,114,4 duplicate(NvBulletin) Bulletin Board#nv5 111
mes "You are now in the outer court yard. Please go inside the castle to begin your training.";
close;
}
-new_1-1,144,116,2 duplicate(NvGuardA) Guard#nv1a 105
-new_2-1,144,116,2 duplicate(NvGuardA) Guard#nv2a 105
-new_3-1,144,116,2 duplicate(NvGuardA) Guard#nv3a 105
-new_4-1,144,116,2 duplicate(NvGuardA) Guard#nv4a 105
-new_5-1,144,116,2 duplicate(NvGuardA) Guard#nv5a 105
+new_1-1,144,116,2 duplicate(NvGuardA) Guard#nv1a 8W_SOLDIER
+new_2-1,144,116,2 duplicate(NvGuardA) Guard#nv2a 8W_SOLDIER
+new_3-1,144,116,2 duplicate(NvGuardA) Guard#nv3a 8W_SOLDIER
+new_4-1,144,116,2 duplicate(NvGuardA) Guard#nv4a 8W_SOLDIER
+new_5-1,144,116,2 duplicate(NvGuardA) Guard#nv5a 8W_SOLDIER
- script Guard::NvGuardB -1,{
mes "[Training Grounds Guard]";
@@ -2416,11 +2416,11 @@ new_5-1,144,116,2 duplicate(NvGuardA) Guard#nv5a 105
}
close;
}
-new_1-1,144,107,2 duplicate(NvGuardB) Guard#nv1b 105
-new_2-1,144,107,2 duplicate(NvGuardB) Guard#nv2b 105
-new_3-1,144,107,2 duplicate(NvGuardB) Guard#nv3b 105
-new_4-1,144,107,2 duplicate(NvGuardB) Guard#nv4b 105
-new_5-1,144,107,2 duplicate(NvGuardB) Guard#nv5b 105
+new_1-1,144,107,2 duplicate(NvGuardB) Guard#nv1b 8W_SOLDIER
+new_2-1,144,107,2 duplicate(NvGuardB) Guard#nv2b 8W_SOLDIER
+new_3-1,144,107,2 duplicate(NvGuardB) Guard#nv3b 8W_SOLDIER
+new_4-1,144,107,2 duplicate(NvGuardB) Guard#nv4b 8W_SOLDIER
+new_5-1,144,107,2 duplicate(NvGuardB) Guard#nv5b 8W_SOLDIER
- script Instructor#Edwin::NvEdwin -1,{
mes "[Edwin]";
@@ -2435,11 +2435,11 @@ new_5-1,144,107,2 duplicate(NvGuardB) Guard#nv5b 105
warp strnpcinfo(4),100,100;
end;
}
-new_1-2,161,182,5 duplicate(NvEdwin) Instructor#nv1 92
-new_2-2,161,182,5 duplicate(NvEdwin) Instructor#nv2 92
-new_3-2,161,182,5 duplicate(NvEdwin) Instructor#nv3 92
-new_4-2,161,182,5 duplicate(NvEdwin) Instructor#nv4 92
-new_5-2,161,182,5 duplicate(NvEdwin) Instructor#nv5 92
+new_1-2,161,182,5 duplicate(NvEdwin) Instructor#nv1 4_F_03
+new_2-2,161,182,5 duplicate(NvEdwin) Instructor#nv2 4_F_03
+new_3-2,161,182,5 duplicate(NvEdwin) Instructor#nv3 4_F_03
+new_4-2,161,182,5 duplicate(NvEdwin) Instructor#nv4 4_F_03
+new_5-2,161,182,5 duplicate(NvEdwin) Instructor#nv5 4_F_03
function script F_NvErase {
if (getarg(0,0)) {
@@ -2653,11 +2653,11 @@ L_Warp:
close;
}
}
-new_1-4,100,29,1 duplicate(NvHanson) Final Tester#nv1 46
-new_2-4,100,29,1 duplicate(NvHanson) Final Tester#nv2 46
-new_3-4,100,29,1 duplicate(NvHanson) Final Tester#nv3 46
-new_4-4,100,29,1 duplicate(NvHanson) Final Tester#nv4 46
-new_5-4,100,29,1 duplicate(NvHanson) Final Tester#nv5 46
+new_1-4,100,29,1 duplicate(NvHanson) Final Tester#nv1 1_ETC_01
+new_2-4,100,29,1 duplicate(NvHanson) Final Tester#nv2 1_ETC_01
+new_3-4,100,29,1 duplicate(NvHanson) Final Tester#nv3 1_ETC_01
+new_4-4,100,29,1 duplicate(NvHanson) Final Tester#nv4 1_ETC_01
+new_5-4,100,29,1 duplicate(NvHanson) Final Tester#nv5 1_ETC_01
// Job Test
//============================================================
@@ -3407,8 +3407,8 @@ new_5-4,100,29,1 duplicate(NvHanson) Final Tester#nv5 46
close;
}
}
-new_1-3,106,50,4 duplicate(NvLark) Job Guide Lark#01 706
-new_2-3,106,50,4 duplicate(NvLark) Job Guide Lark#02 706
-new_3-3,106,50,4 duplicate(NvLark) Job Guide Lark#03 706
-new_4-3,106,50,4 duplicate(NvLark) Job Guide Lark#04 706
-new_5-3,106,50,4 duplicate(NvLark) Job Guide Lark#05 706
+new_1-3,106,50,4 duplicate(NvLark) Job Guide Lark#01 4_M_KID1
+new_2-3,106,50,4 duplicate(NvLark) Job Guide Lark#02 4_M_KID1
+new_3-3,106,50,4 duplicate(NvLark) Job Guide Lark#03 4_M_KID1
+new_4-3,106,50,4 duplicate(NvLark) Job Guide Lark#04 4_M_KID1
+new_5-3,106,50,4 duplicate(NvLark) Job Guide Lark#05 4_M_KID1
diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt
index 6d570f1c7..3a8dad744 100644
--- a/npc/re/jobs/novice/supernovice_ex.txt
+++ b/npc/re/jobs/novice/supernovice_ex.txt
@@ -57,7 +57,7 @@ function script Esseray_Ex {
else return;
}
-beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
+beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{
if (checkquest(5092) >= 0) {
mes "[Fishing Novice]";
mes "Sh --------- !!";
@@ -587,7 +587,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{
close;
}
-airplane,33,47,5 script Nudor#sp2 729,{
+airplane,33,47,5 script Nudor#sp2 4_F_NOVICE,{
if (checkquest(5099) >= 0) {
mes "[Nudor]";
mes "Ahhh~ I have no money to buy any food.";
diff --git a/npc/re/jobs/repair.txt b/npc/re/jobs/repair.txt
index 1c49717bc..f1587f55a 100644
--- a/npc/re/jobs/repair.txt
+++ b/npc/re/jobs/repair.txt
@@ -55,7 +55,7 @@ Super Novice: SUPNOV_Q -> job_super
Expanded Super Novice: EXSUPNOV_Q -> job_super2
*/
-prt_in,38,104,4 script Valerie 811,{
+prt_in,38,104,4 script Valerie 4_F_VALKYRIE,{
if (checkweight(1201,1) == 0) {
mes "I think you have too many items. Let's try it again after you take some out.";
close;
@@ -253,30 +253,30 @@ L_Third:
mes "^ff00ffValerie^000000";
close;
}
-in_moc_16,17,33,4 duplicate(Valerie#sign) Valerie#asn 837
-ein_in01,13,28,4 duplicate(Valerie#sign) Valerie#bls 837
-hu_in01,386,377,4 duplicate(Valerie#sign) Valerie#hnt 837
-prt_in,88,108,4 duplicate(Valerie#sign) Valerie#knt 837
-prt_church,19,36,4 duplicate(Valerie#sign) Valerie#prst 837
-gef_tower,110,30,4 duplicate(Valerie#sign) Valerie#wiz 837
-comodo,215,155,4 duplicate(Valerie#sign) Valerie#danc 837
-prt_castle,45,167,4 duplicate(Valerie#sign) Valerie#cru 837
-prt_monk,59,253,4 duplicate(Valerie#sign) Valerie#mnk 837
-moc_ruins,90,104,4 duplicate(Valerie#sign) Valerie#rg 837
-yuno_in02,43,62,4 duplicate(Valerie#sign) Valerie#sag 837
-prt_church,103,86,4 duplicate(Valerie#sign) Valerie#arch 837
-que_job01,75,92,4 duplicate(Valerie#sign) Valerie#gc 837
-yuno,129,150,4 duplicate(Valerie#sign) Valerie#mech 837
-tur_dun01,159,40,4 duplicate(Valerie#sign) Valerie#ran 837
-prt_in,167,24,4 duplicate(Valerie#sign) Valerie#rk 837
-spl_in02,81,102,4 duplicate(Valerie#sign) Valerie#wl 837
-alde_alche,38,181,4 duplicate(Valerie#sign) Valerie#alche 837
-alberta,198,129,4 duplicate(Valerie#sign) Valerie#min 837
-in_rogue,376,104,4 duplicate(Valerie#sign) Valerie#sc 837
-ve_in,244,122,4 duplicate(Valerie#sign) Valerie#shu 837
-xmas,166,209,4 duplicate(Valerie#sign) Valerie#wan 837
+in_moc_16,17,33,4 duplicate(Valerie#sign) Valerie#asn 2_BULLETIN_BOARD
+ein_in01,13,28,4 duplicate(Valerie#sign) Valerie#bls 2_BULLETIN_BOARD
+hu_in01,386,377,4 duplicate(Valerie#sign) Valerie#hnt 2_BULLETIN_BOARD
+prt_in,88,108,4 duplicate(Valerie#sign) Valerie#knt 2_BULLETIN_BOARD
+prt_church,19,36,4 duplicate(Valerie#sign) Valerie#prst 2_BULLETIN_BOARD
+gef_tower,110,30,4 duplicate(Valerie#sign) Valerie#wiz 2_BULLETIN_BOARD
+comodo,215,155,4 duplicate(Valerie#sign) Valerie#danc 2_BULLETIN_BOARD
+prt_castle,45,167,4 duplicate(Valerie#sign) Valerie#cru 2_BULLETIN_BOARD
+prt_monk,59,253,4 duplicate(Valerie#sign) Valerie#mnk 2_BULLETIN_BOARD
+moc_ruins,90,104,4 duplicate(Valerie#sign) Valerie#rg 2_BULLETIN_BOARD
+yuno_in02,43,62,4 duplicate(Valerie#sign) Valerie#sag 2_BULLETIN_BOARD
+prt_church,103,86,4 duplicate(Valerie#sign) Valerie#arch 2_BULLETIN_BOARD
+que_job01,75,92,4 duplicate(Valerie#sign) Valerie#gc 2_BULLETIN_BOARD
+yuno,129,150,4 duplicate(Valerie#sign) Valerie#mech 2_BULLETIN_BOARD
+tur_dun01,159,40,4 duplicate(Valerie#sign) Valerie#ran 2_BULLETIN_BOARD
+prt_in,167,24,4 duplicate(Valerie#sign) Valerie#rk 2_BULLETIN_BOARD
+spl_in02,81,102,4 duplicate(Valerie#sign) Valerie#wl 2_BULLETIN_BOARD
+alde_alche,38,181,4 duplicate(Valerie#sign) Valerie#alche 2_BULLETIN_BOARD
+alberta,198,129,4 duplicate(Valerie#sign) Valerie#min 2_BULLETIN_BOARD
+in_rogue,376,104,4 duplicate(Valerie#sign) Valerie#sc 2_BULLETIN_BOARD
+ve_in,244,122,4 duplicate(Valerie#sign) Valerie#shu 2_BULLETIN_BOARD
+xmas,166,209,4 duplicate(Valerie#sign) Valerie#wan 2_BULLETIN_BOARD
-sec_in02,12,40,5 script Job Repair 57,1,1,{
+sec_in02,12,40,5 script Job Repair 1_M_LIBRARYMASTER,1,1,{
callfunc "F_GM_NPC";
mes "Please input your password.";
next;
diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt
index 5db5885d3..448bbc8c4 100644
--- a/npc/re/kafras/kafras.txt
+++ b/npc/re/kafras/kafras.txt
@@ -26,7 +26,7 @@
// Brasilis
//============================================================
-brasilis,197,221,4 script Kafra Employee::kaf_bra 117,{
+brasilis,197,221,4 script Kafra Employee::kaf_bra 4_F_KAFRA1,{
cutin "kafra_01",2;
callfunc "F_Kafra",0,3,0,80,700;
savepoint "brasilis",195,259;
@@ -35,7 +35,7 @@ brasilis,197,221,4 script Kafra Employee::kaf_bra 117,{
// Dewata
//============================================================
-dewata,202,184,6 script Kafra Employee::kaf_dewata 117,{
+dewata,202,184,6 script Kafra Employee::kaf_dewata 4_F_KAFRA1,{
cutin "kafra_01",2;
callfunc "F_Kafra",0,10,1,40,700;
savepoint "dewata",206,174;
@@ -44,7 +44,7 @@ dewata,202,184,6 script Kafra Employee::kaf_dewata 117,{
// Eden Group
//============================================================
-moc_para01,10,185,4 script Kafra Employee::kaf_eden 721,{
+moc_para01,10,185,4 script Kafra Employee::kaf_eden 4_F_KAFRA7,{
cutin "kafra_07",2;
mes "[Kafra Employee]";
mes "Welcome to the";
@@ -55,21 +55,21 @@ moc_para01,10,185,4 script Kafra Employee::kaf_eden 721,{
// Izlude
//============================================================
-izlude,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz 117
-izlude_a,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_a 117
-izlude_b,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_b 117
-izlude_c,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_c 117
-izlude_d,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_d 117
+izlude,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz 4_F_KAFRA1
+izlude_a,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_a 4_F_KAFRA1
+izlude_b,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_b 4_F_KAFRA1
+izlude_c,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_c 4_F_KAFRA1
+izlude_d,128,148,6 duplicate(kaf_izlude) Kafra Employee#iz_d 4_F_KAFRA1
// Port Malaya
//============================================================
-malaya,71,79,4 script Kafra Employee::kaf_malaya1 581,{
+malaya,71,79,4 script Kafra Employee::kaf_malaya1 4_MAL_KAFRA,{
callfunc "F_Kafra",0,3,2,500,700;
savepoint "malaya",44,56;
callfunc "F_KafEnd",0,1,"in Port Malaya";
}
-malaya,234,204,4 script Kafra Employee::kaf_malaya2 581,{
+malaya,234,204,4 script Kafra Employee::kaf_malaya2 4_MAL_KAFRA,{
callfunc "F_Kafra",0,3,2,500,700;
savepoint "malaya",281,212;
callfunc "F_KafEnd",0,1,"in Port Malaya";
@@ -77,7 +77,7 @@ malaya,234,204,4 script Kafra Employee::kaf_malaya2 581,{
// Rune Knight
//============================================================
-job3_rune01,92,62,3 script Kafra Employee::kaf_rune 114,{
+job3_rune01,92,62,3 script Kafra Employee::kaf_rune 4_F_KAFRA4,{
cutin "kafra_04",2;
callfunc "F_KafSet";
callfunc "F_Kafra",0,9,2,80,700;
diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt
index 134a3422d..b63fca71c 100644
--- a/npc/re/merchants/3rd_trader.txt
+++ b/npc/re/merchants/3rd_trader.txt
@@ -79,9 +79,9 @@
mes "Thank you. Come back again~!";
close;
}
-job3_guil01,79,96,3 duplicate(phs) Poison Herb Merchant 877
-morocc,191,94,4 duplicate(phs) Poison Herb Merchant#moc 877 //Official: (190,96) -> in a wall
-lhz_in02,16,205,4 duplicate(phs) Poison Herb Merchant#lhz 877
+job3_guil01,79,96,3 duplicate(phs) Poison Herb Merchant 4_F_YUNYANG
+morocc,191,94,4 duplicate(phs) Poison Herb Merchant#moc 4_F_YUNYANG //Official: (190,96) -> in a wall
+lhz_in02,16,205,4 duplicate(phs) Poison Herb Merchant#lhz 4_F_YUNYANG
// Rune Stone Merchants (Rune Knight)
//============================================================
@@ -148,12 +148,12 @@ lhz_in02,16,205,4 duplicate(phs) Poison Herb Merchant#lhz 877
mes "Please come back again~!";
close;
}
-job3_rune01,90,62,3 duplicate(runesale) Rune Merchant#job3 853
-prontera,168,228,3 duplicate(runesale) Rune Merchant#prt 853
+job3_rune01,90,62,3 duplicate(runesale) Rune Merchant#job3 4_M_YURI
+prontera,168,228,3 duplicate(runesale) Rune Merchant#prt 4_M_YURI
// Rare Herb Merchants (Guillotine Cross)
//============================================================
-job3_guil01,91,93,3 script Rare Herb Collector 49,{
+job3_guil01,91,93,3 script Rare Herb Collector 1_M_03,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -259,22 +259,22 @@ job3_guil01,91,93,3 script Rare Herb Collector 49,{
mes "Thank you very much. See you~!";
close;
}
-gef_tower,105,172,5 duplicate(pss) Point Merchant#Sorcerer 700
-prt_in,131,66,0 duplicate(pss) Point Merchant#Prontera 700
-alberta,105,52,7 duplicate(pss) Point Merchant#Alberta 700
-aldebaran,133,114,5 duplicate(pss) Point Merchant#Aldebaran 700
-comodo,193,159,5 duplicate(pss) Point Merchant#Comodo 700
-geffen,129,49,5 duplicate(pss) Point Merchant#Geffen 700
-izlude,138,163,5 duplicate(pss) Point Merchant#Izlude 700 // Old coordinates: izlude (135,121)
-izlude_a,138,163,5 duplicate(pss) Point Merchant#Izlude_a 700
-izlude_b,138,163,5 duplicate(pss) Point Merchant#Izlude_b 700
-izlude_c,138,163,5 duplicate(pss) Point Merchant#Izlude_c 700
-izlude_d,138,163,5 duplicate(pss) Point Merchant#Izlude_d 700
-malangdo,214,163,5 duplicate(pss) Point Merchant#Malangdo 700
-mora,115,118,3 duplicate(pss) Point Merchant#Mora 700
-ra_in01,256,273,3 duplicate(pss) Point Merchant#Rachel 700
-veins,202,128,5 duplicate(pss) Point Merchant#Veins 700
-dicastes01,207,200,5 duplicate(pss) Point Merchant#Dicastes 700
-manuk,261,206,3 duplicate(pss) Point Merchant#Manuk 700
-splendide,207,160,5 duplicate(pss) Point Merchant#Splendide 700
-mid_camp,224,237,3 duplicate(pss) Point Merchant#Midgard 700
+gef_tower,105,172,5 duplicate(pss) Point Merchant#Sorcerer 8_F_GIRL
+prt_in,131,66,0 duplicate(pss) Point Merchant#Prontera 8_F_GIRL
+alberta,105,52,7 duplicate(pss) Point Merchant#Alberta 8_F_GIRL
+aldebaran,133,114,5 duplicate(pss) Point Merchant#Aldebaran 8_F_GIRL
+comodo,193,159,5 duplicate(pss) Point Merchant#Comodo 8_F_GIRL
+geffen,129,49,5 duplicate(pss) Point Merchant#Geffen 8_F_GIRL
+izlude,138,163,5 duplicate(pss) Point Merchant#Izlude 8_F_GIRL // Old coordinates: izlude (135,121)
+izlude_a,138,163,5 duplicate(pss) Point Merchant#Izlude_a 8_F_GIRL
+izlude_b,138,163,5 duplicate(pss) Point Merchant#Izlude_b 8_F_GIRL
+izlude_c,138,163,5 duplicate(pss) Point Merchant#Izlude_c 8_F_GIRL
+izlude_d,138,163,5 duplicate(pss) Point Merchant#Izlude_d 8_F_GIRL
+malangdo,214,163,5 duplicate(pss) Point Merchant#Malangdo 8_F_GIRL
+mora,115,118,3 duplicate(pss) Point Merchant#Mora 8_F_GIRL
+ra_in01,256,273,3 duplicate(pss) Point Merchant#Rachel 8_F_GIRL
+veins,202,128,5 duplicate(pss) Point Merchant#Veins 8_F_GIRL
+dicastes01,207,200,5 duplicate(pss) Point Merchant#Dicastes 8_F_GIRL
+manuk,261,206,3 duplicate(pss) Point Merchant#Manuk 8_F_GIRL
+splendide,207,160,5 duplicate(pss) Point Merchant#Splendide 8_F_GIRL
+mid_camp,224,237,3 duplicate(pss) Point Merchant#Midgard 8_F_GIRL
diff --git a/npc/re/merchants/advanced_refiner.txt b/npc/re/merchants/advanced_refiner.txt
index c6aa75124..fd6602eda 100644
--- a/npc/re/merchants/advanced_refiner.txt
+++ b/npc/re/merchants/advanced_refiner.txt
@@ -16,7 +16,7 @@
//= 1.0 Added Malangdo Refiner "Holink". [Euphy]
//============================================================
-malangdo,221,174,6 script Holink#mal_cash 559,{
+malangdo,221,174,6 script Holink#mal_cash 4_CAT_ADV1,{
disable_items;
mes "[Holink]";
mes "I am the meow~ Blacksmith Holink~";
diff --git a/npc/re/merchants/alchemist.txt b/npc/re/merchants/alchemist.txt
index 8687cb946..7569fe0b3 100644
--- a/npc/re/merchants/alchemist.txt
+++ b/npc/re/merchants/alchemist.txt
@@ -12,7 +12,7 @@
//= Updated dialogue to match the official script.
//============================================================
-alde_alche,31,186,3 script Craft Book Merchant#alde 883,{
+alde_alche,31,186,3 script Craft Book Merchant#alde 4_M_ALCHE_D,{
mes "[Craft Book Merchant]";
mes "Welcome.";
mes "I'm here to sell";
diff --git a/npc/re/merchants/ammo_boxes.txt b/npc/re/merchants/ammo_boxes.txt
index ba9e4fd96..432e0c8a4 100644
--- a/npc/re/merchants/ammo_boxes.txt
+++ b/npc/re/merchants/ammo_boxes.txt
@@ -11,9 +11,9 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-que_ng,187,149,3 duplicate(mdk) Magazine Dealer Kenny#ng 83
-izlude,74,104,3 duplicate(mdk) Magazine Dealer Kenny#iz 83
-izlude_a,74,104,3 duplicate(mdk) Magazine Dealer Kenny#a 83
-izlude_b,74,104,3 duplicate(mdk) Magazine Dealer Kenny#b 83
-izlude_c,74,104,3 duplicate(mdk) Magazine Dealer Kenny#c 83
-izlude_d,74,104,3 duplicate(mdk) Magazine Dealer Kenny#d 83
+que_ng,187,149,3 duplicate(mdk) Magazine Dealer Kenny#ng 4_M_01
+izlude,74,104,3 duplicate(mdk) Magazine Dealer Kenny#iz 4_M_01
+izlude_a,74,104,3 duplicate(mdk) Magazine Dealer Kenny#a 4_M_01
+izlude_b,74,104,3 duplicate(mdk) Magazine Dealer Kenny#b 4_M_01
+izlude_c,74,104,3 duplicate(mdk) Magazine Dealer Kenny#c 4_M_01
+izlude_d,74,104,3 duplicate(mdk) Magazine Dealer Kenny#d 4_M_01
diff --git a/npc/re/merchants/ammo_dealer.txt b/npc/re/merchants/ammo_dealer.txt
index 9925d809c..7abb58421 100644
--- a/npc/re/merchants/ammo_dealer.txt
+++ b/npc/re/merchants/ammo_dealer.txt
@@ -11,9 +11,9 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-que_ng,187,156,3 duplicate(bdt) Bullet Dealer Tony#ng 86
-izlude,77,104,3 duplicate(bdt) Bullet Dealer Tony#iz 86 //Official: (74,106) -> in the water
-izlude_a,77,104,3 duplicate(bdt) Bullet Dealer Tony#a 86
-izlude_b,77,104,3 duplicate(bdt) Bullet Dealer Tony#b 86
-izlude_c,77,104,3 duplicate(bdt) Bullet Dealer Tony#c 86
-izlude_d,77,104,3 duplicate(bdt) Bullet Dealer Tony#d 86
+que_ng,187,156,3 duplicate(bdt) Bullet Dealer Tony#ng 4_M_04
+izlude,77,104,3 duplicate(bdt) Bullet Dealer Tony#iz 4_M_04 //Official: (74,106) -> in the water
+izlude_a,77,104,3 duplicate(bdt) Bullet Dealer Tony#a 4_M_04
+izlude_b,77,104,3 duplicate(bdt) Bullet Dealer Tony#b 4_M_04
+izlude_c,77,104,3 duplicate(bdt) Bullet Dealer Tony#c 4_M_04
+izlude_d,77,104,3 duplicate(bdt) Bullet Dealer Tony#d 4_M_04
diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt
index fc62cd216..c5d198457 100644
--- a/npc/re/merchants/blessed_refiner.txt
+++ b/npc/re/merchants/blessed_refiner.txt
@@ -163,9 +163,9 @@
mes "My mood is worse when I fail!!";
close;
}
-prt_in,52,56,3 duplicate(BlacksmithDister) Blacksmith Dister#prt 826
-payon,148,172,3 duplicate(BlacksmithDister) Blacksmith Dister#pay 826
-alberta_in,20,56,3 duplicate(BlacksmithDister) Blacksmith Dister#alb 826
-yuno_in01,175,18,3 duplicate(BlacksmithDister) Blacksmith Dister#yuno 826
-ein_in01,26,82,3 duplicate(BlacksmithDister) Blacksmith Dister#ein 826
-lhz_in02,280,15,3 duplicate(BlacksmithDister) Blacksmith Dister#lhz 826
+prt_in,52,56,3 duplicate(BlacksmithDister) Blacksmith Dister#prt 4_M_DWARF
+payon,148,172,3 duplicate(BlacksmithDister) Blacksmith Dister#pay 4_M_DWARF
+alberta_in,20,56,3 duplicate(BlacksmithDister) Blacksmith Dister#alb 4_M_DWARF
+yuno_in01,175,18,3 duplicate(BlacksmithDister) Blacksmith Dister#yuno 4_M_DWARF
+ein_in01,26,82,3 duplicate(BlacksmithDister) Blacksmith Dister#ein 4_M_DWARF
+lhz_in02,280,15,3 duplicate(BlacksmithDister) Blacksmith Dister#lhz 4_M_DWARF
diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt
index 8187d4fe7..933839bec 100644
--- a/npc/re/merchants/card_separation.txt
+++ b/npc/re/merchants/card_separation.txt
@@ -354,5 +354,5 @@
mes "That is all for the results of the card separation. Please come again.";
close;
}
-malangdo,215,166,4 duplicate(CardSeparation_mal) Jeremy#pa0829 553
-malangdo,208,166,6 duplicate(CardSeparation_mal) Richard#pa0829 559
+malangdo,215,166,4 duplicate(CardSeparation_mal) Jeremy#pa0829 4_CAT_DOWN
+malangdo,208,166,6 duplicate(CardSeparation_mal) Richard#pa0829 4_CAT_ADV1
diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt
index 8d4d47cdc..91936bd35 100644
--- a/npc/re/merchants/catalog.txt
+++ b/npc/re/merchants/catalog.txt
@@ -13,7 +13,7 @@
//= 1.1 Updated dialogue. [Euphy]
//============================================================
-moc_para01,22,16,5 script Catalog Magician#catal01 704,{
+moc_para01,22,16,5 script Catalog Magician#catal01 4_M_BIBI,{
if (!checkweight(1301,3)) {
mes "- You have too many items. Please make space. -";
close;
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index 2796a4a70..fb20726a3 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -15,7 +15,7 @@
// Malangdo
//============================================================
-malangdo,220,167,5 script Coin Exchanger CX-1 564,{
+malangdo,220,167,5 script Coin Exchanger CX-1 2_VENDING_MACHINE1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
close;
@@ -106,7 +106,7 @@ malangdo,220,167,5 script Coin Exchanger CX-1 564,{
close;
}
-malangdo,218,165,5 script Special Vending Machine 562,{
+malangdo,218,165,5 script Special Vending Machine 2_DROP_MACHINE,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
close;
@@ -176,7 +176,7 @@ L_AddItem:
}
}
-malangdo,236,179,5 script Dark Merchant K 554,{
+malangdo,236,179,5 script Dark Merchant K 4_CAT_REST,{
if (checkweight(1201,1) == 0) {
mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
close;
@@ -221,7 +221,7 @@ malangdo,236,179,5 script Dark Merchant K 554,{
}
}
-malangdo,233,180,3 script Dark MachineTX100 564,{
+malangdo,233,180,3 script Dark MachineTX100 2_VENDING_MACHINE1,{
if (checkweight(1201,1) == 0) {
mes "It seems you have too much in your inventory. Let's try again after getting rid of some of your belongings.";
close;
@@ -342,7 +342,7 @@ malangdo,233,180,3 script Dark MachineTX100 564,{
close;
}
-malangdo,175,145,4 script Can Agency Guard 549,{
+malangdo,175,145,4 script Can Agency Guard 4_CAT_MERMASTER,{
if (checkweight(1201,1) == 0) {
mes "You seem to have too many items. Give it a try after sorting out the item kinds.";
close;
@@ -567,7 +567,7 @@ function script F_mal_coin {
}
}
}
-malangdo,162,146,5 script Wandering Merchant#mal 495,{
+malangdo,162,146,5 script Wandering Merchant#mal 4_M_MERCAT1,{
callfunc "F_mal_coin",0,"[Wandering Merchant]",1;
setarray .@items[1],
16743,16747,16741,16745,16749,16751, // 1 hour items.
@@ -698,7 +698,7 @@ malangdo,162,146,5 script Wandering Merchant#mal 495,{
}
}
-malangdo,173,145,4 script Stinky Merchant 496,{
+malangdo,173,145,4 script Stinky Merchant 4_M_MERCAT2,{
callfunc "F_mal_coin",0,"[Stinky Merchant]",2;
setarray .@items[1],2873,16015;
setarray .@names$[1],"Cat Hand Glove","Cat Club";
@@ -749,7 +749,7 @@ malangdo,173,145,4 script Stinky Merchant 496,{
}
}
-malangdo,150,135,5 script Roving Merchant 495,{
+malangdo,150,135,5 script Roving Merchant 4_M_MERCAT1,{
callfunc "F_mal_coin",0,"[Roving Merchant]",3;
setarray .@items[1],12639,12637,12638,12640;
setarray .@names$[1],"Flying Fish","Sow Bug","Dried Squid","Starfish";
@@ -827,7 +827,7 @@ malangdo,150,135,5 script Roving Merchant 495,{
// Eclage
//============================================================
-ecl_in01,66,95,2 script Armor Merchant Naphara 436,{
+ecl_in01,66,95,2 script Armor Merchant Naphara 4_F_FAIRYKID,{
mes "[Armor Merchant]";
mes "Hello, this is Naphara's store, a place of high class goods.";
mes "What would you need?";
@@ -901,7 +901,7 @@ ecl_in01,66,95,2 script Armor Merchant Naphara 436,{
close;
}
-ecl_in01,64,97,4 script Slot Expert Nattuer#ecl 436,{
+ecl_in01,64,97,4 script Slot Expert Nattuer#ecl 4_F_FAIRYKID,{
mes "[Slot Expert]";
mes "I am Slot Expert Nattuer.";
mes "If you bring me an item from my little brother Naphara along with 5 Splendide Coins, I will open up one Slot for you.";
@@ -956,7 +956,7 @@ ecl_in01,64,97,4 script Slot Expert Nattuer#ecl 436,{
close;
}
-ecl_in01,67,39,4 script Replication Expert Palt 445,{
+ecl_in01,67,39,4 script Replication Expert Palt 4_M_FAIRYKID4,{
emotion e_lv;
mes "[Paltu]";
mes "Woohoo- Greetings. What are you looking for? Lots of goods here.";
@@ -1107,7 +1107,7 @@ ecl_in01,67,39,4 script Replication Expert Palt 445,{
close;
}
-ecl_in01,33,98,4 script Herb Merchant Plafina#e 443,{
+ecl_in01,33,98,4 script Herb Merchant Plafina#e 4_M_FAIRYKID2,{
mes "[Herb Merchant]";
mes "Welcome, this is Plafina's Herb Store where only the freshest herbs are provided~!";
next;
diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt
index 43d565188..e3efa5247 100644
--- a/npc/re/merchants/diamond.txt
+++ b/npc/re/merchants/diamond.txt
@@ -16,7 +16,7 @@
//= 1.5 Added This Version History (#15429)
//============================================================
-- script RareDiamondMerchant 58,{
+- script RareDiamondMerchant 1_M_MERCHANT,{
set .@npc$, "[Rare Diamond Merchant]";
@@ -233,10 +233,10 @@
}
}
-prontera,165,89,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#1 58
-geffen,106,63,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#2 58
-morocc,146,100,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#3 58
-alberta,129,60,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#4 58
-lighthalzen,163,65,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#5 58
-rachel,106,142,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#6 58
-payon,180,130,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#7 58
+prontera,165,89,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#1 1_M_MERCHANT
+geffen,106,63,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#2 1_M_MERCHANT
+morocc,146,100,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#3 1_M_MERCHANT
+alberta,129,60,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#4 1_M_MERCHANT
+lighthalzen,163,65,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#5 1_M_MERCHANT
+rachel,106,142,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#6 1_M_MERCHANT
+payon,180,130,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#7 1_M_MERCHANT
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 98a8fbf37..24ed71c04 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -13,7 +13,7 @@
//= 1.0a Added 'delequip' command. [Euphy]
//============================================================
-malangdo,213,167,4 script Mayomayo#mal 555,{
+malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of objects. Let's try to continue after reducing those objects.";
diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt
index 5c0ecdc7a..d986b047f 100644
--- a/npc/re/merchants/enchan_mora.txt
+++ b/npc/re/merchants/enchan_mora.txt
@@ -17,7 +17,7 @@
// Arch Bishop Enchants :: coin_arc
//============================================================
-mora,88,89,5 script Keeper of Secrets#pa082 495,{
+mora,88,89,5 script Keeper of Secrets#pa082 4_M_MERCAT1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -138,7 +138,7 @@ mora,88,89,5 script Keeper of Secrets#pa082 495,{
}
}
-mora,96,74,5 script Master of Relics#pa0829 495,{
+mora,96,74,5 script Master of Relics#pa0829 4_M_MERCAT1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -317,7 +317,7 @@ mora,96,74,5 script Master of Relics#pa0829 495,{
// Warlock Enchants :: coin_warrock
//============================================================
-mora,104,76,4 script Guardian of Artifacts#p 495,{
+mora,104,76,4 script Guardian of Artifacts#p 4_M_MERCAT1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -390,7 +390,7 @@ mora,104,76,4 script Guardian of Artifacts#p 495,{
close;
}
-mora,99,93,5 script Artifact Crafter#pa0829 495,{
+mora,99,93,5 script Artifact Crafter#pa0829 4_M_MERCAT1,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -522,7 +522,7 @@ mora,99,93,5 script Artifact Crafter#pa0829 495,{
// Rune Knight, Guillotine Cross, & Ranger Enchants :: new_artifact
//============================================================
-mora,152,97,5 script Guardian of Power#pa082 515,{
+mora,152,97,5 script Guardian of Power#pa082 4_F_DOGTRAVELER,{
if (checkweight(1201,1) == 0) {
mes "Reduce the amount of items that you have in your inventory before continuing.";
close;
@@ -593,7 +593,7 @@ mora,152,97,5 script Guardian of Power#pa082 515,{
close;
}
-mora,148,98,3 script Artifact Researcher#new 521,{
+mora,148,98,3 script Artifact Researcher#new 4_F_MORAFINE2,{
if (checkweight(1201,1) == 0) {
mes "Reduce the amount of items that you have in your inventory before continuing.";
close;
@@ -1151,7 +1151,7 @@ L_Socket:
// Arch Bishop & Warlock Empowering :: relic_change
//============================================================
-mora,124,82,4 script Artifact Collector#blan 522,{
+mora,124,82,4 script Artifact Collector#blan 4_M_RAFLE_OR,{
if (checkweight(1201,1) == 0) {
mes "Reduce the amount of items that you have in your inventory before continuing.";
close;
@@ -1504,7 +1504,7 @@ function script F_Mora_Enchant {
getitem2 getarg(0),1,1,0,0,0,.@enchants[1],.@enchants[2],.@enchants[3];
return 1;
}
-mora,105,176,4 script Master Tailor#pa0829 509,{
+mora,105,176,4 script Master Tailor#pa0829 4_ELEPHANT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -1596,7 +1596,7 @@ mora,105,176,4 script Master Tailor#pa0829 509,{
}
}
-mora,123,177,6 script Pendant Crafter#pa0829 509,{
+mora,123,177,6 script Pendant Crafter#pa0829 4_ELEPHANT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -1666,7 +1666,7 @@ mora,123,177,6 script Pendant Crafter#pa0829 509,{
}
}
-mora,134,166,4 script Bulberry Westhood#pa0829 509,{
+mora,134,166,4 script Bulberry Westhood#pa0829 4_ELEPHANT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
diff --git a/npc/re/merchants/enchan_upg.txt b/npc/re/merchants/enchan_upg.txt
index 6e5728aa2..c72479f38 100644
--- a/npc/re/merchants/enchan_upg.txt
+++ b/npc/re/merchants/enchan_upg.txt
@@ -12,7 +12,7 @@
//= 1.1 Standardizing, grammar and bug fixes. [Euphy]
//============================================================
-prt_in,28,73,3 script Devil Enchant Master#prq 63,{
+prt_in,28,73,3 script Devil Enchant Master#prq 1_M_SMITH,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "You are carrying too many items, please reduce it and come back again!";
diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt
index b882c490f..03ef82559 100644
--- a/npc/re/merchants/flute.txt
+++ b/npc/re/merchants/flute.txt
@@ -84,10 +84,10 @@
mes "Isn't it a beautiful day today?";
close;
}
-hu_in01,386,306,3 duplicate(fflute) Falcon Flute Trader#fft 51
-pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 51
+hu_in01,386,306,3 duplicate(fflute) Falcon Flute Trader#fft 1_M_BARD
+pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 1_M_BARD
-tur_dun01,89,170,5 script Expert Flute Crafter 59,{
+tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{
if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) {
if (countitem(6124)) {
mes "[Expert Flute Crafter]";
diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt
index fed923af9..c55917f4f 100644
--- a/npc/re/merchants/hd_refiner.txt
+++ b/npc/re/merchants/hd_refiner.txt
@@ -140,17 +140,17 @@
mes "I am sure a person like you would never blame me for a decrease in refine level by 1. Hmm.";
close;
}
-prt_in,59,54,3 duplicate(MightyHammer) Mighty Hammer#prt 826
-morocc_in,65,30,3 duplicate(MightyHammer) Mighty Hammer#morocc 826
-payon,148,176,3 duplicate(MightyHammer) Mighty Hammer#pay 826
-alberta_in,16,56,3 duplicate(MightyHammer) Mighty Hammer#alb 826
-yuno_in01,171,18,3 duplicate(MightyHammer) Mighty Hammer#yuno 826
-ein_in01,22,82,3 duplicate(MightyHammer) Mighty Hammer#ein 826
-lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
+prt_in,59,54,3 duplicate(MightyHammer) Mighty Hammer#prt 4_M_DWARF
+morocc_in,65,30,3 duplicate(MightyHammer) Mighty Hammer#morocc 4_M_DWARF
+payon,148,176,3 duplicate(MightyHammer) Mighty Hammer#pay 4_M_DWARF
+alberta_in,16,56,3 duplicate(MightyHammer) Mighty Hammer#alb 4_M_DWARF
+yuno_in01,171,18,3 duplicate(MightyHammer) Mighty Hammer#yuno 4_M_DWARF
+ein_in01,22,82,3 duplicate(MightyHammer) Mighty Hammer#ein 4_M_DWARF
+lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF
// iRO NPC locations:
-// moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 826
-// payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 826
+// moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 4_M_DWARF
+// payon,174,133,4 duplicate(MightyHammer) Mighty Hammer#im 4_M_DWARF
// Basta (+10 and up)
//============================================================
@@ -297,10 +297,10 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 826
mes "I'll do better next time! Don't worry!";
close;
}
-prt_in,57,54,3 duplicate(Basta) Basta#prt 826
-morocc_in,68,30,3 duplicate(Basta) Basta#morocc 826
-payon,148,174,3 duplicate(Basta) Basta#payon 826
-alberta_in,18,56,3 duplicate(Basta) Basta#alberta 826
-yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 826
-ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 826
-lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 826
+prt_in,57,54,3 duplicate(Basta) Basta#prt 4_M_DWARF
+morocc_in,68,30,3 duplicate(Basta) Basta#morocc 4_M_DWARF
+payon,148,174,3 duplicate(Basta) Basta#payon 4_M_DWARF
+alberta_in,18,56,3 duplicate(Basta) Basta#alberta 4_M_DWARF
+yuno_in01,173,18,3 duplicate(Basta) Basta#yuno 4_M_DWARF
+ein_in01,24,82,3 duplicate(Basta) Basta#einbroch 4_M_DWARF
+lhz_in02,280,17,3 duplicate(Basta) Basta#lighthalzen 4_M_DWARF
diff --git a/npc/re/merchants/inn.txt b/npc/re/merchants/inn.txt
index 7f86a7d2d..dcd08ae5e 100644
--- a/npc/re/merchants/inn.txt
+++ b/npc/re/merchants/inn.txt
@@ -13,7 +13,7 @@
// Brasilis
//============================================================
-bra_in01,27,24,3 script Hotel Keeper#bra1 478,{
+bra_in01,27,24,3 script Hotel Keeper#bra1 4_F_BRZ_WOMAN,{
mes "[Hotel Keeper]";
mes "Welcome to the beautiful Brasilis Hotel.";
next;
diff --git a/npc/re/merchants/quivers.txt b/npc/re/merchants/quivers.txt
index ff95ae7a4..1e4c226fb 100644
--- a/npc/re/merchants/quivers.txt
+++ b/npc/re/merchants/quivers.txt
@@ -17,7 +17,7 @@
//= 1.1 Updated to match the official scripts. [Euphy]
//============================================================
-mora,106,117,3 script Quiver Maker#mora 516,{
+mora,106,117,3 script Quiver Maker#mora 4_M_RAFLE_GR,{
if (checkweight(1201,1) == 0) {
mes "[Quiver Maker]";
mes "You have too many things with you.";
diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt
index 923e862e6..fa1853520 100644
--- a/npc/re/merchants/refine.txt
+++ b/npc/re/merchants/refine.txt
@@ -17,15 +17,15 @@
// +11 and above Refiners
//============================================================
-prt_in,90,72,5 script Vestri#prt 826,{
+prt_in,90,72,5 script Vestri#prt 4_M_DWARF,{
callfunc "refinenew","Vestri",0;
end;
}
-morocc_in,64,41,5 script Vestri#moc 826,{
+morocc_in,64,41,5 script Vestri#moc 4_M_DWARF,{
callfunc "refinenew","Vestri",0;
end;
}
-payon_in01,18,132,3 script Vestri#pay 826,{
+payon_in01,18,132,3 script Vestri#pay 4_M_DWARF,{
callfunc "refinenew","Vestri",0;
end;
}
@@ -387,13 +387,13 @@ function script refinenew {
mes "or "+getitemname(.@i[0])+".";
close;
}
-prt_in,85,71,5 duplicate(Austri#ref) Austri#prt 826
-payon_in01,14,125,5 duplicate(Austri#ref) Austri#pay 826
-morocc_in,60,38,5 duplicate(Austri#ref) Austri#moc 826
+prt_in,85,71,5 duplicate(Austri#ref) Austri#prt 4_M_DWARF
+payon_in01,14,125,5 duplicate(Austri#ref) Austri#pay 4_M_DWARF
+morocc_in,60,38,5 duplicate(Austri#ref) Austri#moc 4_M_DWARF
// Malangdo Refiner
//============================================================
-malangdo,224,172,6 script Clink#mal_normal 544,{
+malangdo,224,172,6 script Clink#mal_normal 4_CAT_SAILOR1,{
disable_items;
mes "[Clink]";
mes "My cool dad Holink said I have the world's greatest refine hammer!!";
diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt
index c721af536..59894c678 100644
--- a/npc/re/merchants/renters.txt
+++ b/npc/re/merchants/renters.txt
@@ -14,7 +14,7 @@
// Dragon Breeder
//============================================================
-job3_rune01,88,62,5 script Dragon Breeder 105,{
+job3_rune01,88,62,5 script Dragon Breeder 8W_SOLDIER,{
mes "[Dragon Breeder]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Welcome. Would you like to rent a Dragon?";
@@ -52,7 +52,7 @@ job3_rune01,88,62,5 script Dragon Breeder 105,{
// Dragon/Gryphon Master
//============================================================
-prontera,130,213,5 script Riding Creature Master 105,{
+prontera,130,213,5 script Riding Creature Master 8W_SOLDIER,{
mes "[Riding Creature Master]";
if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
mes "Welcome. Would you like to rent a Dragon?";
@@ -117,7 +117,7 @@ prontera,130,213,5 script Riding Creature Master 105,{
// Peco removing NPC
//============================================================
-prontera,125,208,5 script Peco Peco Remover 105,{
+prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{
mes "[Soldier]";
mes "If you're unable to dismount from a Peco Peco";
mes "for some unknown reason,";
@@ -196,13 +196,13 @@ prontera,125,208,5 script Peco Peco Remover 105,{
mes "Magic Gears are only available for Mechanics.";
close;
}
-prontera,163,178,3 duplicate(mgm) Magic Gear Master#prt 105
-geffen,103,55,5 duplicate(mgm) Magic Gear Master#gef 105
-payon,166,106,5 duplicate(mgm) Magic Gear Master#pay 105
-aldebaran,133,112,5 duplicate(mgm) Magic Gear Master#alde 105
-yuno,167,187,3 duplicate(mgm) Magic Gear Master#yuno 105
-rachel,106,134,5 duplicate(mgm) Magic Gear Master#ra 105
-dicastes01,187,207,3 duplicate(mgm) Magic Gear Master#dic 105
-manuk,273,212,5 duplicate(mgm) Magic Gear Master#man 105
-splendide,180,174,5 duplicate(mgm) Magic Gear Master#spl 105
-mid_camp,242,243,3 duplicate(mgm) Magic Gear Master#mid 105
+prontera,163,178,3 duplicate(mgm) Magic Gear Master#prt 8W_SOLDIER
+geffen,103,55,5 duplicate(mgm) Magic Gear Master#gef 8W_SOLDIER
+payon,166,106,5 duplicate(mgm) Magic Gear Master#pay 8W_SOLDIER
+aldebaran,133,112,5 duplicate(mgm) Magic Gear Master#alde 8W_SOLDIER
+yuno,167,187,3 duplicate(mgm) Magic Gear Master#yuno 8W_SOLDIER
+rachel,106,134,5 duplicate(mgm) Magic Gear Master#ra 8W_SOLDIER
+dicastes01,187,207,3 duplicate(mgm) Magic Gear Master#dic 8W_SOLDIER
+manuk,273,212,5 duplicate(mgm) Magic Gear Master#man 8W_SOLDIER
+splendide,180,174,5 duplicate(mgm) Magic Gear Master#spl 8W_SOLDIER
+mid_camp,242,243,3 duplicate(mgm) Magic Gear Master#mid 8W_SOLDIER
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 42fc5bd03..dcd445361 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -20,103 +20,103 @@
//=======================================================
// Comodo
//=======================================================
-comodo,106,213,5 shop Tropic Fruit Dealer 724,6258:-1
-comodo,196,162,3 shop Harive#candy 479,11513:-1,6144:-1
+comodo,106,213,5 shop Tropic Fruit Dealer 4_F_07,6258:-1
+comodo,196,162,3 shop Harive#candy 4_M_MINSTREL,11513:-1,6144:-1
//=======================================================
// Dewata
//=======================================================
-dewata,218,164,4 shop Weapon Dealer 536,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-dewata,182,164,6 shop Tool Dealer 536,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1,713:-1
-dewata,145,267,6 shop Fruit Gardener 535,512:-1,513:-1,515:-1,516:-1,535:-1
-dewata,158,182,6 shop Armor Dealer 536,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+dewata,218,164,4 shop Weapon Dealer 4_M_DEWMAN,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+dewata,182,164,6 shop Tool Dealer 4_M_DEWMAN,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1,713:-1
+dewata,145,267,6 shop Fruit Gardener 4_M_DEWOLDWOMAN,512:-1,513:-1,515:-1,516:-1,535:-1
+dewata,158,182,6 shop Armor Dealer 4_M_DEWMAN,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
//=======================================================
// Einbroch
//=======================================================
-einbroch,122,250,4 shop Black Marketeer#ein 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+einbroch,122,250,4 shop Black Marketeer#ein 1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
//=======================================================
// El Dicastes
//=======================================================
-dic_in01,238,107,5 shop Peddler#dic 900,601:-1,602:-1,611:-1,610:-1
-dicastes01,207,200,6 shop Points Merchant#dic 66,6360:-1,6361:-1,6362:-1,6363:-1
+dic_in01,238,107,5 shop Peddler#dic 4_M_HUMERCHANT,601:-1,602:-1,611:-1,610:-1
+dicastes01,207,200,6 shop Points Merchant#dic 1_F_01,6360:-1,6361:-1,6362:-1,6363:-1
//=======================================================
// Izlude
//=======================================================
-izlude,124,165,4 shop Fruit Gardener#iz 53,512:-1,513:-1,515:-1,516:-1
-izlude_a,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_a 53
-izlude_b,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_b 53
-izlude_c,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_c 53
-izlude_d,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_d 53
-izlude,160,186,0 shop Butcher#iz 54,517:-1
-izlude_a,160,186,0 duplicate(Butcher#iz) Butcher#iz_a 54
-izlude_b,160,186,0 duplicate(Butcher#iz) Butcher#iz_b 54
-izlude_c,160,186,0 duplicate(Butcher#iz) Butcher#iz_c 54
-izlude_d,160,186,0 duplicate(Butcher#iz) Butcher#iz_d 54
-izlude,128,158,7 shop Vendor from Milk Ranch#i 90,519:-1
-izlude_a,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#a 90
-izlude_b,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#b 90
-izlude_c,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#c 90
-izlude_d,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#d 90
-izlude_in,72,98,4 shop Pet Groomer#iz 124,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
-izlude_in,57,110,0 shop Tool Dealer#iz 47,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
-izlude_in,72,110,3 shop Trading Merchant#iz 900,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
+izlude,124,165,4 shop Fruit Gardener#iz 1_M_INNKEEPER,512:-1,513:-1,515:-1,516:-1
+izlude_a,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_a 1_M_INNKEEPER
+izlude_b,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_b 1_M_INNKEEPER
+izlude_c,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_c 1_M_INNKEEPER
+izlude_d,124,165,4 duplicate(Fruit Gardener#iz) Fruit Gardener#iz_d 1_M_INNKEEPER
+izlude,160,186,0 shop Butcher#iz 1_M_JOBGUIDER,517:-1
+izlude_a,160,186,0 duplicate(Butcher#iz) Butcher#iz_a 1_M_JOBGUIDER
+izlude_b,160,186,0 duplicate(Butcher#iz) Butcher#iz_b 1_M_JOBGUIDER
+izlude_c,160,186,0 duplicate(Butcher#iz) Butcher#iz_c 1_M_JOBGUIDER
+izlude_d,160,186,0 duplicate(Butcher#iz) Butcher#iz_d 1_M_JOBGUIDER
+izlude,128,158,7 shop Vendor from Milk Ranch#i 4_F_01,519:-1
+izlude_a,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#a 4_F_01
+izlude_b,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#b 4_F_01
+izlude_c,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#c 4_F_01
+izlude_d,128,158,7 duplicate(Vendor from Milk Ranch#i) Vendor from Milk Ranch#d 4_F_01
+izlude_in,72,98,4 shop Pet Groomer#iz 4_F_TELEPORTER,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+izlude_in,57,110,0 shop Tool Dealer#iz 1_M_01,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1
+izlude_in,72,110,3 shop Trading Merchant#iz 4_M_HUMERCHANT,13200:-1,13201:-1,13202:-1,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1,13163:-1,13165:-1,13168:-1
//=======================================================
// Juno
//=======================================================
-s_atelier,114,117,1 shop Part-Timer#sc_yuno 92,6123:-1,6120:-1
+s_atelier,114,117,1 shop Part-Timer#sc_yuno 4_F_03,6123:-1,6120:-1
//=======================================================
// Lighthalzen
//=======================================================
-lighthalzen,337,240,4 shop Trap Specialist#lhz 66,7940:-1,12341:-1
-lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1
+lighthalzen,337,240,4 shop Trap Specialist#lhz 1_F_01,7940:-1,12341:-1
+lhz_in03,181,17,4 shop Black Marketeer#lhz 1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,15,65,5 shop Part-Timer#sc_lgt 4_M_ORIENT02,6123:-1,6120:-1
//=======================================================
// Malangdo
//=======================================================
-malangdo,232,163,5 shop Tool Dealer Myo 560,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1
+malangdo,232,163,5 shop Tool Dealer Myo 4_CAT_ADV2,611:-1,1750:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,713:-1
//=======================================================
// Mora
//=======================================================
-mora,100,118,4 shop Tool Dealer#mora 517,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1
-mora,138,110,4 shop Mora Chef 518,11519:-1
+mora,100,118,4 shop Tool Dealer#mora 4_M_RAFLE_OLD,11522:-1,11523:-1,11524:-1,602:-1,601:-1,611:-1,1773:-1,1774:-1
+mora,138,110,4 shop Mora Chef 4_F_RAFLE_PK,11519:-1
//=======================================================
// Mid Camp
//=======================================================
-mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1
-mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+mid_camp,129,284,4 shop Trap Specialist#mid 1_F_01,7940:-1,12341:-1
+mid_camp,184,263,4 shop Black Marketeer#mid 1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
//=======================================================
// Payon
//=======================================================
-payon,123,109,4 shop Trap Specialist#pay 66,7940:-1,12341:-1
+payon,123,109,4 shop Trap Specialist#pay 1_F_01,7940:-1,12341:-1
//=======================================================
// Port Malaya
//=======================================================
-ma_in01,73,22,3 shop Weapon Dealer#ma 536,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
-ma_in01,22,23,3 shop Tool Dealer#ma 536,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
-malaya,150,261,3 shop Fruit Gardener#ma 535,512:-1,513:-1,515:-1,516:-1,535:-1
-ma_in01,67,13,5 shop Armor Dealer#ma 536,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
+ma_in01,73,22,3 shop Weapon Dealer#ma 4_M_DEWMAN,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+ma_in01,22,23,3 shop Tool Dealer#ma 4_M_DEWMAN,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2239:-1
+malaya,150,261,3 shop Fruit Gardener#ma 4_M_DEWOLDWOMAN,512:-1,513:-1,515:-1,516:-1,535:-1
+ma_in01,67,13,5 shop Armor Dealer#ma 4_M_DEWMAN,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2328:-1,2627:-1
//=======================================================
// Prontera
//=======================================================
-//prontera,104,88,5 shop Stuff Gimme 880,616:-1
-prt_in,109,68,4 shop Trap Specialist#prt 66,7940:-1,12341:-1
-prt_in,175,137,4 shop Black Marketeer#prt 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-1
+//prontera,104,88,5 shop Stuff Gimme 4_M_MASKMAN,616:-1
+prt_in,109,68,4 shop Trap Specialist#prt 1_F_01,7940:-1,12341:-1
+prt_in,175,137,4 shop Black Marketeer#prt 1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,17,110,1 shop Part-Timer#sc_prt 1_F_02,6123:-1,6120:-1
//=======================================================
// Rachel
//=======================================================
-ra_in01,263,281,4 shop Trap Specialist#ra 66,7940:-1,12341:-1
-ra_in01,257,266,4 shop Black Marketeer#ra 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,137,60,3 shop Part-Timer#sc_ra 70,6123:-1,6120:-1
+ra_in01,263,281,4 shop Trap Specialist#ra 1_F_01,7940:-1,12341:-1
+ra_in01,257,266,4 shop Black Marketeer#ra 1_M_03,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2805:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
+s_atelier,137,60,3 shop Part-Timer#sc_ra 1_F_GYPSY,6123:-1,6120:-1
diff --git a/npc/re/merchants/ticket_refiner.txt b/npc/re/merchants/ticket_refiner.txt
index ef8b29135..d5d4dd59f 100644
--- a/npc/re/merchants/ticket_refiner.txt
+++ b/npc/re/merchants/ticket_refiner.txt
@@ -13,7 +13,7 @@
//= 1.0 First version. [Euphy]
//============================================================
-prontera,184,177,6 script Refine Master 851,{
+prontera,184,177,6 script Refine Master 4_M_REPAIR,{
disable_items;
if (countitem(6238) || countitem(6228) || countitem(6229) || countitem(6230) || countitem(6231) || countitem(6456))
set .@bWeaponUp,1;
diff --git a/npc/re/other/bulletin_boards.txt b/npc/re/other/bulletin_boards.txt
index ecfaaf9ca..1d0dbb904 100644
--- a/npc/re/other/bulletin_boards.txt
+++ b/npc/re/other/bulletin_boards.txt
@@ -29,9 +29,9 @@
mes "From Izlude, ^3355FFProntera^000000 is located to the Northwest, and ^006600Payon^000000 is located to the South. Enjoy your travels in the Rune-Midgarts Kingdom.";
close;
}
-izlude,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5 837
-izlude_a,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_a 837
-izlude_b,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_b 837
-izlude_c,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_c 837
-izlude_d,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_d 837
+izlude,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5 2_BULLETIN_BOARD
+izlude_a,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_a 2_BULLETIN_BOARD
+izlude_b,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_b 2_BULLETIN_BOARD
+izlude_c,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_c 2_BULLETIN_BOARD
+izlude_d,25,103,0 duplicate(BulletinBoard_iz) Bulletin Board#5_d 2_BULLETIN_BOARD
*/
diff --git a/npc/re/other/item_merge.txt b/npc/re/other/item_merge.txt
index 55004785f..f823f5c3c 100644
--- a/npc/re/other/item_merge.txt
+++ b/npc/re/other/item_merge.txt
@@ -12,7 +12,7 @@
//= 1.0 First version, currently useless/disabled.
//============================================================
-prontera,146,95,3 script Mergician#pron 64,{
+prontera,146,95,3 script Mergician#pron 1_M_WIZARD,{
if (checkweight(1301,1) == 0) {
mes "- Wait a second !! -";
mes "- You are carrying too many items -";
diff --git a/npc/re/other/mail.txt b/npc/re/other/mail.txt
index 3aa040ea2..42c26db6f 100644
--- a/npc/re/other/mail.txt
+++ b/npc/re/other/mail.txt
@@ -13,7 +13,7 @@
// Izlude
//============================================================
-izlude_a,136,94,0 duplicate(MailBox) Mailbox#iz_a 888
-izlude_b,136,94,0 duplicate(MailBox) Mailbox#iz_b 888
-izlude_c,136,94,0 duplicate(MailBox) Mailbox#iz_c 888
-izlude_d,136,94,0 duplicate(MailBox) Mailbox#iz_d 888
+izlude_a,136,94,0 duplicate(MailBox) Mailbox#iz_a 2_POSTBOX
+izlude_b,136,94,0 duplicate(MailBox) Mailbox#iz_b 2_POSTBOX
+izlude_c,136,94,0 duplicate(MailBox) Mailbox#iz_c 2_POSTBOX
+izlude_d,136,94,0 duplicate(MailBox) Mailbox#iz_d 2_POSTBOX
diff --git a/npc/re/other/mercenary_rent.txt b/npc/re/other/mercenary_rent.txt
index 9056d56f7..09c2a24ce 100644
--- a/npc/re/other/mercenary_rent.txt
+++ b/npc/re/other/mercenary_rent.txt
@@ -12,14 +12,14 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-izlude,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 734
-izlude_a,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_a 734
-izlude_b,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_b 734
-izlude_c,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_c 734
-izlude_d,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_d 734
+izlude,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Sword 4_M_JOB_KNIGHT2
+izlude_a,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_a 4_M_JOB_KNIGHT2
+izlude_b,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_b 4_M_JOB_KNIGHT2
+izlude_c,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_c 4_M_JOB_KNIGHT2
+izlude_d,47,170,4 duplicate(Mercenary Manager#main) Mercenary Manager#Swo_d 4_M_JOB_KNIGHT2
-izlude,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892
-izlude_a,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_a 892
-izlude_b,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_b 892
-izlude_c,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_c 892
-izlude_d,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_d 892
+izlude,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Sword 4_F_HUGRANMA
+izlude_a,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_a 4_F_HUGRANMA
+izlude_b,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_b 4_F_HUGRANMA
+izlude_c,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_c 4_F_HUGRANMA
+izlude_d,55,170,4 duplicate(MercMerchant) Mercenary Merchant#Swo_d 4_F_HUGRANMA
diff --git a/npc/re/other/pvp.txt b/npc/re/other/pvp.txt
index deebc7b72..61e0817fa 100644
--- a/npc/re/other/pvp.txt
+++ b/npc/re/other/pvp.txt
@@ -13,7 +13,7 @@
// PVP Warpers
//============================================================
-pvp_y_room,30,85,4 script Fight Square Reception#1 105,{ //5,5
+pvp_y_room,30,85,4 script Fight Square Reception#1 8W_SOLDIER,{ //5,5
callfunc "F_PVP_FSRS",50,69;
end;
@@ -22,7 +22,7 @@ OnInit:
end;
}
-pvp_y_room,38,85,4 script Fight Square Reception#2 105,{ //5,5
+pvp_y_room,38,85,4 script Fight Square Reception#2 8W_SOLDIER,{ //5,5
callfunc "F_PVP_FSRS",70,89;
end;
@@ -31,7 +31,7 @@ OnInit:
end;
}
-pvp_y_room,46,85,4 script Fight Square Reception#3 105,{ //5,5
+pvp_y_room,46,85,4 script Fight Square Reception#3 8W_SOLDIER,{ //5,5
callfunc "F_PVP_FSRS",90,99;
end;
@@ -40,7 +40,7 @@ OnInit:
end;
}
-pvp_y_room,54,85,4 script Fight Square Reception#8 105,{
+pvp_y_room,54,85,4 script Fight Square Reception#8 8W_SOLDIER,{
callfunc "F_PVP_FSRS";
end;
@@ -49,7 +49,7 @@ OnInit:
end;
}
-pvp_y_room,62,85,4 script Fight Square Reception#4 105,{
+pvp_y_room,62,85,4 script Fight Square Reception#4 8W_SOLDIER,{
//if (ADVJOB > 0) {
if (Upper == 1) {
mes "[PVP Fight Square Reception Staff]";
@@ -65,7 +65,7 @@ OnInit:
end;
}
-pvp_y_room,70,85,4 script Fight Square Reception#5 105,{
+pvp_y_room,70,85,4 script Fight Square Reception#5 8W_SOLDIER,{
//if (ADVJOB == 0) {
if (Upper != 1) {
mes "[PVP Fight Square Reception Staff]";
@@ -81,7 +81,7 @@ OnInit:
end;
}
-pvp_n_room,86,85,4 script Fight Square Reception#n 105,{
+pvp_n_room,86,85,4 script Fight Square Reception#n 8W_SOLDIER,{
callfunc "F_PVP_FSRS";
end;
diff --git a/npc/re/other/resetskill.txt b/npc/re/other/resetskill.txt
index 7e14c9537..f3415e6c9 100644
--- a/npc/re/other/resetskill.txt
+++ b/npc/re/other/resetskill.txt
@@ -13,7 +13,7 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-izlude,127,175,3 script Hypnotist#novice 124,{
+izlude,127,175,3 script Hypnotist#novice 4_F_TELEPORTER,{
mes "[Hypnotist]";
mes "Greetings, adventurer.";
mes "I'm a member of the Hypnotist";
@@ -141,7 +141,7 @@ izlude,127,175,3 script Hypnotist#novice 124,{
close;
}
}
-izlude_a,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_a 124
-izlude_b,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_b 124
-izlude_c,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_c 124
-izlude_d,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_d 124
+izlude_a,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_a 4_F_TELEPORTER
+izlude_b,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_b 4_F_TELEPORTER
+izlude_c,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_c 4_F_TELEPORTER
+izlude_d,127,175,3 duplicate(Hypnotist#novice) Hypnotist#novice_d 4_F_TELEPORTER
diff --git a/npc/re/other/stone_change.txt b/npc/re/other/stone_change.txt
index a6b903273..cfb2aa5eb 100644
--- a/npc/re/other/stone_change.txt
+++ b/npc/re/other/stone_change.txt
@@ -11,7 +11,7 @@
//= 1.0 First version.
//============================================================
-geffen_in,99,174,5 script Ore Tester#sorty 700,{
+geffen_in,99,174,5 script Ore Tester#sorty 8_F_GIRL,{
mes "[Ore Tester Sorty]";
mes "Do you have ^3131FFany same type of ores in your inventories^000000 which take many spaces?";
mes "I can distinguish your ores and organize them right away~!";
diff --git a/npc/re/other/turbo_track.txt b/npc/re/other/turbo_track.txt
index 129f4bcc8..b975093a8 100644
--- a/npc/re/other/turbo_track.txt
+++ b/npc/re/other/turbo_track.txt
@@ -11,4 +11,4 @@
//= 1.0 Split Mount Manager NPC.
//============================================================
-alde_gld,181,199,5 duplicate(MountManager_turbo) Mount Manager 845
+alde_gld,181,199,5 duplicate(MountManager_turbo) Mount Manager 4_F_RACING
diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt
index 3f3ded52e..182214064 100644
--- a/npc/re/quests/cupet.txt
+++ b/npc/re/quests/cupet.txt
@@ -12,7 +12,7 @@
//============================================================
// 1st NPC
-- script CPM1 750,{
+- script CPM1 4_M_ALCHE_C,{
set .@npc$, "[Cute Pet Manager]";
@@ -43,7 +43,7 @@
}
// 2nd NPC
-- script CPM2 750,{
+- script CPM2 4_M_ALCHE_C,{
set .@npc$, "[Cute Pet Manager]";
@@ -75,7 +75,7 @@
}
// 3rd NPC
-- script CPM3 750,{
+- script CPM3 4_M_ALCHE_C,{
set .@npc$, "[Cute Pet Manager]";
@@ -223,18 +223,18 @@ function script cute_pet_manager {
}
// NPC Duplicates
-prontera,67,212,5 duplicate(CPM1) Cute Pet Manager#1 750
-prontera,242,92,3 duplicate(CPM2) Cute Pet Manager#2 750
-prontera,179,92,3 duplicate(CPM3) Cute Pet Manager#3 750
+prontera,67,212,5 duplicate(CPM1) Cute Pet Manager#1 4_M_ALCHE_C
+prontera,242,92,3 duplicate(CPM2) Cute Pet Manager#2 4_M_ALCHE_C
+prontera,179,92,3 duplicate(CPM3) Cute Pet Manager#3 4_M_ALCHE_C
-geffen,180,125,5 duplicate(CPM1) Cute Pet Manager#4 750
-geffen,152,66,3 duplicate(CPM2) Cute Pet Manager#5 750
-geffen,197,95,3 duplicate(CPM3) Cute Pet Manager#6 750
+geffen,180,125,5 duplicate(CPM1) Cute Pet Manager#4 4_M_ALCHE_C
+geffen,152,66,3 duplicate(CPM2) Cute Pet Manager#5 4_M_ALCHE_C
+geffen,197,95,3 duplicate(CPM3) Cute Pet Manager#6 4_M_ALCHE_C
-morocc,115,83,5 duplicate(CPM1) Cute Pet Manager#7 750
-morocc,218,130,3 duplicate(CPM2) Cute Pet Manager#8 750
-morocc,236,225,3 duplicate(CPM3) Cute Pet Manager#9 750
+morocc,115,83,5 duplicate(CPM1) Cute Pet Manager#7 4_M_ALCHE_C
+morocc,218,130,3 duplicate(CPM2) Cute Pet Manager#8 4_M_ALCHE_C
+morocc,236,225,3 duplicate(CPM3) Cute Pet Manager#9 4_M_ALCHE_C
-payon,109,278,5 duplicate(CPM1) Cute Pet Manager#10 750
-payon,157,124,3 duplicate(CPM2) Cute Pet Manager#11 750
-payon,85,237,3 duplicate(CPM3) Cute Pet Manager#12 750
+payon,109,278,5 duplicate(CPM1) Cute Pet Manager#10 4_M_ALCHE_C
+payon,157,124,3 duplicate(CPM2) Cute Pet Manager#11 4_M_ALCHE_C
+payon,85,237,3 duplicate(CPM3) Cute Pet Manager#12 4_M_ALCHE_C
diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt
index 361f8fb57..200454e81 100644
--- a/npc/re/quests/eden/11-25.txt
+++ b/npc/re/quests/eden/11-25.txt
@@ -12,7 +12,7 @@
//= 1.2 Optimized. [Euphy]
//============================================================
-moc_para01,36,38,3 script Mission [11 - 25]#Tuto 857,{
+moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{
if (countitem(6219) < 1) {
mes "- You need to have an -";
mes "- ^4d4dff'Eden Group Mark'^000000 -";
@@ -97,7 +97,7 @@ L_Quest:
close;
}
-moc_para01,32,30,6 script Spike 914,{
+moc_para01,32,30,6 script Spike 4_F_CHILD,{
for(set .@i,11114; .@i<11124; set .@i,.@i+1) {
set .@j, checkquest(.@i,HUNTING);
if (.@j == 2) switch(.@i) {
diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt
index fe147f210..a4f0d5637 100644
--- a/npc/re/quests/eden/26-40.txt
+++ b/npc/re/quests/eden/26-40.txt
@@ -12,7 +12,7 @@
//= 1.2 Optimized. [Euphy]
//============================================================
-moc_para01,38,38,3 script Mission [26 - 40] 857,{
+moc_para01,38,38,3 script Mission [26 - 40] 4_BOARD3,{
if (countitem(6219) < 1) {
mes "You are not a qualified member. You can not use the bulletin board.";
close;
@@ -95,7 +95,7 @@ L_Quest:
close;
}
-geffen,103,42,5 script Sponiac 99,{
+geffen,103,42,5 script Sponiac 4W_M_03,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
mes "[Sponiac]";
mes "Why are you carrying so many items?";
@@ -175,7 +175,7 @@ L_Quest:
close;
}
-moc_ruins,173,55,3 script Dieshin Man 89,{
+moc_ruins,173,55,3 script Dieshin Man 4_M_ORIENT02,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
mes "[Dieshin Man]";
mes "Why are you carrying so many items?";
@@ -259,7 +259,7 @@ L_Quest:
close;
}
-pay_fild07,83,89,7 script Zoologist 89,{
+pay_fild07,83,89,7 script Zoologist 4_M_ORIENT02,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
mes "[Zoologist]";
mes "Why are you carrying so many items?";
@@ -324,7 +324,7 @@ pay_fild07,83,89,7 script Zoologist 89,{
close;
}
-prt_fild03,30,254,3 script Entomologist 83,{
+prt_fild03,30,254,3 script Entomologist 4_M_01,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
mes "[Entomologist]";
mes "Why are you carrying so many items?";
@@ -389,7 +389,7 @@ prt_fild03,30,254,3 script Entomologist 83,{
close;
}
-xmas_fild01,92,57,3 script Biologist 97,{
+xmas_fild01,92,57,3 script Biologist 4W_M_01,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
mes "[Biologist]";
mes "Why are you carrying so many items?";
@@ -454,7 +454,7 @@ xmas_fild01,92,57,3 script Biologist 97,{
close;
}
-payon,179,66,3 script Dashia 931,{
+payon,179,66,3 script Dashia 4_M_RACHMAN1,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 3500) {
mes "[Dashia]";
mes "Why are you carrying so many items?";
diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt
index 57f131f07..45c5ee876 100644
--- a/npc/re/quests/eden/41-55.txt
+++ b/npc/re/quests/eden/41-55.txt
@@ -12,7 +12,7 @@
//= 1.2 Optimized. [Euphy]
//============================================================
-moc_para01,40,38,3 script Mission [41 - 55] 857,{
+moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{
if (countitem(6219) < 1) {
mes "You are not an Eden group member. You are not qualified to access the bulletin board.";
close;
diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt
index c3a99ed3e..c7e5103a8 100644
--- a/npc/re/quests/eden/56-70.txt
+++ b/npc/re/quests/eden/56-70.txt
@@ -15,7 +15,7 @@
//= 1.5 Optimized, based on code by Zopokx. [Euphy]
//============================================================
-moc_para01,42,38,3 script Mission [56 - 70] 857,{
+moc_para01,42,38,3 script Mission [56 - 70] 4_BOARD3,{
if (countitem(6219) < 1) {
mes "To get these missions, I need to Join the Eden Group first. I must find Secretary Lime Evenor and become a member.";
close;
diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt
index db704a3de..57102982c 100644
--- a/npc/re/quests/eden/71-85.txt
+++ b/npc/re/quests/eden/71-85.txt
@@ -13,7 +13,7 @@
//= 1.3 Updated to match the official scripts. [Euphy]
//============================================================
-moc_para01,44,38,3 script Mission [71 - 85] 857,{
+moc_para01,44,38,3 script Mission [71 - 85] 4_BOARD3,{
if (countitem(6219) < 1) {
mes "- Only members of the -";
mes "- Eden Group can read -";
diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt
index 33dcf87ac..60bbac0e2 100644
--- a/npc/re/quests/eden/86-90.txt
+++ b/npc/re/quests/eden/86-90.txt
@@ -13,7 +13,7 @@
//= 1.3 Updated to match the official script. [Euphy]
//============================================================
-moc_para01,48,175,3 script 86-90 Mission Board 857,{
+moc_para01,48,175,3 script 4_M_04-90 Mission Board 857,{
if (countitem(6219) < 1) {
mes "Wait a minute!";
mes "-You need to have an-";
diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt
index 21ae3cfe1..0c3c6b12f 100644
--- a/npc/re/quests/eden/91-99.txt
+++ b/npc/re/quests/eden/91-99.txt
@@ -13,7 +13,7 @@
//= 1.3 Updated to match the official script. [Euphy]
//============================================================
-moc_para01,48,177,3 script 91-99 Mission Board 857,{
+moc_para01,48,177,3 script 4_F_02-99 Mission Board 857,{
if (countitem(6219) < 1) {
mes "Wait a minute!";
mes "-You need to have an-";
diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt
index a2d2a624b..7c6be1aa4 100644
--- a/npc/re/quests/eden/eden_common.txt
+++ b/npc/re/quests/eden/eden_common.txt
@@ -19,7 +19,7 @@
//= 1.8 Updated to match the latest official script. [Euphy]
//============================================================
-moc_para01,27,35,5 script Secretary Lime Evenor 952,{
+moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{
if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
mes "- Wait a minute !! -";
mes "- Currently you're carrying -";
@@ -212,44 +212,44 @@ moc_para01,27,35,5 script Secretary Lime Evenor 952,{
close;
}
}
-prontera,124,76,3 duplicate(eto) Eden Teleport Officer#1 729
-moc_ruins,68,164,3 duplicate(eto) Eden Teleport Officer#2 729
-geffen,132,66,3 duplicate(eto) Eden Teleport Officer#3 729
-alberta,124,67,3 duplicate(eto) Eden Teleport Officer#4 729
-aldebaran,133,119,5 duplicate(eto) Eden Teleport Officer#5 729
-izlude_in,68,162,1 duplicate(eto) Eden Teleport Officer#6 729
-prt_church,103,78,3 duplicate(eto) Eden Teleport Officer#7 729
-geffen_in,160,104,5 duplicate(eto) Eden Teleport Officer#8 729
-moc_prydb1,53,126,3 duplicate(eto) Eden Teleport Officer#9 729
-alberta_in,75,39,3 duplicate(eto) Eden Teleport Officer#10 729
-payon_in02,58,58,1 duplicate(eto) Eden Teleport Officer#11 729
-payon,177,111,3 duplicate(eto) Eden Teleport Officer#12 729
-que_ng,33,73,3 duplicate(eto) Eden Teleport Officer#13 729
-que_ng,144,161,5 duplicate(eto) Eden Teleport Officer#14 729
-yuno,144,189,5 duplicate(eto) Eden Teleport Officer#15 729
-rachel,125,144,3 duplicate(eto) Eden Teleport Officer#16 729
-comodo,202,151,4 duplicate(eto) Eden Teleport Officer#17 729
-hugel,93,153,4 duplicate(eto) Eden Teleport Officer#18 729
-veins,220,109,4 duplicate(eto) Eden Teleport Officer#19 729
-einbroch,250,211,4 duplicate(eto) Eden Teleport Officer#20 729
-lighthalzen,164,86,4 duplicate(eto) Eden Teleport Officer#21 729
-amatsu,100,145,5 duplicate(eto) Eden Teleport Officer#22 729
-ayothaya,221,191,3 duplicate(eto) Eden Teleport Officer#23 729
-louyang,224,107,3 duplicate(eto) Eden Teleport Officer#24 729
-gonryun,162,122,5 duplicate(eto) Eden Teleport Officer#25 729
-moscovia,209,197,5 duplicate(eto) Eden Teleport Officer#26 729
-brasilis,191,224,3 duplicate(eto) Eden Teleport Officer#27 729
-dewata,192,193,5 duplicate(eto) Eden Teleport Officer#28 729
-morocc,161,97,5 duplicate(eto) Eden Teleport Officer#29 729
-izlude,131,148,4 duplicate(eto) Eden Teleport Officer#30 729
-izlude_a,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_a 729
-izlude_b,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_b 729
-izlude_c,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_c 729
-izlude_d,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_d 729
-umbala,105,158,3 duplicate(eto) Eden Teleport Officer#31 729
-malaya,238,206,6 duplicate(eto) Eden Teleport Officer#32 729
+prontera,124,76,3 duplicate(eto) Eden Teleport Officer#1 4_F_NOVICE
+moc_ruins,68,164,3 duplicate(eto) Eden Teleport Officer#2 4_F_NOVICE
+geffen,132,66,3 duplicate(eto) Eden Teleport Officer#3 4_F_NOVICE
+alberta,124,67,3 duplicate(eto) Eden Teleport Officer#4 4_F_NOVICE
+aldebaran,133,119,5 duplicate(eto) Eden Teleport Officer#5 4_F_NOVICE
+izlude_in,68,162,1 duplicate(eto) Eden Teleport Officer#6 4_F_NOVICE
+prt_church,103,78,3 duplicate(eto) Eden Teleport Officer#7 4_F_NOVICE
+geffen_in,160,104,5 duplicate(eto) Eden Teleport Officer#8 4_F_NOVICE
+moc_prydb1,53,126,3 duplicate(eto) Eden Teleport Officer#9 4_F_NOVICE
+alberta_in,75,39,3 duplicate(eto) Eden Teleport Officer#10 4_F_NOVICE
+payon_in02,58,58,1 duplicate(eto) Eden Teleport Officer#11 4_F_NOVICE
+payon,177,111,3 duplicate(eto) Eden Teleport Officer#12 4_F_NOVICE
+que_ng,33,73,3 duplicate(eto) Eden Teleport Officer#13 4_F_NOVICE
+que_ng,144,161,5 duplicate(eto) Eden Teleport Officer#14 4_F_NOVICE
+yuno,144,189,5 duplicate(eto) Eden Teleport Officer#15 4_F_NOVICE
+rachel,125,144,3 duplicate(eto) Eden Teleport Officer#16 4_F_NOVICE
+comodo,202,151,4 duplicate(eto) Eden Teleport Officer#17 4_F_NOVICE
+hugel,93,153,4 duplicate(eto) Eden Teleport Officer#18 4_F_NOVICE
+veins,220,109,4 duplicate(eto) Eden Teleport Officer#19 4_F_NOVICE
+einbroch,250,211,4 duplicate(eto) Eden Teleport Officer#20 4_F_NOVICE
+lighthalzen,164,86,4 duplicate(eto) Eden Teleport Officer#21 4_F_NOVICE
+amatsu,100,145,5 duplicate(eto) Eden Teleport Officer#22 4_F_NOVICE
+ayothaya,221,191,3 duplicate(eto) Eden Teleport Officer#23 4_F_NOVICE
+louyang,224,107,3 duplicate(eto) Eden Teleport Officer#24 4_F_NOVICE
+gonryun,162,122,5 duplicate(eto) Eden Teleport Officer#25 4_F_NOVICE
+moscovia,209,197,5 duplicate(eto) Eden Teleport Officer#26 4_F_NOVICE
+brasilis,191,224,3 duplicate(eto) Eden Teleport Officer#27 4_F_NOVICE
+dewata,192,193,5 duplicate(eto) Eden Teleport Officer#28 4_F_NOVICE
+morocc,161,97,5 duplicate(eto) Eden Teleport Officer#29 4_F_NOVICE
+izlude,131,148,4 duplicate(eto) Eden Teleport Officer#30 4_F_NOVICE
+izlude_a,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_a 4_F_NOVICE
+izlude_b,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_b 4_F_NOVICE
+izlude_c,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_c 4_F_NOVICE
+izlude_d,131,148,4 duplicate(eto) Eden Teleport Officer#30::eto_iz_d 4_F_NOVICE
+umbala,105,158,3 duplicate(eto) Eden Teleport Officer#31 4_F_NOVICE
+malaya,238,206,6 duplicate(eto) Eden Teleport Officer#32 4_F_NOVICE
-moc_para01,30,10,0 script #eden_out 45,1,1,{
+moc_para01,30,10,0 script #eden_out WARPNPC,1,1,{
OnTouch:
switch (nak_warp) {
case 1: warp "prontera",116,72; end;
@@ -289,7 +289,7 @@ OnTouch:
end;
}
-moc_para01,47,39,3 script #warp_2_pass 111,{
+moc_para01,47,39,3 script #warp_2_pass HIDDEN_NPC,{
if (countitem(6219) > 0) {
mes "[Lime Evenor]";
mes "Oh, it is an exclusive place only for Eden's members.";
@@ -313,7 +313,7 @@ moc_para01,47,39,3 script #warp_2_pass 111,{
close;
}
-moc_para01,16,22,7 script Old Adventurer#eden 900,{
+moc_para01,16,22,7 script Old Adventurer#eden 4_M_HUMERCHANT,{
mes "[Old Adventurer]";
mes "Harsh, I am strong enough even if I look old! What is his name? Lime Evenor? He just ignores me like I am a some kind of old senile bastard.";
next;
@@ -323,7 +323,7 @@ moc_para01,16,22,7 script Old Adventurer#eden 900,{
close;
}
-moc_para01,182,48,3 script Eden's Chief#eden 886,{
+moc_para01,182,48,3 script Eden's Chief#eden 4_COOK,{
set .@eggf,rand(1,118);
set .@eggf_1,.@eggf + 1;
set .@eggf_2,.@eggf + 2;
@@ -346,7 +346,7 @@ moc_para01,182,48,3 script Eden's Chief#eden 886,{
close;
}
-moc_para01,172,28,5 script Eden's Intern#eden 883,{
+moc_para01,172,28,5 script Eden's Intern#eden 4_M_ALCHE_D,{
mes "[Eden's Intern]";
mes "Actually, I realized that.";
next;
@@ -361,7 +361,7 @@ moc_para01,172,28,5 script Eden's Intern#eden 883,{
close;
}
-moc_para01,20,35,5 script Office Assistant Neede 814,{
+moc_para01,20,35,5 script Office Assistant Neede 4_F_CHNDOCTOR,{
mes "[Neede]";
mes "I became a Eden's member several years ago, but it feels like it was yesterday.";
mes "I have been doing lots of work, so I didn't even notice how many years I spent here.";
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index b8cd44ce4..8b81b5c4f 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -14,7 +14,7 @@
// Acolyte Warper (part of other/acolyte_warp.txt)
//============================================================
-moc_para01,14,32,5 script Aperture#acolytewarp 90,{
+moc_para01,14,32,5 script Aperture#acolytewarp 4_F_01,{
mes "[Aperture]";
mes "Hello there, adventurer.";
mes "I've been studying magic from all over Rune-Midgard to upgrade what I believe to be one of the greatest skills available to the acolyte class.";
@@ -90,7 +90,7 @@ moc_para01,14,32,5 script Aperture#acolytewarp 90,{
// Carrot & Red Potion Traders
//============================================================
-moc_para01,166,51,3 script Phelix#edco 85,{
+moc_para01,166,51,3 script Phelix#edco 4_M_03,{
mes "[Phelix]";
mes "Oh... I see from that look that you want me to work and give you Meat and Carrots...";
mes "Well my friend Izaac here has some Red Potions with him, but I only have some Carrots.";
@@ -153,7 +153,7 @@ moc_para01,166,51,3 script Phelix#edco 85,{
end;
}
-moc_para01,163,51,7 script Izaac#edco 86,{
+moc_para01,163,51,7 script Izaac#edco 4_M_04,{
mes "[Izaac]";
mes "Good day!";
mes "Have you collected any weird stuff from monsters?";
@@ -259,7 +259,7 @@ moc_para01,163,51,7 script Izaac#edco 86,{
// Safe to 7 Certificate Exchanger
//============================================================
-moc_para01,50,39,4 script Eve Natalia 882,{
+moc_para01,50,39,4 script Eve Natalia 4_F_SITDOWN,{
mes "[Eve Natalia]";
mes "So I'm in town for a while to see if I can strike up some commerce with MVP hunters!";
mes "I'm willing to take some MVP gear and give you these upgrade Certificates I have in exchange;";
@@ -337,7 +337,7 @@ moc_para01,50,39,4 script Eve Natalia 882,{
// Bubble Gum & Battle Manual Exchanger
//============================================================
-moc_para01,48,184,2 script Gum & Manual Exchanger 562,{
+moc_para01,48,184,2 script Gum & Manual Exchanger 2_DROP_MACHINE,{
if (Weight < MaxWeight / 2) {
mes "You're carrying too many items right now.";
close;
@@ -429,7 +429,7 @@ L_Exchange:
// Kafra Stacker
//============================================================
-moc_para01,41,169,2 script Kafra Stacker#eden 749,{
+moc_para01,41,169,2 script Kafra Stacker#eden 4_M_ALCHE_B,{
mes "[Toma]";
mes "I can take your non-stacking Kafra Consumables";
mes "and make them fit neatly into stacks!";
@@ -456,7 +456,7 @@ moc_para01,41,169,2 script Kafra Stacker#eden 749,{
// Code Redeemer
//============================================================
-moc_para01,38,162,2 script Code the Redeemer#Give1 405,{
+moc_para01,38,162,2 script Code the Redeemer#Give1 4_M_YOUNGKNIGHT,{
mes "[Code the Redeemer]";
mes "Welcome, "+strcharinfo(0)+"!";
mes "I've been expecting you.";
@@ -484,29 +484,29 @@ moc_para01,38,162,2 script Code the Redeemer#Give1 405,{
//============================================================
/* Due to the irregularity of iRO's databases, some of these sprites may not display properly. */
-moc_para01,32,171,4 cashshop Kafra Headgears#eden1 115,14024:500,14098:150,17081:300,14097:500,14094:1000,14017:400,14099:300
-moc_para01,35,174,2 cashshop Kafra Dye Shop#dyes2 114,6287:150
-moc_para01,36,170,2 cashshop Kafra Consumables#eden3 112,13810:5,14167:400,16556:100,14111:75,14075:25,16419:30,14107:70,14104:50,14112:25,14082:30,14091:60,14088:30,14085:60,14169:40,14170:40,14172:40,14173:40,14171:40,14174:40,14159:100,14160:100,14161:100,14162:100,14163:100:14164:100,16420:1500
-moc_para01,32,174,2 cashshop Kafra Rental Items#eden 721,16683:150,16682:50,14126:250,14125:250,16430:250,14137:250,14127:250,14118:250,14119:250,14132:250,16425:250,14124:250,14133:250,14130:250,16424:250,14136:250,14122:250,16426:250,14135:250,14134:250,14138:250,16428:250,16431:250,14139:250,14131:250,16429:250,16427:250
-moc_para01,36,172,2 cashshop Kafra Costume#eden5 860,16974:300,16972:600,16973:150,16975:150,16977:150,17014:150,17015:150
-moc_para01,35,168,1 cashshop Kafra Utility Shop#eden 113,16677:25,13990:400,16396:100,16394:100,17106:500,6241:10,6240:10,6225:15,6226:15,14002:5,6294:500,7776:50,7619:30,7620:30,12208:40,14156:400,12210:40,14158:400,14042:50,14044:50,14046:50,14048:50,14114:50,14166:40,16418:500,16381:400,14165:100,14157:100,14178:100
+moc_para01,32,171,4 cashshop Kafra Headgears#eden1 4_F_KAFRA3,14024:500,14098:150,17081:300,14097:500,14094:1000,14017:400,14099:300
+moc_para01,35,174,2 cashshop Kafra Dye Shop#dyes2 4_F_KAFRA4,6287:150
+moc_para01,36,170,2 cashshop Kafra Consumables#eden3 4_F_KAFRA6,13810:5,14167:400,16556:100,14111:75,14075:25,16419:30,14107:70,14104:50,14112:25,14082:30,14091:60,14088:30,14085:60,14169:40,14170:40,14172:40,14173:40,14171:40,14174:40,14159:100,14160:100,14161:100,14162:100,14163:100:14164:100,16420:1500
+moc_para01,32,174,2 cashshop Kafra Rental Items#eden 4_F_KAFRA7,16683:150,16682:50,14126:250,14125:250,16430:250,14137:250,14127:250,14118:250,14119:250,14132:250,16425:250,14124:250,14133:250,14130:250,16424:250,14136:250,14122:250,16426:250,14135:250,14134:250,14138:250,16428:250,16431:250,14139:250,14131:250,16429:250,16427:250
+moc_para01,36,172,2 cashshop Kafra Costume#eden5 4_F_KAFRA8,16974:300,16972:600,16973:150,16975:150,16977:150,17014:150,17015:150
+moc_para01,35,168,1 cashshop Kafra Utility Shop#eden 4_F_KAFRA5,16677:25,13990:400,16396:100,16394:100,17106:500,6241:10,6240:10,6225:15,6226:15,14002:5,6294:500,7776:50,7619:30,7620:30,12208:40,14156:400,12210:40,14158:400,14042:50,14044:50,14046:50,14048:50,14114:50,14166:40,16418:500,16381:400,14165:100,14157:100,14178:100
// Duplicate NPCs
//============================================================
/* Technically these NPC names are different, but it's not worth editing the original scripts. */
// Weapon/Armor Refiner "Normalson" (merchants/refine.txt)
-moc_para01,14,185,4 script Normalson#ed 826,{
+moc_para01,14,185,4 script Normalson#ed 4_M_DWARF,{
callfunc "refinemain","Normalson",0;
end;
}
// Advanced Refiner "Suhnmi" (merchants/advanced_refiner.txt)
-moc_para01,26,185,4 duplicate(Suhnbi#cash) Suhnmi#eden 85
+moc_para01,26,185,4 duplicate(Suhnbi#cash) Suhnmi#eden 4_M_03
// HD Refiner "Blacksmith Mighty Hammer" (re/merchants/hd_refiner.txt)
// A combination of the +7~9 and +10 and up refiner, currently a placeholder.
-moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 826
+moc_para01,38,185,4 duplicate(MightyHammer) Mighty Hammer#ed 4_M_DWARF
// Refiner Effect
- script #eden_refine_effect -1,{
@@ -521,25 +521,25 @@ OnTimer5000:
}
// Gym Pass Trainer "Ripped Cabus" (other/gympass)
-moc_para01,33,162,4 duplicate(Ripped Cabus#GymPass) Ripped Callus#ed 899
+moc_para01,33,162,4 duplicate(Ripped Cabus#GymPass) Ripped Callus#ed 4_M_HUMAN_02
// RWC 2012 Enchanter "Goldenthiefberg" (events/RWC_2012.txt)
// A combination of the slotter and enchanter, currently a placeholder.
-moc_para01,27,179,4 script RWC Enchanter#new10 87,{ end; }
+moc_para01,27,179,4 script RWC Enchanter#new10 4_M_BARBER,{ end; }
// Cash Headgear Dyer "Alora" (merchants/cashheadgear_dye.txt)
// Also converts some +8 and up headgears into costumes, currently a placeholder.
-moc_para01,21,185,4 duplicate(Alora) Alora#headgear_dye2 862
+moc_para01,21,185,4 duplicate(Alora) Alora#headgear_dye2 4_F_LGTGIRL
// Stylist "Dinorah Lacostt" (?)
// Dyes clothing for an Omni Clothing Dye, currently a placeholder.
-moc_para01,33,185,4 script Dinorah Lacostt#ed 862,{ end; }
+moc_para01,33,185,4 script Dinorah Lacostt#ed 4_F_LGTGIRL,{ end; }
// Commonly Updated NPCs
//============================================================
/* These scripts change on a regular basis, so they're mostly just placeholders for now. */
-moc_para01,29,35,4 script Gramps#huntquests 866,{
+moc_para01,29,35,4 script Gramps#huntquests 4_M_LGTGRAND,{
mes "[Gramps]";
mes "When you get to being my";
mes "age, you become bitter.";
@@ -555,7 +555,7 @@ moc_para01,29,35,4 script Gramps#huntquests 866,{
//switch(select("Yes, I'll help.:Reward Me!:^ff0000I want to quit hunting^000000:^0000ffCan you warp me?^000000:Can you erase the timer?:What missions are you giving?:Give me Limited 3 day VIP:Tell me more about the VIP Access:No thanks, pops.")) {
}
-moc_para01,13,22,4 script Merry Badger#xch 882,{
+moc_para01,13,22,4 script Merry Badger#xch 4_F_SITDOWN,{
mes "[Merry Badger]";
mes "Hello there! I'm Merry Badger and I was hired to exchange the ^00CC00Eden Merit Badges^000000!";
next;
@@ -595,4 +595,4 @@ moc_para01,174,33,3 script Bathory#2012spirits 1102,{
}
}
-moc_para01,26,174,4 script Grandma Boxter#boxx 840,{ end; }
+moc_para01,26,174,4 script Grandma Boxter#boxx 4_F_THAISHAMAN,{ end; }
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index 222a3f97e..bdd6eb4c2 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -19,7 +19,7 @@
//= 1.5 Added GM management function. [Euphy]
//============================================================
-moc_para01,25,35,4 script Instructor Boya#para01 469,{
+moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{
if (countitem(6219) > 0) {
if (para_suv01 == 0) {
mes "[Boya]";
@@ -1089,7 +1089,7 @@ moc_para01,25,35,4 script Instructor Boya#para01 469,{
close;
}
-moc_fild11,180,253,5 script Talking Dog#para03 972,{
+moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{
if (para_suv01 == 1) {
mes "[Talking Dog]";
mes "kkkkuuuuahhh.";
@@ -1323,7 +1323,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 972,{
close;
}
-prt_sewb1,131,262,3 script Timid Cat#para04 422,{
+prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{
if (para_suv01 < 6) {
mes "[Timid Cat]";
mes "Meow...";
@@ -1515,7 +1515,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 422,{
close;
}
-pay_arche,41,136,3 script Eden Member Karl#para05 904,{
+pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{
if (para_suv01 < 13) {
if (countitem(6219) > 0) {
mes "[Karl]";
@@ -1658,7 +1658,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 904,{
close;
}
-anthell01,29,264,5 script Eden Member Cloud#para06 899,{
+anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{
if (para_suv01 < 17) {
if (countitem(6219) > 0) {
mes "[Cloud]";
@@ -1848,7 +1848,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 899,{
close;
}
-in_orcs01,38,175,3 script Eden Member Hooksha 803,{
+in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{
if (para_suv01 < 24) {
if (countitem(6219) > 0) {
mes "[Hooksha]";
@@ -2117,7 +2117,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 803,{
}
}
-iz_dun04,43,46,3 script Eden Member Callandiva 745,{
+iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{
if (para_suv01 < 33) {
if (countitem(6219) > 0) {
mes "[Callandiva]";
@@ -2257,7 +2257,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 745,{
close;
}
-moc_para01,112,96,5 script Administrator Michael 967,{
+moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{
mes "[Michael]";
mes "Why did you come here?";
next;
@@ -3534,7 +3534,7 @@ moc_para01,112,96,5 script Administrator Michael 967,{
}
}
-moc_para01,179,44,3 script Chef 820,{
+moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{
mes "[Chef]";
mes "What's up?";
mes "Do you want a Meal? Or do you have other business?";
@@ -3838,7 +3838,7 @@ moc_para01,179,44,3 script Chef 820,{
}
}
-moc_para01,23,35,4 script Instructor Ur 468,{
+moc_para01,23,35,4 script Instructor Ur 4_M_KNIGHT_BLACK,{
mes "[Instructor Ur]";
if (countitem(6219) > 0) {
if (BaseLevel < 60) {
@@ -3985,7 +3985,7 @@ L_Level:
close;
}
-comodo,173,354,6 script Romeo#01 55,{
+comodo,173,354,6 script Romeo#01 1_M_JOBTESTER,{
if ((para_suv01 == 39) && (romeo < 1)) {
mes "[Romeo]";
mes "Ah, there you are.";
@@ -4031,7 +4031,7 @@ comodo,173,354,6 script Romeo#01 55,{
close;
}
-um_fild01,34,280,6 script Romeo#02 55,{
+um_fild01,34,280,6 script Romeo#02 1_M_JOBTESTER,{
if (romeo == 2) {
if (checkquest(7216,HUNTING) == 2) {
mes "[Romeo]";
@@ -4083,7 +4083,7 @@ um_fild01,34,280,6 script Romeo#02 55,{
close;
}
-glast_01,195,131,6 script Johan 95,{
+glast_01,195,131,6 script Johan 4_F_SISTER,{
if ((para_suv01 == 43) && (johan < 1)) {
mes "[Johan]";
mes "...";
@@ -4148,7 +4148,7 @@ glast_01,195,131,6 script Johan 95,{
close;
}
-ein_fild08,172,359,4 script Kiren 989,{
+ein_fild08,172,359,4 script Kiren 4_M_4THPRIN1,{
if ((para_suv01 == 46) && (kiren < 1)) {
mes "[Kiren]";
mes "Hey there.";
@@ -4215,7 +4215,7 @@ ein_fild08,172,359,4 script Kiren 989,{
close;
}
-ice_dun01,154,13,6 script Naomi 726,{
+ice_dun01,154,13,6 script Naomi 4_F_JOB_BLACKSMITH,{
if ((para_suv01 == 49) && (naomi < 1)) {
mes "[Naomi]";
mes "It is so cold in here.";
@@ -4283,7 +4283,7 @@ ice_dun01,154,13,6 script Naomi 726,{
close;
}
-mid_camp,212,229,4 script Margaret 893,{
+mid_camp,212,229,4 script Margaret 4_F_HUWOMAN,{
if ((para_suv01 == 52) && (margaret < 1)) {
mes "[Margaret]";
mes "Oh, hello there.";
@@ -4334,7 +4334,7 @@ mid_camp,212,229,4 script Margaret 893,{
close;
}
-man_fild01,43,234,2 script Paradise Dispatch#01 939,{
+man_fild01,43,234,2 script Paradise Dispatch#01 4_DST_SOLDIER,{
if (margaret == 1) {
mes "[Paradise Dispatch]";
mes "Hey you, can you help me here?";
@@ -4380,7 +4380,7 @@ man_fild01,43,234,2 script Paradise Dispatch#01 939,{
close;
}
-spl_fild02,377,149,4 script Paradise Dispatch#02 946,{
+spl_fild02,377,149,4 script Paradise Dispatch#02 4_M_DST_MASTER,{
if (margaret == 4) {
mes "[Paradise Dispatch]";
mes "So Margaret sent you to help me?";
@@ -4426,7 +4426,7 @@ spl_fild02,377,149,4 script Paradise Dispatch#02 946,{
close;
}
-moc_para01,111,83,3 script Toren 813,{
+moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{
if (checkweight(1101,5) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you're carrying";
@@ -4731,7 +4731,7 @@ L_Select:
return;
}
-moc_para01,112,79,3 script Weapons Expert 851,{
+moc_para01,112,79,3 script Weapons Expert 4_M_REPAIR,{
if (checkweight(1101,5) == 0) {
mes "^3355FFWait a second!";
mes "Right now, you are carrying";
@@ -5120,7 +5120,7 @@ L_GetWeapon:
return;
}
-sec_in02,25,33,4 script Assistant#para_suvquest 422,{
+sec_in02,25,33,4 script Assistant#para_suvquest 4_M_BABYCAT,{
callfunc "F_GM_NPC";
mes "Password";
next;
diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt
index 4bec34777..8335b9fbe 100644
--- a/npc/re/quests/eden/eden_service.txt
+++ b/npc/re/quests/eden/eden_service.txt
@@ -58,5 +58,5 @@
close;
}
-moc_para01,173,120,0 duplicate(pggc) Goods Cabinet#01 111
-moc_para01,170,120,0 duplicate(pggc) Goods Cabinet#02 111
+moc_para01,173,120,0 duplicate(pggc) Goods Cabinet#01 HIDDEN_NPC
+moc_para01,170,120,0 duplicate(pggc) Goods Cabinet#02 HIDDEN_NPC
diff --git a/npc/re/quests/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt
index 6221ac16f..92cfb26fd 100644
--- a/npc/re/quests/eden/eden_tutorial.txt
+++ b/npc/re/quests/eden/eden_tutorial.txt
@@ -11,7 +11,7 @@
//= 1.0 First Version. [Euphy]
//============================================================
-moc_para01,34,178,3 script Tutorial Instructor 904,{
+moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{
if (Class == Job_Novice) {
// Fall through
} else if (checkquest(9167) == -1) {
@@ -567,7 +567,7 @@ moc_para01,34,178,3 script Tutorial Instructor 904,{
close;
}
-moc_para01,32,179,4 script Tutorial Goal 895,{
+moc_para01,32,179,4 script Tutorial Goal 4_F_KHELLY,{
if (checkweight(608,7) == 0) {
if (MaxWeight - Weight < getiteminfo(608,7)) {
mes "[Tutorial Goal]";
@@ -661,7 +661,7 @@ moc_para01,32,179,4 script Tutorial Goal 895,{
close;
}
-moc_para01,24,175,4 script Siege Master 734,{
+moc_para01,24,175,4 script Siege Master 4_M_JOB_KNIGHT2,{
set .@checkquest, checkquest(4161);
if (.@checkquest == 2) {
mes "[Siege Expert]";
@@ -834,7 +834,7 @@ L_Info:
return;
}
-moc_para01,21,172,4 script Party Recruiting Expert 878,{
+moc_para01,21,172,4 script Party Recruiting Expert 4_M_OILMAN,{
set .@checkquest, checkquest(4162);
if (.@checkquest == 2) {
mes "[Party Recruiting Expert]";
@@ -1016,7 +1016,7 @@ L_Info:
return;
}
-moc_para01,12,179,6 script Battleground Master 419,{
+moc_para01,12,179,6 script Battleground Master 4_M_KY_HEAD,{
set .@checkquest, checkquest(4163);
if (.@checkquest == 2) {
mes "[Battleground Expert]";
@@ -1196,7 +1196,7 @@ L_Info:
return;
}
-moc_para01,28,167,3 script Memorial Dungeon Expert 868,{
+moc_para01,28,167,3 script Memorial Dungeon Expert 4_M_LGTGUARD,{
set .@checkquest, checkquest(4164);
if (.@checkquest == 2) {
mes "[Memorial Dungeon Expert]";
@@ -1374,7 +1374,7 @@ L_Info:
return;
}
-moc_para01,14,168,6 script Map Expert 743,{
+moc_para01,14,168,6 script Map Expert 2_M_SAGE_OLD,{
set .@checkquest, checkquest(4165);
if (.@checkquest == 2) {
mes "[Map Expert]";
diff --git a/npc/re/quests/first_class/tu_archer.txt b/npc/re/quests/first_class/tu_archer.txt
index 2905cb9a6..2e8a03180 100644
--- a/npc/re/quests/first_class/tu_archer.txt
+++ b/npc/re/quests/first_class/tu_archer.txt
@@ -11,4 +11,4 @@
//= 1.0 First version. [Euphy]
//============================================================
-pay_fild08,40,83,5 duplicate(Acolyte_Tu) Acolyte#tu 95
+pay_fild08,40,83,5 duplicate(Acolyte_Tu) Acolyte#tu 4_F_SISTER
diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt
index 3eab35867..4a6adc88d 100644
--- a/npc/re/quests/homun_s.txt
+++ b/npc/re/quests/homun_s.txt
@@ -16,7 +16,7 @@
// Main NPCs
//============================================================
-job3_gen01,12,44,3 script Viorel#job3_gen01 542,{
+job3_gen01,12,44,3 script Viorel#job3_gen01 4_M_ALCHE_E,{
if (countitem(6415)) {
if (Class == Job_Genetic || Class == Job_Genetic_T || Class == Job_Baby_Genetic) {
disable_items;
@@ -269,7 +269,7 @@ L_CheckHomunculus:
return;
}
-que_house_s,24,47,3 script Viorel#homun_s 542,{
+que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{
if (checkquest(4155) > -1) {
emotion e_dum;
mes "[Viorel]";
@@ -604,7 +604,7 @@ que_house_s,24,47,3 script Viorel#homun_s 542,{
}
}
-que_house_s,80,42,3 script Jeyna#homun_s 558,{
+que_house_s,80,42,3 script Jeyna#homun_s 4_F_ALCHE_A,{
if (checkquest(4156) > -1) {
playbgm "28.mp3"; // You're in Ruins
emotion e_gasp;
@@ -827,7 +827,7 @@ L_CheckHomunculus:
// Magic Board
//============================================================
-que_house_s,83,47,3 script Magic Board#homun_s 857,{
+que_house_s,83,47,3 script Magic Board#homun_s 4_BOARD3,{
playbgm "26.mp3"; // Everlasting Wanderers
callfunc "F_HomMutateInfo","[Magic Board Posts]";
mes "[Magic Board Posts]";
@@ -992,7 +992,7 @@ function script F_HomMutateInfo {
// Books
//============================================================
-que_house_s,13,52,3 script Open Book#01homun_s 111,{
+que_house_s,13,52,3 script Open Book#01homun_s HIDDEN_NPC,{
switch(rand(1,7)) {
case 1:
mes "[Bookcase Notes]";
@@ -1122,7 +1122,7 @@ que_house_s,13,52,3 script Open Book#01homun_s 111,{
}
}
-que_house_s,16,52,3 script Open Book#02homun_s 111,{
+que_house_s,16,52,3 script Open Book#02homun_s HIDDEN_NPC,{
switch(rand(1,8)) {
case 1:
mes "[Bookcase Notes]";
@@ -1306,7 +1306,7 @@ que_house_s,16,52,3 script Open Book#02homun_s 111,{
// Notifiers
//============================================================
-que_house_s,11,52,3 script #03homun_s 111,{
+que_house_s,11,52,3 script #03homun_s HIDDEN_NPC,{
end;
OnInit:
initnpctimer;
@@ -1321,7 +1321,7 @@ OnTimer7000:
end;
}
-que_house_s,14,52,3 script #04homun_s 111,{
+que_house_s,14,52,3 script #04homun_s HIDDEN_NPC,{
end;
}
@@ -1331,7 +1331,7 @@ que_house_s,24,46,3 script Jonathan#homun_s 6002,{
end;
}
-que_house_s,23,46,3 script #05homun_s 111,{
+que_house_s,23,46,3 script #05homun_s HIDDEN_NPC,{
emotion e_no,0,"Jonathan#homun_s";
if (gethominfo(1) < 6048 || gethominfo(1) > 6052) { // Not mutated Homunculus-S
mes "[Jonathan]";
diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt
index 7962a0544..de846567a 100644
--- a/npc/re/quests/magic_books.txt
+++ b/npc/re/quests/magic_books.txt
@@ -14,7 +14,7 @@
//= 1.1a Updated NPC name to "Master Velofos". [Euphy]
//============================================================
-geffen_in,176,105,4 script Master Velofos 64,{
+geffen_in,176,105,4 script Master Velofos 1_M_WIZARD,{
if (checkweight(1201,1) == 0) {
mes "You're carrying too many items. Please make some room in your bag first.";
close;
@@ -268,7 +268,7 @@ geffen_in,176,105,4 script Master Velofos 64,{
close;
}
-geffen_in,175,112,4 script Lea 123,{
+geffen_in,175,112,4 script Lea 2_F_MAGICMASTER,{
if (checkweight(1201,1) == 0) {
mes "You're carrying too many items. Please make some room in your bag first.";
close;
@@ -504,7 +504,7 @@ geffen_in,175,112,4 script Lea 123,{
close;
}
-mid_camp,255,244,4 script Galfos 735,{
+mid_camp,255,244,4 script Galfos 4_M_JOB_WIZARD,{
if (checkweight(1201,1) == 0) {
mes "You're carrying too many items. Please make some room in your bag first.";
close;
@@ -667,7 +667,7 @@ mid_camp,255,244,4 script Galfos 735,{
close;
}
-dic_in01,25,190,0 script Mysterious Documents 844,{
+dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{
if (isequipped(2782) < 1) {
mes "I better not forget to equip my ring.";
close;
@@ -830,8 +830,8 @@ function script Magic_Book_Essence {
mes "Someone already used this area.";
close;
}
-thor_v02,163,104,0 script Powerful Lava Energy#33 844,{ callfunc "Magic_Book_Essence",12218,7097,40,"Lava"; end; }
-thor_v01,185,91,0 script Powerful Flame Energy#33 844,{ callfunc "Magic_Book_Essence",12219,7098,10,"Flame"; end; }
-ice_dun03,137,148,0 script Powerful Glacier Energy 844,{ callfunc "Magic_Book_Essence",12220,7561,10,"Glacier"; end; }
-ein_dun02,181,124,0 script Powerful Fossil Energy 844,{ callfunc "Magic_Book_Essence",12221,7312,10,"Fossil"; end; }
-gon_dun02,252,198,0 script Powerful Storm Energy#33 844,{ callfunc "Magic_Book_Essence",12222,7266,10,"Storm"; end; }
+thor_v02,163,104,0 script Powerful Lava Energy#33 CLEAR_NPC,{ callfunc "Magic_Book_Essence",12218,7097,40,"Lava"; end; }
+thor_v01,185,91,0 script Powerful Flame Energy#33 CLEAR_NPC,{ callfunc "Magic_Book_Essence",12219,7098,10,"Flame"; end; }
+ice_dun03,137,148,0 script Powerful Glacier Energy CLEAR_NPC,{ callfunc "Magic_Book_Essence",12220,7561,10,"Glacier"; end; }
+ein_dun02,181,124,0 script Powerful Fossil Energy CLEAR_NPC,{ callfunc "Magic_Book_Essence",12221,7312,10,"Fossil"; end; }
+gon_dun02,252,198,0 script Powerful Storm Energy#33 CLEAR_NPC,{ callfunc "Magic_Book_Essence",12222,7266,10,"Storm"; end; }
diff --git a/npc/re/quests/monstertamers.txt b/npc/re/quests/monstertamers.txt
index a817cee43..4eef32878 100644
--- a/npc/re/quests/monstertamers.txt
+++ b/npc/re/quests/monstertamers.txt
@@ -10,4 +10,4 @@
//= 1.0 Moved Izlude NPC to pre-re/re paths.
//============================================================
-izlude_in,55,105,4 duplicate(MonsterTamer_izlude) Monster Tamer#izu 125
+izlude_in,55,105,4 duplicate(MonsterTamer_izlude) Monster Tamer#izu 4_M_TELEPORTER
diff --git a/npc/re/quests/mrsmile.txt b/npc/re/quests/mrsmile.txt
index 215390ee1..4e728bffa 100644
--- a/npc/re/quests/mrsmile.txt
+++ b/npc/re/quests/mrsmile.txt
@@ -12,8 +12,8 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-izlude,125,175,4 duplicate(SmileHelper) Smile Assistance#iz 92
-izlude_a,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_a 92
-izlude_b,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_b 92
-izlude_c,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_c 92
-izlude_d,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_d 92
+izlude,125,175,4 duplicate(SmileHelper) Smile Assistance#iz 4_F_03
+izlude_a,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_a 4_F_03
+izlude_b,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_b 4_F_03
+izlude_c,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_c 4_F_03
+izlude_d,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_d 4_F_03
diff --git a/npc/re/quests/pile_bunker.txt b/npc/re/quests/pile_bunker.txt
index a8a390cb0..dbce8d136 100644
--- a/npc/re/quests/pile_bunker.txt
+++ b/npc/re/quests/pile_bunker.txt
@@ -11,7 +11,7 @@
//= 2.2 Updated to match the official script. [Euphy]
//============================================================
-yuno,179,174,4 script Gomer 851,{
+yuno,179,174,4 script Gomer 4_M_REPAIR,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "[Gomer]";
mes "You are carrying so much. Drop off some of your luggage and come back to me.";
diff --git a/npc/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt
index 3e4626fd5..ec208ad97 100644
--- a/npc/re/quests/quests_13_1.txt
+++ b/npc/re/quests/quests_13_1.txt
@@ -11,8 +11,8 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-izlude,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 100
-izlude_a,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_a 100
-izlude_b,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_b 100
-izlude_c,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_c 100
-izlude_d,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_d 100
+izlude,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 4W_SAILOR
+izlude_a,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_a 4W_SAILOR
+izlude_b,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_b 4W_SAILOR
+izlude_c,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_c 4W_SAILOR
+izlude_d,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_d 4W_SAILOR
diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index 00b1f21b9..306a19cdb 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.txt
@@ -22,7 +22,7 @@
// Lost Puppies :: dogdog.sc
//============================================================
-brasilis,297,307,5 script Angelo#br 50,{
+brasilis,297,307,5 script Angelo#br 1_M_04,{
if (BaseLevel < 40) {
mes "[Angelo]";
mes "Pets went out the village~!!";
@@ -130,22 +130,22 @@ OnDisable:
end;
}
-bra_fild01,98,96,3 duplicate(Puppy#bra) Puppy#a1 81
-bra_fild01,59,116,5 duplicate(Puppy#bra) Puppy#a2 81
-bra_fild01,62,142,3 duplicate(Puppy#bra) Puppy#a3 81
-bra_fild01,80,163,3 duplicate(Puppy#bra) Puppy#b1 81
-bra_fild01,73,210,3 duplicate(Puppy#bra) Puppy#b2 81
-bra_fild01,80,210,3 duplicate(Puppy#bra) Puppy#b3 81
-bra_fild01,38,235,3 duplicate(Puppy#bra) Puppy#c1 81
-bra_fild01,307,64,3 duplicate(Puppy#bra) Puppy#c2 81
-bra_fild01,260,60,3 duplicate(Puppy#bra) Puppy#c3 81
-bra_fild01,234,101,3 duplicate(Puppy#bra) Puppy#d1 81
-bra_fild01,200,84,3 duplicate(Puppy#bra) Puppy#d2 81
-bra_fild01,176,63,5 duplicate(Puppy#bra) Puppy#d3 81
+bra_fild01,98,96,3 duplicate(Puppy#bra) Puppy#a1 4_DOG01
+bra_fild01,59,116,5 duplicate(Puppy#bra) Puppy#a2 4_DOG01
+bra_fild01,62,142,3 duplicate(Puppy#bra) Puppy#a3 4_DOG01
+bra_fild01,80,163,3 duplicate(Puppy#bra) Puppy#b1 4_DOG01
+bra_fild01,73,210,3 duplicate(Puppy#bra) Puppy#b2 4_DOG01
+bra_fild01,80,210,3 duplicate(Puppy#bra) Puppy#b3 4_DOG01
+bra_fild01,38,235,3 duplicate(Puppy#bra) Puppy#c1 4_DOG01
+bra_fild01,307,64,3 duplicate(Puppy#bra) Puppy#c2 4_DOG01
+bra_fild01,260,60,3 duplicate(Puppy#bra) Puppy#c3 4_DOG01
+bra_fild01,234,101,3 duplicate(Puppy#bra) Puppy#d1 4_DOG01
+bra_fild01,200,84,3 duplicate(Puppy#bra) Puppy#d2 4_DOG01
+bra_fild01,176,63,5 duplicate(Puppy#bra) Puppy#d3 4_DOG01
// Suspicious Beach :: Suspicious_Beach.sc
//============================================================
-brasilis,192,133,6 script Lucia#brasilis 478,{
+brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{
/* -------------- Hydra Ball -------------------------
if (countitem(12408) > 0) {
delitem 12408,1; //Leaf_Cat_Ball
@@ -357,7 +357,7 @@ OnTimer7000:
// Guarana Quest :: brazil_tre.sc
//============================================================
-brasilis,187,162,5 script Candy Maker 476,{
+brasilis,187,162,5 script Candy Maker 4_M_BRZ_MAN1,{
if (!checkweight(1201,1)) {
mes "- You can't start the quest. Please reduce the weight in your inventory. -";
close;
@@ -495,7 +495,7 @@ brasilis,187,162,5 script Candy Maker 476,{
}
}
-bra_in01,95,179,3 script Cherto 477,{
+bra_in01,95,179,3 script Cherto 4_M_BRZ_MAN2,{
if (brazil_gua == 0) {
mes "[Cherto]";
mes "Hmm... hey man, you are from outside, aren't you?";
@@ -655,7 +655,7 @@ bra_in01,95,179,3 script Cherto 477,{
}
}
-brasilis,203,64,3 script Strange Kid#bra 706,{
+brasilis,203,64,3 script Strange Kid#bra 4_M_KID1,{
if (brazil_gua < 3) {
mes "[Strange Kid]";
mes "................";
@@ -810,7 +810,7 @@ brasilis,203,64,3 script Strange Kid#bra 706,{
end;
}
-brasilis,56,224,7 script Mage Paje#bra 704,{
+brasilis,56,224,7 script Mage Paje#bra 4_M_BIBI,{
mes "[Mage Paje]";
mes "Abracadabra~";
specialeffect EF_POISONHIT,AREA,"Poring#bra";
@@ -857,7 +857,7 @@ brasilis,56,224,7 script Mage Paje#bra 704,{
close;
}
-brasilis,59,226,3 script Poring#bra 909,{
+brasilis,59,226,3 script Poring#bra 4_PORING,{
end;
}
@@ -987,7 +987,7 @@ bra_fild01,245,53,3 script #Monkeybra 1057,{
end;
}
-bra_fild01,245,52,3 script Monkey#bra 111,{
+bra_fild01,245,52,3 script Monkey#bra HIDDEN_NPC,{
if (brazil_gua == 8) {
mes "[Monkey]";
mes "What is it??!!";
@@ -1035,7 +1035,7 @@ bra_fild01,245,52,3 script Monkey#bra 111,{
// Water Lily Quest :: brazil_tre.sc
//============================================================
-brasilis,203,286,3 script Botanist Karmen#bra 893,{
+brasilis,203,286,3 script Botanist Karmen#bra 4_F_HUWOMAN,{
if (brazil_regia == 0) {
mes "[Karmen]";
mes "Brasilis' climate is special.";
@@ -1106,7 +1106,7 @@ brasilis,203,286,3 script Botanist Karmen#bra 893,{
}
}
-bra_in01,142,27,5 script Marta#bra 474,{
+bra_in01,142,27,5 script Marta#bra 4_F_BRZ_INDOLD,{
if (brazil_regia == 1) {
mes "[Brasilis Boy]";
mes "Grandma! That person has a weird smell.";
@@ -1257,7 +1257,7 @@ bra_in01,142,27,5 script Marta#bra 474,{
}
}
-bra_in01,145,27,3 script Brasilis Boy#bra 472,{
+bra_in01,145,27,3 script Brasilis Boy#bra 4_M_BRZ_INDIAN,{
if (brazil_regia == 1) {
mes "[Brasilis Boy]";
mes "Grandma! That person has a weird smell.";
@@ -1408,7 +1408,7 @@ bra_in01,145,27,3 script Brasilis Boy#bra 472,{
}
}
-brasilis,270,145,5 script Brasilis Girl#bra 473,5,5,{
+brasilis,270,145,5 script Brasilis Girl#bra 4_F_BRZ_INDIAN,5,5,{
if (!checkweight(1201,1)) {
mes "- wait a second!! -";
mes "- you have too many items -";
@@ -1697,7 +1697,7 @@ OnTouch:
end;
}
-bra_dun02,67,205,5 script Recluse#bra 475,3,3,{
+bra_dun02,67,205,5 script Recluse#bra 4_M_BRZ_JACI,3,3,{
if (brazil_regia == 3) {
mes "[Recluse]";
mes "Oh, I haven't seen another person in such a long time.";
@@ -1821,7 +1821,7 @@ OnTouchNPC:
end;
}
-bra_dun02,71,200,3 script Water lily#bra 111,{
+bra_dun02,71,200,3 script Water lily#bra HIDDEN_NPC,{
if (brazil_regia == 4) {
mes "An unusual Water lily is blooming here. You can't stop staring at it, knowing that few people have seen this flower bloom.";
next;
@@ -1932,7 +1932,7 @@ bra_dun02,71,200,3 script Water lily#bra 111,{
// Dungeon Access Quest :: brazil_tre.sc
//============================================================
-brasilis,185,246,5 script Pedro#bra 62,{
+brasilis,185,246,5 script Pedro#bra 1_M_SIZ,{
if (brazil_ghost == 0) {
OnTalk:
mes "[Pedro]";
@@ -2158,7 +2158,7 @@ brasilis,185,246,5 script Pedro#bra 62,{
}
}
-brasilis,187,244,1 script Mariana#bra 72,{
+brasilis,187,244,1 script Mariana#bra 1_F_MARIA,{
if (brazil_ghost == 0) {
doevent "Pedro#bra::OnTalk";
end;
@@ -2176,7 +2176,7 @@ brasilis,187,244,1 script Mariana#bra 72,{
}
}
-brasilis,181,250,5 script Fabio#bra 706,{
+brasilis,181,250,5 script Fabio#bra 4_M_KID1,{
if (brazil_ghost == 0) {
doevent "Pedro#bra::OnTalk";
end;
@@ -2196,7 +2196,7 @@ brasilis,181,250,5 script Fabio#bra 706,{
}
}
-brasilis,180,249,5 script Daniel#bra 706,{
+brasilis,180,249,5 script Daniel#bra 4_M_KID1,{
if (brazil_ghost == 0) {
doevent "Pedro#bra::OnTalk";
end;
@@ -2213,7 +2213,7 @@ brasilis,180,249,5 script Daniel#bra 706,{
}
}
-bra_in01,149,184,3 script Door#bra 844,{
+bra_in01,149,184,3 script Door#bra CLEAR_NPC,{
if (brazil_ghost > 0) {
mes "- A key is inserted in the locked door.-";
next;
@@ -2302,7 +2302,7 @@ bra_in01,149,184,3 script Door#bra 844,{
}
}
-bra_in01,144,187,3 script Toilet#bra 844,{
+bra_in01,144,187,3 script Toilet#bra CLEAR_NPC,{
if (brazil_ghost > 0) {
mes "- Looks like an ordinary toilet -";
next;
@@ -2388,7 +2388,7 @@ bra_in01,144,187,3 script Toilet#bra 844,{
}
}
-bra_in01,134,189,3 script Faucet#bra 844,{
+bra_in01,134,189,3 script Faucet#bra CLEAR_NPC,{
if (brazil_ghost > 0) {
mes "- It seems like an ordinary faucet -";
next;
@@ -2463,7 +2463,7 @@ bra_in01,134,189,3 script Faucet#bra 844,{
}
}
-bra_in01,138,184,3 script Carpet#bra 844,{
+bra_in01,138,184,3 script Carpet#bra CLEAR_NPC,{
if (brazil_ghost > 0) {
mes "- A carpet with an intricate pattern on it -";
next;
@@ -2545,7 +2545,7 @@ bra_in01,138,184,3 script Carpet#bra 844,{
}
}
-bra_in01,151,180,3 script Mirror#bra 844,{
+bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{
if (brazil_ghost > 0) {
mes "- You can see a clean mirror without any marks or dust -";
next;
@@ -2669,7 +2669,7 @@ OnInit:
end;
}
-bra_in01,7,181,5 script Curator#bra 477,{
+bra_in01,7,181,5 script Curator#bra 4_M_BRZ_MAN2,{
if (BaseLevel < 40) {
mes "[Curator]";
mes "I'm sorry but this area is under construction right now.";
@@ -2755,7 +2755,7 @@ bra_in01,7,181,5 script Curator#bra 477,{
}
}
-bra_in01,12,185,0 script inbathroom#bra 45,1,1,{
+bra_in01,12,185,0 script inbathroom#bra WARPNPC,1,1,{
OnTouch_:
if (brazil_ghost > 6)
warp "bra_in01",138,176;
@@ -2769,7 +2769,7 @@ OnTouch_:
bra_in01,138,174,0 warp outbathroom#bra 1,1,bra_in01,12,183
bra_in01,206,98,0 warp tobath#bra 1,1,bra_in01,138,176
-bra_in01,206,188,1 script Open Manhole#todunbra 844,{
+bra_in01,206,188,1 script Open Manhole#todunbra CLEAR_NPC,{
if (brazil_ghost == 7) {
enablenpc "Ghost#bra_end";
mes "[Ghost]";
@@ -2806,12 +2806,12 @@ bra_in01,206,188,1 script Open Manhole#todunbra 844,{
}
-bra_dun01,87,43,1 script Pipe#bra 844,{
+bra_dun01,87,43,1 script Pipe#bra CLEAR_NPC,{
warp "bra_in01",206,185;
end;
}
-bra_fild01,323,136,1 script Pipe#brafild 844,{
+bra_fild01,323,136,1 script Pipe#brafild CLEAR_NPC,{
if (brazil_ghost > 6) {
mes "You see a rusty pipe. It seems to be linked to somewhere beneath the jungle.";
next;
@@ -2842,7 +2842,7 @@ OnInit:
// Iara :: iara.sc
//============================================================
-brasilis,315,334,5 script Shaman#nk 474,{
+brasilis,315,334,5 script Shaman#nk 4_F_BRZ_INDOLD,{
set .@iara_re,checkquest(4135,PLAYTIME);
if ((.@iara_re == 0) || (.@iara_re == 1)) {
mes "[Anori]";
@@ -3042,7 +3042,7 @@ brasilis,315,334,5 script Shaman#nk 474,{
}
}
-bra_dun02,157,74,5 script Iara#nk 478,2,2,{
+bra_dun02,157,74,5 script Iara#nk 4_F_BRZ_WOMAN,2,2,{
if (countitem(11517) > 0) {
mes "[" + strcharinfo(0) + "]";
mes "Should I use a Purification Potion?";
@@ -3125,7 +3125,7 @@ OnTouch:
end;
}
-bra_fild01,188,301,5 script Native Warrior#nk 472,{
+bra_fild01,188,301,5 script Native Warrior#nk 4_M_BRZ_INDIAN,{
mes "[Native Warrior]";
mes "Ah... the face I would never forget even in my dreams.";
next;
diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt
index e50e2e5c5..7cb41b0af 100644
--- a/npc/re/quests/quests_dewata.txt
+++ b/npc/re/quests/quests_dewata.txt
@@ -18,7 +18,7 @@
// Dewata Legend Quest :: dewata_legend
//============================================================
-dew_fild01,57,274,0 script #hideout_legend 111,6,6,{
+dew_fild01,57,274,0 script #hideout_legend HIDDEN_NPC,6,6,{
OnTouch:
if (BaseLevel > 59 && dew_legend < 1) {
mes "- You hear a faint conversation going on inside. -";
@@ -52,7 +52,7 @@ OnTouch:
end;
}
-dew_in01,15,33,0 script #hidein_legend 111,5,5,{
+dew_in01,15,33,0 script #hidein_legend HIDDEN_NPC,5,5,{
OnTouch:
if (dew_legend == 3) {
mes "Kasyapa and Chief Paiko begin talking as you are about to leave...";
@@ -83,7 +83,7 @@ OnTouch:
end;
}
-dew_in01,22,48,3 script Sage Kasyapa#dew 541,{
+dew_in01,22,48,3 script Sage Kasyapa#dew 4_M_DEWZATIMAN,{
if (dew_legend == 0) {
mes "[Sage Kasyapa]";
mes "Ah, a stranger to our land.";
@@ -216,7 +216,7 @@ dew_in01,22,48,3 script Sage Kasyapa#dew 541,{
}
}
-dew_in01,15,49,4 script Tribal Chief Paiko#dew 540,{
+dew_in01,15,49,4 script Tribal Chief Paiko#dew 4_M_DEWZATICHIEF,{
if (dew_legend < 2) {
mes "[Tribal Chief Paiko]";
mes "I am the leader of this tribe";
@@ -515,7 +515,7 @@ L_Delivery:
}
}
-dew_fild01,78,288,6 script Jaty Tribe Warrior#dew 541,{
+dew_fild01,78,288,6 script Jaty Tribe Warrior#dew 4_M_DEWZATIMAN,{
mes "[Jaty Tribe Warrior]";
mes "We revere strength and bravery.";
mes "We are ^FF0000Jaty^000000 Tribe.";
@@ -553,7 +553,7 @@ dew_fild01,78,288,6 script Jaty Tribe Warrior#dew 541,{
close;
}
-dew_fild01,185,300,6 script Tribe Manager#dew 541,{
+dew_fild01,185,300,6 script Tribe Manager#dew 4_M_DEWZATIMAN,{
mes "[Tribe Manager]";
mes "Keeping our culture and tradition is very important.";
if (dew_legend != 11 || !countitem(11533)) {
@@ -606,7 +606,7 @@ dew_fild01,185,300,6 script Tribe Manager#dew 541,{
}
//Original name: Gatekeeper of Krakatau Volcano
-dewata,235,56,4 script Gatekeeper of Krakatau#1 534,{
+dewata,235,56,4 script Gatekeeper of Krakatau#1 4_M_DEWOLDMAN,{
mes "[Gatekeeper of Krakatau Volcano]";
mes "^8B4513Krakatau Volcano^000000 is";
mes "a very dangerous area";
@@ -674,7 +674,7 @@ dewata,235,56,4 script Gatekeeper of Krakatau#1 534,{
}
//Original name: Gatekeeper of Krakatau Volcano
-dew_dun01,292,164,4 script Gatekeeper of Krakatau#2 541,{
+dew_dun01,292,164,4 script Gatekeeper of Krakatau#2 4_M_DEWZATIMAN,{
mes "[Gatekeeper of Krakatau Volcano]";
mes "Want to go back";
mes "to Dewata?";
@@ -693,7 +693,7 @@ dew_dun01,292,164,4 script Gatekeeper of Krakatau#2 541,{
}
}
-dewata,78,192,6 script Borobudur Temple Manager 536,{
+dewata,78,192,6 script Borobudur Temple Manager 4_M_DEWMAN,{
mes "[Borobudur Temple Manager]";
mes "The weather today is so beautiful.";
if (dew_legend != 15 || !countitem(11533))
@@ -742,7 +742,7 @@ dewata,78,192,6 script Borobudur Temple Manager 536,{
// Help Out the Old Man :: dewata_drink
//============================================================
-dewata,109,262,4 script Memo#dew_drink 534,{
+dewata,109,262,4 script Memo#dew_drink 4_M_DEWOLDMAN,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 5000) {
if (dew_drink) {
mes "[Memo]";
@@ -1068,7 +1068,7 @@ dewata,109,262,4 script Memo#dew_drink 534,{
}
}
-dew_fild01,114,275,4 script Lero#dew_drink 536,{
+dew_fild01,114,275,4 script Lero#dew_drink 4_M_DEWMAN,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 5000) {
mes "[Lero]";
mes "You're carrying too many things...";
@@ -1329,7 +1329,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{
close;
}
-dew_fild01,259,48,4 script Poby#dew_drink 538,{
+dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
if (dew_drink > 0) {
mes "[Poby]";
@@ -1621,50 +1621,50 @@ OnTimer300000:
donpcevent strnpcinfo(0)+"::OnEnable";
end;
}
-dew_fild01,247,62,0 duplicate(DewataPalm) Palm Tree#drink01 844
-dew_fild01,276,73,0 duplicate(DewataPalm) Palm Tree#drink02 844
-dew_fild01,278,63,0 duplicate(DewataPalm) Palm Tree#drink03 844
-dew_fild01,301,88,0 duplicate(DewataPalm) Palm Tree#drink04 844
-dew_fild01,314,72,0 duplicate(DewataPalm) Palm Tree#drink05 844
-dew_fild01,320,68,0 duplicate(DewataPalm) Palm Tree#drink06 844
-dew_fild01,334,107,0 duplicate(DewataPalm) Palm Tree#drink07 844
-dew_fild01,345,88,0 duplicate(DewataPalm) Palm Tree#drink08 844
-dew_fild01,344,71,0 duplicate(DewataPalm) Palm Tree#drink09 844
-dew_fild01,358,93,0 duplicate(DewataPalm) Palm Tree#drink10 844
-dew_fild01,338,121,0 duplicate(DewataPalm) Palm Tree#drink11 844
-dew_fild01,358,136,0 duplicate(DewataPalm) Palm Tree#drink12 844
-dew_fild01,326,147,0 duplicate(DewataPalm) Palm Tree#drink13 844
-dew_fild01,307,146,0 duplicate(DewataPalm) Palm Tree#drink14 844
-dew_fild01,325,159,0 duplicate(DewataPalm) Palm Tree#drink15 844
-dew_fild01,339,163,0 duplicate(DewataPalm) Palm Tree#drink16 844
-dew_fild01,346,193,0 duplicate(DewataPalm) Palm Tree#drink17 844
-dew_fild01,355,193,0 duplicate(DewataPalm) Palm Tree#drink18 844
-dew_fild01,363,219,0 duplicate(DewataPalm) Palm Tree#drink19 844
-dew_fild01,341,261,0 duplicate(DewataPalm) Palm Tree#drink20 844
-dew_fild01,289,302,0 duplicate(DewataPalm) Palm Tree#drink21 844
-dew_fild01,70,196,0 duplicate(DewataPalm) Palm Tree#drink22 844
-dew_fild01,97,145,0 duplicate(DewataPalm) Palm Tree#drink23 844
-dew_fild01,119,42,0 duplicate(DewataPalm) Palm Tree#drink24 844
-dew_fild01,188,72,0 duplicate(DewataPalm) Palm Tree#drink25 844
-dew_fild01,238,80,0 duplicate(DewataPalm) Palm Tree#drink26 844
-dew_fild01,252,97,0 duplicate(DewataPalm) Palm Tree#drink27 844
-dew_fild01,256,98,0 duplicate(DewataPalm) Palm Tree#drink28 844
-dew_fild01,279,93,0 duplicate(DewataPalm) Palm Tree#drink29 844
-dew_fild01,299,107,0 duplicate(DewataPalm) Palm Tree#drink30 844
-dew_fild01,355,113,0 duplicate(DewataPalm) Palm Tree#drink31 844
-dew_fild01,278,136,0 duplicate(DewataPalm) Palm Tree#drink32 844
-dew_fild01,258,128,0 duplicate(DewataPalm) Palm Tree#drink33 844
-dew_fild01,240,125,0 duplicate(DewataPalm) Palm Tree#drink34 844
-dew_fild01,225,117,0 duplicate(DewataPalm) Palm Tree#drink35 844
-dew_fild01,219,121,0 duplicate(DewataPalm) Palm Tree#drink36 844
-dew_fild01,226,99,0 duplicate(DewataPalm) Palm Tree#drink37 844
-dew_fild01,209,137,0 duplicate(DewataPalm) Palm Tree#drink38 844
-dew_fild01,206,156,0 duplicate(DewataPalm) Palm Tree#drink39 844
-dew_fild01,209,201,0 duplicate(DewataPalm) Palm Tree#drink40 844
+dew_fild01,247,62,0 duplicate(DewataPalm) Palm Tree#drink01 CLEAR_NPC
+dew_fild01,276,73,0 duplicate(DewataPalm) Palm Tree#drink02 CLEAR_NPC
+dew_fild01,278,63,0 duplicate(DewataPalm) Palm Tree#drink03 CLEAR_NPC
+dew_fild01,301,88,0 duplicate(DewataPalm) Palm Tree#drink04 CLEAR_NPC
+dew_fild01,314,72,0 duplicate(DewataPalm) Palm Tree#drink05 CLEAR_NPC
+dew_fild01,320,68,0 duplicate(DewataPalm) Palm Tree#drink06 CLEAR_NPC
+dew_fild01,334,107,0 duplicate(DewataPalm) Palm Tree#drink07 CLEAR_NPC
+dew_fild01,345,88,0 duplicate(DewataPalm) Palm Tree#drink08 CLEAR_NPC
+dew_fild01,344,71,0 duplicate(DewataPalm) Palm Tree#drink09 CLEAR_NPC
+dew_fild01,358,93,0 duplicate(DewataPalm) Palm Tree#drink10 CLEAR_NPC
+dew_fild01,338,121,0 duplicate(DewataPalm) Palm Tree#drink11 CLEAR_NPC
+dew_fild01,358,136,0 duplicate(DewataPalm) Palm Tree#drink12 CLEAR_NPC
+dew_fild01,326,147,0 duplicate(DewataPalm) Palm Tree#drink13 CLEAR_NPC
+dew_fild01,307,146,0 duplicate(DewataPalm) Palm Tree#drink14 CLEAR_NPC
+dew_fild01,325,159,0 duplicate(DewataPalm) Palm Tree#drink15 CLEAR_NPC
+dew_fild01,339,163,0 duplicate(DewataPalm) Palm Tree#drink16 CLEAR_NPC
+dew_fild01,346,193,0 duplicate(DewataPalm) Palm Tree#drink17 CLEAR_NPC
+dew_fild01,355,193,0 duplicate(DewataPalm) Palm Tree#drink18 CLEAR_NPC
+dew_fild01,363,219,0 duplicate(DewataPalm) Palm Tree#drink19 CLEAR_NPC
+dew_fild01,341,261,0 duplicate(DewataPalm) Palm Tree#drink20 CLEAR_NPC
+dew_fild01,289,302,0 duplicate(DewataPalm) Palm Tree#drink21 CLEAR_NPC
+dew_fild01,70,196,0 duplicate(DewataPalm) Palm Tree#drink22 CLEAR_NPC
+dew_fild01,97,145,0 duplicate(DewataPalm) Palm Tree#drink23 CLEAR_NPC
+dew_fild01,119,42,0 duplicate(DewataPalm) Palm Tree#drink24 CLEAR_NPC
+dew_fild01,188,72,0 duplicate(DewataPalm) Palm Tree#drink25 CLEAR_NPC
+dew_fild01,238,80,0 duplicate(DewataPalm) Palm Tree#drink26 CLEAR_NPC
+dew_fild01,252,97,0 duplicate(DewataPalm) Palm Tree#drink27 CLEAR_NPC
+dew_fild01,256,98,0 duplicate(DewataPalm) Palm Tree#drink28 CLEAR_NPC
+dew_fild01,279,93,0 duplicate(DewataPalm) Palm Tree#drink29 CLEAR_NPC
+dew_fild01,299,107,0 duplicate(DewataPalm) Palm Tree#drink30 CLEAR_NPC
+dew_fild01,355,113,0 duplicate(DewataPalm) Palm Tree#drink31 CLEAR_NPC
+dew_fild01,278,136,0 duplicate(DewataPalm) Palm Tree#drink32 CLEAR_NPC
+dew_fild01,258,128,0 duplicate(DewataPalm) Palm Tree#drink33 CLEAR_NPC
+dew_fild01,240,125,0 duplicate(DewataPalm) Palm Tree#drink34 CLEAR_NPC
+dew_fild01,225,117,0 duplicate(DewataPalm) Palm Tree#drink35 CLEAR_NPC
+dew_fild01,219,121,0 duplicate(DewataPalm) Palm Tree#drink36 CLEAR_NPC
+dew_fild01,226,99,0 duplicate(DewataPalm) Palm Tree#drink37 CLEAR_NPC
+dew_fild01,209,137,0 duplicate(DewataPalm) Palm Tree#drink38 CLEAR_NPC
+dew_fild01,206,156,0 duplicate(DewataPalm) Palm Tree#drink39 CLEAR_NPC
+dew_fild01,209,201,0 duplicate(DewataPalm) Palm Tree#drink40 CLEAR_NPC
// Traditional Weapon Quest :: dewata_weapon
//============================================================
-dew_fild01,127,240,4 script Gatti#weapon 813,{
+dew_fild01,127,240,4 script Gatti#weapon 2_M_OLDBLSMITH,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 10000) {
mes "- Hold it right there!! -";
mes "- You're carrying too many items and don't have enough inventory space to receive any rewards. -";
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 605f59d59..020aff699 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -35,7 +35,7 @@
// Entrance
//============================================================
-manuk,321,182,5 script Entrance Manager#ep133 450,{
+manuk,321,182,5 script Entrance Manager#ep133 4_MAN_GALTUN,{
if (!isequipped(2782)) {
mes "[Average Galten]";
mes "¢¤¡ð¡ú? ¢£ ¡ù¡ð...";
@@ -64,7 +64,7 @@ manuk,321,182,5 script Entrance Manager#ep133 450,{
close;
}
-dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 449,{
+dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 4_MAN_BENKUNI,{
if (!isequipped(2782)) {
mes "[Curious Sapha]";
mes "¡ö¡ñ¡Ð ¡ò ¡õ?";
@@ -174,7 +174,7 @@ dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 449,{
}
}
-sec_in02,16,43,5 script Scaraba Dungeon Entrance 449,{
+sec_in02,16,43,5 script Scaraba Dungeon Entrance 4_MAN_BENKUNI,{
callfunc "F_GM_NPC";
mes "Setting you for dungeon entry.";
mes "You will be able to go through if the password is correct.";
@@ -247,11 +247,11 @@ sec_in02,16,43,5 script Scaraba Dungeon Entrance 449,{
close;
}
-dic_dun01,286,104,5 duplicate(Vigilante#main) Vigilante#ep133_23 450
-dic_dun01,294,106,3 duplicate(Vigilante#main) Vigilante#ep133_24 492
-dic_dun01,30,216,5 duplicate(Vigilante#main) Vigilante#ep133_26 492
+dic_dun01,286,104,5 duplicate(Vigilante#main) Vigilante#ep133_23 4_MAN_GALTUN
+dic_dun01,294,106,3 duplicate(Vigilante#main) Vigilante#ep133_24 4_MAN_GALTUN1
+dic_dun01,30,216,5 duplicate(Vigilante#main) Vigilante#ep133_26 4_MAN_GALTUN1
-dic_dun01,284,102,5 script Dirty Vigilante#ep13_3 450,{
+dic_dun01,284,102,5 script Dirty Vigilante#ep13_3 4_MAN_GALTUN,{
if (!isequipped(2782)) {
mes "[Vigilante]";
mes "¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó¢¤¡ö¡ø ¢³ ¡÷¢£¡ü ¡ø ¡Ð¡õ¡û.";
@@ -303,7 +303,7 @@ dic_dun01,284,102,5 script Dirty Vigilante#ep13_3 450,{
close;
}
-mid_camp,216,246,0 script #ep133_event03 139,2,2,{
+mid_camp,216,246,0 script #ep133_event03 HIDDEN_WARP_NPC,2,2,{
end;
OnTouch:
if (ep13_3_secret == 23) {
@@ -332,7 +332,7 @@ OnTouch:
end;
}
-mid_camp,218,250,3 script Suspicious Guy#ep133_ 494,{
+mid_camp,218,250,3 script Suspicious Guy#ep133_ 4_M_ROKI,{
mes "[Suspicious Guy]";
mes ".....";
hideonnpc strnpcinfo(0);
@@ -345,7 +345,7 @@ OnEnable:
end;
}
-- script Guard#ep133_11 492,{
+- script Guard#ep133_11 4_MAN_GALTUN1,{
if (!isequipped(2782)) {
mes "[Capital City Guard]";
mes "¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó?";
@@ -404,10 +404,10 @@ OnEnable:
mes "Please inquiry with a GM.";
close;
}
-dic_fild01,146,281,5 duplicate(Guard#ep133_11) Capital City Guard#1 492
-dic_fild01,153,281,3 duplicate(Guard#ep133_11) Capital City Guard#2 450
+dic_fild01,146,281,5 duplicate(Guard#ep133_11) Capital City Guard#1 4_MAN_GALTUN1
+dic_fild01,153,281,3 duplicate(Guard#ep133_11) Capital City Guard#2 4_MAN_GALTUN
-dic_in01,254,119,0 script Item Storage#01 844,{
+dic_in01,254,119,0 script Item Storage#01 CLEAR_NPC,{
mes "This is the item storage.";
mes "There is some writing on the paper.";
next;
@@ -480,7 +480,7 @@ function script que_dic {
close;
}
-dic_in01,48,263,5 script Hunting Dept. 1 Manager 449,{
+dic_in01,48,263,5 script Hunting Dept. 1 Manager 4_MAN_BENKUNI,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -550,7 +550,7 @@ dic_in01,48,263,5 script Hunting Dept. 1 Manager 449,{
close;
}
-dic_in01,51,266,6 script Hunting Dept. 2 Manager 449,{
+dic_in01,51,266,6 script Hunting Dept. 2 Manager 4_MAN_BENKUNI,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -619,7 +619,7 @@ dic_in01,51,266,6 script Hunting Dept. 2 Manager 449,{
close;
}
-dic_in01,51,270,7 script Supply Dept. 1 Manager 449,{
+dic_in01,51,270,7 script Supply Dept. 1 Manager 4_MAN_BENKUNI,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -690,7 +690,7 @@ dic_in01,51,270,7 script Supply Dept. 1 Manager 449,{
close;
}
-dic_in01,48,273,8 script Supply Dept. 2 Manager 449,{
+dic_in01,48,273,8 script Supply Dept. 2 Manager 4_MAN_BENKUNI,{
if (!checkweight(1201,1)) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -757,7 +757,7 @@ dic_in01,48,273,8 script Supply Dept. 2 Manager 449,{
close;
}
-dic_in01,43,273,1 script Transport Dept. 1 Mgr 449,{
+dic_in01,43,273,1 script Transport Dept. 1 Mgr 4_MAN_BENKUNI,{
if (!checkweight(1201,1)) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -831,7 +831,7 @@ dic_in01,43,273,1 script Transport Dept. 1 Mgr 449,{
close;
}
-dic_in01,40,270,2 script Transport Dept. 2 Mgr 449,{
+dic_in01,40,270,2 script Transport Dept. 2 Mgr 4_MAN_BENKUNI,{
if (!checkweight(1201,1)) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -900,7 +900,7 @@ dic_in01,40,270,2 script Transport Dept. 2 Mgr 449,{
}
-dic_in01,40,193,1 script Papyrus#0001 453,{
+dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{
if (!checkweight(1201,1)) {
mes "You have too many items in your inventory.";
close;
@@ -1110,10 +1110,10 @@ dic_in01,40,193,1 script Papyrus#0001 453,{
close;
}
}
-dic_in01,31,192,0 duplicate(Document Package#main) Document Package#0001 844
-dic_in01,31,187,0 duplicate(Document Package#main) Document Package#0002 844
-dic_in01,25,192,0 duplicate(Document Package#main) Document Package#0003 844
-dic_in01,25,187,0 duplicate(Document Package#main) Document Package#0004 844
+dic_in01,31,192,0 duplicate(Document Package#main) Document Package#0001 CLEAR_NPC
+dic_in01,31,187,0 duplicate(Document Package#main) Document Package#0002 CLEAR_NPC
+dic_in01,25,192,0 duplicate(Document Package#main) Document Package#0003 CLEAR_NPC
+dic_in01,25,187,0 duplicate(Document Package#main) Document Package#0004 CLEAR_NPC
// Unknown Relics
//============================================================
@@ -1137,62 +1137,62 @@ function script unknown_d {
}
close;
}
-prt_fild03,144,95,0 script Tree Roots 844,{ unknown_d(12166,902); }
-prt_fild09,371,255,0 script Reptile Tongues 844,{ unknown_d(12167,903); }
-prt_fild09,352,241,0 script Scorpion Tails 844,{ unknown_d(12168,904); }
-pay_fild02,177,108,0 script Stems 844,{ unknown_d(12169,905); }
-pay_fild02,105,113,0 script Pointed Scales 844,{ unknown_d(12170,906); }
-pay_fild01,152,171,0 script Resin 844,{ unknown_d(12171,907); }
-gef_fild01,104,111,0 script Spawn 844,{ unknown_d(12172,908); }
-prt_fild08,299,332,0 script Jellopy 844,{ unknown_d(12173,909); }
-izlude,136,160,0 script Fish Tails 844,{ unknown_d(12174,1023); } // Old coordinates: (132,136)
-izlude_a,136,160,0 script Fish Tails#a 844,{ unknown_d(12174,1023); }
-izlude_b,136,160,0 script Fish Tails#b 844,{ unknown_d(12174,1023); }
-izlude_c,136,160,0 script Fish Tails#c 844,{ unknown_d(12174,1023); }
-izlude_d,136,160,0 script Fish Tails#d 844,{ unknown_d(12174,1023); }
-prt_fild05,303,169,0 script Worm Peelings 844,{ unknown_d(12175,955); }
-iz_dun03,155,165,0 script Gills 844,{ unknown_d(12176,956); }
-mjo_dun01,222,226,0 script Tooth of Bat 844,{ unknown_d(12177,913); }
-prt_fild06,182,290,0 script Fluff 844,{ unknown_d(12178,914); }
-prt_fild06,127,85,0 script Chrysalis 844,{ unknown_d(12179,915); }
-moc_fild07,201,360,0 script Feather of Bird 844,{ unknown_d(12180,916); }
-moc_fild12,116,122,0 script Talons 844,{ unknown_d(12181,917); }
-prt_fild04,315,245,0 script Sticky Webfoot 844,{ unknown_d(12182,918); }
-mjolnir_08,108,99,0 script Animal Skin 844,{ unknown_d(12183,919); }
-moc_fild03,175,201,0 script Wolf Claws 844,{ unknown_d(12184,920); }
-pay_fild08,188,153,0 script Mushroom Spores 844,{ unknown_d(12185,921); }
-gef_fild03,251,109,0 script Orc's Fangs 844,{ unknown_d(12186,922); }
-c_tower2,170,9,0 script Evil Horns 844,{ unknown_d(12187,923); }
-gef_fild05,111,96,0 script Powder of Butterfly 844,{ unknown_d(12188,924); }
-moc_fild11,237,273,0 script Bill of Birds 844,{ unknown_d(12189,925); }
-pay_fild06,306,233,0 script Snake Scales 844,{ unknown_d(12190,926); }
-pay_fild07,126,49,0 script Insect Feelers 844,{ unknown_d(12191,928); }
-iz_dun02,112,96,0 script Immortal Hearts 844,{ unknown_d(12192,929); }
-moc_pryd02,134,112,0 script Rotten Bandages 844,{ unknown_d(12193,930); }
-moc_pryd02,36,75,0 script Decayed Nails 844,{ unknown_d(12194,957); }
-moc_pryd02,148,184,0 script Horrendous Mouths 844,{ unknown_d(12195,958); }
-iz_dun01,210,77,0 script Tentacles 844,{ unknown_d(12196,962); }
-iz_dun01,191,92,0 script Shells 844,{ unknown_d(12197,935); }
-mjolnir_04,191,154,0 script Scale Shells 844,{ unknown_d(12198,936); }
-mjolnir_04,162,168,0 script Venom Canines 844,{ unknown_d(12199,937); }
-prt_fild02,102,97,0 script Sticky Mucus 844,{ unknown_d(12200,938); }
-mjolnir_09,99,100,0 script Bee Stings 844,{ unknown_d(12201,939); }
-prt_fild07,76,122,0 script Grasshopper's Legs 844,{ unknown_d(12202,940); }
-prt_fild03,64,35,0 script Royal Jelly 844,{ unknown_d(12203,526); }
-prt_fild03,180,163,0 script Yoyo Tails 844,{ unknown_d(12204,942); }
-prt_fild03,226,170,0 script Solid Shells 844,{ unknown_d(12205,943); }
-prt_fild03,262,201,0 script Nice Sweet Potato 844,{ unknown_d(12206,549); }
-prt_fild03,284,190,0 script Raccoon Leaf 844,{ unknown_d(12207,945); }
-gef_fild09,67,46,0 script Snail's Shells 844,{ unknown_d(12208,946); }
-prt_fild03,366,237,0 script Horns 844,{ unknown_d(12209,947); }
-pay_fild07,269,164,0 script Bear's Footskin 844,{ unknown_d(12210,948); }
-prt_fild02,142,116,0 script Feathers 844,{ unknown_d(12211,949); }
-prt_fild02,97,209,0 script Red Herbs 844,{ unknown_d(12212,507); }
-prt_fild02,280,328,0 script Carrots 844,{ unknown_d(12213,515); }
-moc_fild01,169,62,0 script Cactus Needles 844,{ unknown_d(12214,952); }
-cmd_fild08,324,163,0 script Stone Hearts 844,{ unknown_d(12215,953); }
+prt_fild03,144,95,0 script Tree Roots CLEAR_NPC,{ unknown_d(12166,902); }
+prt_fild09,371,255,0 script Reptile Tongues CLEAR_NPC,{ unknown_d(12167,903); }
+prt_fild09,352,241,0 script Scorpion Tails CLEAR_NPC,{ unknown_d(12168,904); }
+pay_fild02,177,108,0 script Stems CLEAR_NPC,{ unknown_d(12169,905); }
+pay_fild02,105,113,0 script Pointed Scales CLEAR_NPC,{ unknown_d(12170,906); }
+pay_fild01,152,171,0 script Resin CLEAR_NPC,{ unknown_d(12171,907); }
+gef_fild01,104,111,0 script Spawn CLEAR_NPC,{ unknown_d(12172,908); }
+prt_fild08,299,332,0 script Jellopy CLEAR_NPC,{ unknown_d(12173,909); }
+izlude,136,160,0 script Fish Tails CLEAR_NPC,{ unknown_d(12174,1023); } // Old coordinates: (132,136)
+izlude_a,136,160,0 script Fish Tails#a CLEAR_NPC,{ unknown_d(12174,1023); }
+izlude_b,136,160,0 script Fish Tails#b CLEAR_NPC,{ unknown_d(12174,1023); }
+izlude_c,136,160,0 script Fish Tails#c CLEAR_NPC,{ unknown_d(12174,1023); }
+izlude_d,136,160,0 script Fish Tails#d CLEAR_NPC,{ unknown_d(12174,1023); }
+prt_fild05,303,169,0 script Worm Peelings CLEAR_NPC,{ unknown_d(12175,955); }
+iz_dun03,155,165,0 script Gills CLEAR_NPC,{ unknown_d(12176,956); }
+mjo_dun01,222,226,0 script Tooth of Bat CLEAR_NPC,{ unknown_d(12177,913); }
+prt_fild06,182,290,0 script Fluff CLEAR_NPC,{ unknown_d(12178,914); }
+prt_fild06,127,85,0 script Chrysalis CLEAR_NPC,{ unknown_d(12179,915); }
+moc_fild07,201,360,0 script Feather of Bird CLEAR_NPC,{ unknown_d(12180,916); }
+moc_fild12,116,122,0 script Talons CLEAR_NPC,{ unknown_d(12181,917); }
+prt_fild04,315,245,0 script Sticky Webfoot CLEAR_NPC,{ unknown_d(12182,918); }
+mjolnir_08,108,99,0 script Animal Skin CLEAR_NPC,{ unknown_d(12183,919); }
+moc_fild03,175,201,0 script Wolf Claws CLEAR_NPC,{ unknown_d(12184,920); }
+pay_fild08,188,153,0 script Mushroom Spores CLEAR_NPC,{ unknown_d(12185,921); }
+gef_fild03,251,109,0 script Orc's Fangs CLEAR_NPC,{ unknown_d(12186,922); }
+c_tower2,170,9,0 script Evil Horns CLEAR_NPC,{ unknown_d(12187,923); }
+gef_fild05,111,96,0 script Powder of Butterfly CLEAR_NPC,{ unknown_d(12188,924); }
+moc_fild11,237,273,0 script Bill of Birds CLEAR_NPC,{ unknown_d(12189,925); }
+pay_fild06,306,233,0 script Snake Scales CLEAR_NPC,{ unknown_d(12190,926); }
+pay_fild07,126,49,0 script Insect Feelers CLEAR_NPC,{ unknown_d(12191,928); }
+iz_dun02,112,96,0 script Immortal Hearts CLEAR_NPC,{ unknown_d(12192,929); }
+moc_pryd02,134,112,0 script Rotten Bandages CLEAR_NPC,{ unknown_d(12193,930); }
+moc_pryd02,36,75,0 script Decayed Nails CLEAR_NPC,{ unknown_d(12194,957); }
+moc_pryd02,148,184,0 script Horrendous Mouths CLEAR_NPC,{ unknown_d(12195,958); }
+iz_dun01,210,77,0 script Tentacles CLEAR_NPC,{ unknown_d(12196,962); }
+iz_dun01,191,92,0 script Shells CLEAR_NPC,{ unknown_d(12197,935); }
+mjolnir_04,191,154,0 script Scale Shells CLEAR_NPC,{ unknown_d(12198,936); }
+mjolnir_04,162,168,0 script Venom Canines CLEAR_NPC,{ unknown_d(12199,937); }
+prt_fild02,102,97,0 script Sticky Mucus CLEAR_NPC,{ unknown_d(12200,938); }
+mjolnir_09,99,100,0 script Bee Stings CLEAR_NPC,{ unknown_d(12201,939); }
+prt_fild07,76,122,0 script Grasshopper's Legs CLEAR_NPC,{ unknown_d(12202,940); }
+prt_fild03,64,35,0 script Royal Jelly CLEAR_NPC,{ unknown_d(12203,526); }
+prt_fild03,180,163,0 script Yoyo Tails CLEAR_NPC,{ unknown_d(12204,942); }
+prt_fild03,226,170,0 script Solid Shells CLEAR_NPC,{ unknown_d(12205,943); }
+prt_fild03,262,201,0 script Nice Sweet Potato CLEAR_NPC,{ unknown_d(12206,549); }
+prt_fild03,284,190,0 script Raccoon Leaf CLEAR_NPC,{ unknown_d(12207,945); }
+gef_fild09,67,46,0 script Snail's Shells CLEAR_NPC,{ unknown_d(12208,946); }
+prt_fild03,366,237,0 script Horns CLEAR_NPC,{ unknown_d(12209,947); }
+pay_fild07,269,164,0 script Bear's Footskin CLEAR_NPC,{ unknown_d(12210,948); }
+prt_fild02,142,116,0 script Feathers CLEAR_NPC,{ unknown_d(12211,949); }
+prt_fild02,97,209,0 script Red Herbs CLEAR_NPC,{ unknown_d(12212,507); }
+prt_fild02,280,328,0 script Carrots CLEAR_NPC,{ unknown_d(12213,515); }
+moc_fild01,169,62,0 script Cactus Needles CLEAR_NPC,{ unknown_d(12214,952); }
+cmd_fild08,324,163,0 script Stone Hearts CLEAR_NPC,{ unknown_d(12215,953); }
-dic_in01,138,225,3 script Diel Guard#ep133_19 492,{
+dic_in01,138,225,3 script Diel Guard#ep133_19 4_MAN_GALTUN1,{
if (!isequipped(2782)) {
mes "[Diel Guard]";
mes "¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó?";
@@ -1249,13 +1249,13 @@ dic_in01,138,225,3 script Diel Guard#ep133_19 492,{
close;
}
-dic_in01,242,182,0 script Elevator#5f_to_4f 844,{
+dic_in01,242,182,0 script Elevator#5f_to_4f CLEAR_NPC,{
select("Administrative Office");
warp "dic_in01",138,221;
end;
}
-dic_in01,263,193,3 script Diel Guard#ep133_20 450,{
+dic_in01,263,193,3 script Diel Guard#ep133_20 4_MAN_GALTUN,{
if (!isequipped(2782)) {
mes "[Diel Guard]";
mes "¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó?";
@@ -1309,7 +1309,7 @@ dic_in01,263,193,3 script Diel Guard#ep133_20 450,{
close;
}
-dic_in01,299,268,0 script #ep133_event01 139,4,4,{
+dic_in01,299,268,0 script #ep133_event01 HIDDEN_WARP_NPC,4,4,{
end;
OnTouch:
if (ep13_3_secret == 13) {
@@ -1339,7 +1339,7 @@ OnTouch:
end;
}
-dic_in01,294,276,5 script Secret Adjutant#ep133_2 498,{
+dic_in01,294,276,5 script Secret Adjutant#ep133_2 4_M_CATMAN2,{
// if ((GetInventoryRemainCount 1301 3 == 2) || (GetInventoryRemainCount 1301 3 == 3)) {
if ((MaxWeight - Weight) < 1000) {
mes "- You can too many items to proceed with the quest. -";
@@ -1503,7 +1503,7 @@ dic_in01,294,276,5 script Secret Adjutant#ep133_2 498,{
end;
}
-dic_in01,300,280,5 script Minister Ahat#ep133_21 493,{
+dic_in01,300,280,5 script Minister Ahat#ep133_21 4_HUMAN_GERUTOO,{
// if ((GetInventoryRemainCount 1301 3 == 2) || (GetInventoryRemainCount 1301 3 == 3)) {
if ((MaxWeight - Weight) < 1000) {
mes "- You can too many items to proceed with the quest. -";
@@ -1790,7 +1790,7 @@ dic_in01,300,280,5 script Minister Ahat#ep133_21 493,{
end;
}
-dic_in01,138,188,0 script #ep133_event02 139,4,4,{
+dic_in01,138,188,0 script #ep133_event02 HIDDEN_WARP_NPC,4,4,{
OnTouch:
if (ep13_3_secret == 19) {
if (!isequipped(2782)) {
@@ -1809,7 +1809,7 @@ OnTouch:
end;
}
-dic_in01,158,188,3 script Jarute HesLanta#ep133_2 451,{
+dic_in01,158,188,3 script Jarute HesLanta#ep133_2 4_MAN_JERUTOO,{
if (!isequipped(2782)) {
mes "[Jarute HesLanta]";
mes "¡ô¡ó¡ö ¡÷ ¡þ¡ù¡ó?";
@@ -2312,7 +2312,7 @@ dic_in01,158,188,3 script Jarute HesLanta#ep133_2 451,{
close;
}
-dicastes01,223,190,1 script Calyon#pa8029 453,{
+dicastes01,223,190,1 script Calyon#pa8029 4_MAN_NITT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -2485,7 +2485,7 @@ dicastes01,223,190,1 script Calyon#pa8029 453,{
close;
}
-dicastes01,211,178,2 script Moltuka#pa0829 453,{
+dicastes01,211,178,2 script Moltuka#pa0829 4_MAN_NITT,{
if (!checkweight(1201,1)) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -2709,7 +2709,7 @@ dicastes01,211,178,2 script Moltuka#pa0829 453,{
}
}
-dicastes01,175,217,5 script Kalipo#pa0829 453,{
+dicastes01,175,217,5 script Kalipo#pa0829 4_MAN_NITT,{
if (!checkweight(1201,1)) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -2851,7 +2851,7 @@ dicastes01,175,217,5 script Kalipo#pa0829 453,{
}
}
-dicastes01,187,230,5 script Laponte#pa0829 453,{
+dicastes01,187,230,5 script Laponte#pa0829 4_MAN_NITT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -3022,7 +3022,7 @@ dicastes01,187,230,5 script Laponte#pa0829 453,{
}
}
-dicastes01,208,230,3 script Pura#pa0829 453,{
+dicastes01,208,230,3 script Pura#pa0829 4_MAN_NITT,{
if (!checkweight(1201,1)) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -3213,7 +3213,7 @@ dicastes01,208,230,3 script Pura#pa0829 453,{
close;
}
-dicastes01,225,211,3 script Tragis#pa0829 453,{
+dicastes01,225,211,3 script Tragis#pa0829 4_MAN_NITT,{
if (!checkweight(1201,1)) {
mes "You have too many kinds of items. Let's try again after you reduce the number of items.";
close;
@@ -3385,7 +3385,7 @@ dicastes01,225,211,3 script Tragis#pa0829 453,{
// Doha's Secret Orders
//============================================================
-mid_campin,168,170,3 script Inspector Doha#ep133 59,{
+mid_campin,168,170,3 script Inspector Doha#ep133 1_M_ORIENT01,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "- You can too many items to proceed with the quest. -";
close;
@@ -3665,7 +3665,7 @@ mid_campin,168,170,3 script Inspector Doha#ep133 59,{
close;
}
-dic_in01,245,119,4 script Shay#ep133_13 884,{
+dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{
// if ((GetInventoryRemainCount 1301 3 == 2) || (GetInventoryRemainCount 1301 3 == 3)) {
if ((MaxWeight - Weight) < 1000) {
mes "- You can too many items to proceed with the quest. -";
@@ -4288,7 +4288,7 @@ dic_in01,245,119,4 script Shay#ep133_13 884,{
end;
}
-dicastes01,207,210,5 script Walking Knit#ep133_15 449,{
+dicastes01,207,210,5 script Walking Knit#ep133_15 4_MAN_BENKUNI,{
if (!isequipped(2782)) {
mes "[Knit]";
mes "¡õ¢£¡ô";
@@ -4386,7 +4386,7 @@ dicastes01,207,210,5 script Walking Knit#ep133_15 449,{
close2;
}
-dicastes01,112,248,5 script Resting Piom#ep133_16 491,{
+dicastes01,112,248,5 script Resting Piom#ep133_16 4_MAN_PIOM5,{
mes "[Piom]";
if (!isequipped(2782)) {
mes "¡ñ¡÷¢¤ ¡ö ¢±¡ñ¡ú?";
@@ -4459,7 +4459,7 @@ dicastes01,112,248,5 script Resting Piom#ep133_16 491,{
close;
}
-dicastes01,249,140,3 script Training Galten#ep133_17 450,{
+dicastes01,249,140,3 script Training Galten#ep133_17 4_MAN_GALTUN,{
if (!isequipped(2782)) {
mes "[Galten]";
mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü";
@@ -4531,7 +4531,7 @@ dicastes01,249,140,3 script Training Galten#ep133_17 450,{
close;
}
-dic_fild01,231,174,5 script BK#ep133_18 496,{
+dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{
if (ep13_3_secret < 3) {
mes "[BK]";
mes "Ha. I'm the information collector of the Cat Merchants.";
@@ -4958,40 +4958,40 @@ OnTimer300000:
stopnpctimer;
end;
}
-dic_fild02,269,55,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef1 844
-dic_fild02,236,29,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef2 844
-dic_fild02,220,34,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef3 844
-dic_fild02,228,55,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef4 844
-dic_fild02,228,63,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef5 844
-dic_fild02,210,75,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef6 844
-dic_fild02,213,35,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef7 844
-dic_fild02,171,49,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef8 844
-dic_fild02,266,44,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef9 844
-dic_fild02,174,79,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef10 844
-dic_fild02,215,85,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef1 844
-dic_fild02,207,41,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef2 844
-dic_fild02,232,41,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef3 844
-dic_fild02,245,68,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef4 844
-dic_fild02,184,63,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef5 844
-dic_fild02,207,94,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef6 844
-dic_fild02,230,71,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef7 844
-dic_fild02,188,50,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef8 844
-dic_fild02,248,36,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef9 844
-dic_fild02,206,115,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef10 844
-dic_fild02,194,86,0 duplicate(ep133_crack#main) Split Earth#ep133_ef1 844
-dic_fild02,240,51,0 duplicate(ep133_crack#main) Split Earth#ep133_ef2 844
-dic_fild02,176,65,0 duplicate(ep133_crack#main) Split Earth#ep133_ef3 844
-dic_fild02,254,45,0 duplicate(ep133_crack#main) Split Earth#ep133_ef4 844
-dic_fild02,178,119,0 duplicate(ep133_crack#main) Split Earth#ep133_ef5 844
-dic_fild02,200,81,0 duplicate(ep133_crack#main) Split Earth#ep133_ef6 844
-dic_fild02,205,54,0 duplicate(ep133_crack#main) Split Earth#ep133_ef7 844
-dic_fild02,224,74,0 duplicate(ep133_crack#main) Split Earth#ep133_ef8 844
-dic_fild02,244,59,0 duplicate(ep133_crack#main) Split Earth#ep133_ef9 844
-dic_fild02,249,43,0 duplicate(ep133_crack#main) Split Earth#ep133_ef10 844
+dic_fild02,269,55,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef1 CLEAR_NPC
+dic_fild02,236,29,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef2 CLEAR_NPC
+dic_fild02,220,34,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef3 CLEAR_NPC
+dic_fild02,228,55,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef4 CLEAR_NPC
+dic_fild02,228,63,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef5 CLEAR_NPC
+dic_fild02,210,75,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef6 CLEAR_NPC
+dic_fild02,213,35,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef7 CLEAR_NPC
+dic_fild02,171,49,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef8 CLEAR_NPC
+dic_fild02,266,44,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef9 CLEAR_NPC
+dic_fild02,174,79,0 duplicate(ep133_crack#main) Rock Pile#ep133_ef10 CLEAR_NPC
+dic_fild02,215,85,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef1 CLEAR_NPC
+dic_fild02,207,41,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef2 CLEAR_NPC
+dic_fild02,232,41,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef3 CLEAR_NPC
+dic_fild02,245,68,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef4 CLEAR_NPC
+dic_fild02,184,63,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef5 CLEAR_NPC
+dic_fild02,207,94,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef6 CLEAR_NPC
+dic_fild02,230,71,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef7 CLEAR_NPC
+dic_fild02,188,50,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef8 CLEAR_NPC
+dic_fild02,248,36,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef9 CLEAR_NPC
+dic_fild02,206,115,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef10 CLEAR_NPC
+dic_fild02,194,86,0 duplicate(ep133_crack#main) Split Earth#ep133_ef1 CLEAR_NPC
+dic_fild02,240,51,0 duplicate(ep133_crack#main) Split Earth#ep133_ef2 CLEAR_NPC
+dic_fild02,176,65,0 duplicate(ep133_crack#main) Split Earth#ep133_ef3 CLEAR_NPC
+dic_fild02,254,45,0 duplicate(ep133_crack#main) Split Earth#ep133_ef4 CLEAR_NPC
+dic_fild02,178,119,0 duplicate(ep133_crack#main) Split Earth#ep133_ef5 CLEAR_NPC
+dic_fild02,200,81,0 duplicate(ep133_crack#main) Split Earth#ep133_ef6 CLEAR_NPC
+dic_fild02,205,54,0 duplicate(ep133_crack#main) Split Earth#ep133_ef7 CLEAR_NPC
+dic_fild02,224,74,0 duplicate(ep133_crack#main) Split Earth#ep133_ef8 CLEAR_NPC
+dic_fild02,244,59,0 duplicate(ep133_crack#main) Split Earth#ep133_ef9 CLEAR_NPC
+dic_fild02,249,43,0 duplicate(ep133_crack#main) Split Earth#ep133_ef10 CLEAR_NPC
// Frede's Request
//============================================================
-dicastes01,117,262,0 script Frede#13_3 491,2,2,{
+dicastes01,117,262,0 script Frede#13_3 4_MAN_PIOM5,2,2,{
if (isequipped(2782)) {
if (ep13_3_invite <= 5) {
mes "[Frede]";
@@ -5049,7 +5049,7 @@ OnTouch:
end;
}
-dic_in01,165,104,0 script Frede#13_3_in 454,{
+dic_in01,165,104,0 script Frede#13_3_in 4_MAN_PIOM,{
if (isequipped(2782)) {
if (ep13_3_bra < 1) {
mes "[Frede]";
@@ -5347,7 +5347,7 @@ dic_in01,165,104,0 script Frede#13_3_in 454,{
close;
}
-dic_dun01,205,43,5 script Brian#ep13_3_ 490,{
+dic_dun01,205,43,5 script Brian#ep13_3_ 4_MAN_PIOM4,{
if (isequipped(2782)) {
if (ep13_3_bra < 4) {
mes "[Brian]";
@@ -5446,7 +5446,7 @@ dic_dun01,205,43,5 script Brian#ep13_3_ 490,{
close;
}
-dic_dun01,153,107,4 script Tyler#13_3 489,{
+dic_dun01,153,107,4 script Tyler#13_3 4_MAN_PIOM6,{
if (isequipped(2782)) {
if (ep13_3_bra < 4) {
mes "[Tyler]";
@@ -5572,7 +5572,7 @@ dic_dun01,153,107,4 script Tyler#13_3 489,{
close;
}
-dic_dun01,235,243,0 script John#13_3 454,{
+dic_dun01,235,243,0 script John#13_3 4_MAN_PIOM,{
if (isequipped(2782)) {
if (ep13_3_bra < 4) {
mes "[John]";
@@ -5674,7 +5674,7 @@ dic_dun01,235,243,0 script John#13_3 454,{
close;
}
-dic_dun02,110,127,5 script Rose#13_3 489,{
+dic_dun02,110,127,5 script Rose#13_3 4_MAN_PIOM6,{
if (isequipped(2782)) {
if (ep13_3_bra < 4) {
mes "[Rose]";
@@ -5773,7 +5773,7 @@ dic_dun02,110,127,5 script Rose#13_3 489,{
close;
}
-dic_dun01,64,107,7 script Bain#13_3 490,{
+dic_dun01,64,107,7 script Bain#13_3 4_MAN_PIOM4,{
if (isequipped(2782)) {
if (ep13_3_bra < 4) {
mes "[Bain]";
@@ -5867,7 +5867,7 @@ dic_dun01,64,107,7 script Bain#13_3 490,{
close;
}
-dic_dun01,58,225,4 script Lash#13_3 491,{
+dic_dun01,58,225,4 script Lash#13_3 4_MAN_PIOM5,{
if (isequipped(2782)) {
if (ep13_3_bra < 4) {
mes "[Lash]";
@@ -5968,7 +5968,7 @@ dic_dun01,58,225,4 script Lash#13_3 491,{
close;
}
-dic_in01,349,129,5 script Bouy#13_3 449,{
+dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{
if (isequipped(2782)) {
if (ep13_3_bra < 5) {
mes "[Bouy]";
@@ -6181,10 +6181,10 @@ dic_in01,349,129,5 script Bouy#13_3 449,{
mes "Try seeing ^4d4dffAello^000000.";
close;
}
-mid_camp,220,246,5 duplicate(Expedition#ep133_is) Expedition Guard Ben 930
-mid_camp,223,246,4 duplicate(Expedition#ep133_is) Expedition Guard Maha 868
+mid_camp,220,246,5 duplicate(Expedition#ep133_is) Expedition Guard Ben 4_M_RACHMAN2
+mid_camp,223,246,4 duplicate(Expedition#ep133_is) Expedition Guard Maha 4_M_LGTGUARD
-mid_campin,93,114,3 script Guard Aello#ep133_is03 967,{
+mid_campin,93,114,3 script Guard Aello#ep133_is03 4_M_RUSMAN1,{
if (ep13_ryu > 99 || ep13_start > 99) {
if (ep13_3_invite == 0) {
mes "[Aello]";
@@ -6240,7 +6240,7 @@ mid_campin,93,114,3 script Guard Aello#ep133_is03 967,{
close;
}
-mid_campin,111,120,3 script Soldier#ep133_is04 852,{
+mid_campin,111,120,3 script Soldier#ep133_is04 4_M_EIN_SOLDIER,{
if (ep13_3_invite == 1) {
mes "[Soldier]";
mes "Sorry, but this room is currently restricted from visitors.";
@@ -6494,7 +6494,7 @@ function script eldicastes_c {
}
}
-mid_campin,168,128,3 script Sapha from Manuk 451,{
+mid_campin,168,128,3 script Sapha from Manuk 4_MAN_JERUTOO,{
if (isequipped(2782)) {
if (!ep13_3_invite) {
mes "-Looks like the Sapha messenger from Manuk.-";
@@ -6592,7 +6592,7 @@ mid_campin,168,128,3 script Sapha from Manuk 451,{
close;
}
-mid_campin,168,125,3 script Hound#ep133_is06 997,{
+mid_campin,168,125,3 script Hound#ep133_is06 4_M_MOCASS1,{
if (!isequipped(2782)) {
mes "[Hound]";
mes "Where is the interpreter ring?";
@@ -6651,7 +6651,7 @@ mid_campin,168,125,3 script Hound#ep133_is06 997,{
close;
}
-mid_campin,165,127,5 script Hibba Agip#ep133_is07 459,{
+mid_campin,165,127,5 script Hibba Agip#ep133_is07 4_M_REDSWORD,{
mes "[Hibba Agip]";
mes "Hmm..?";
mes "I should go now.";
@@ -6661,7 +6661,7 @@ OnInit:
end;
}
-man_in01,315,52,3 script Guard Captain Avalanche 450,{
+man_in01,315,52,3 script Guard Captain Avalanche 4_MAN_GALTUN,{
mes "[Guard Captain Avalanche]";
if (!isequipped(2782)) {
mes "¢¤¡ð¡ú? ¢£ ¡ù¡ð...";
@@ -6739,7 +6739,7 @@ man_in01,315,52,3 script Guard Captain Avalanche 450,{
close;
}
-dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{
+dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{
if (!isequipped(2782)) {
mes "[Clerk Knit]";
mes "¡ð¡ñ¡ô ¡õ ¡ü¢±¢³ ¡ö ¡ò...?";
@@ -7366,12 +7366,12 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{
setd "ep13_3_"+.@v$, .@var[.@r-1] + getd("ep13_3_"+.@v$);
close;
}
-dic_fild01,240,198,2 duplicate(dic_enc#main) Jalapeno#pa0829 495
-dic_fild01,251,183,3 duplicate(dic_enc#main) Brare#pa0829 495
-dic_fild01,259,172,3 duplicate(dic_enc#main) Mancho#pa0829 495
-dic_in01,353,37,5 duplicate(dic_enc#main) Kareka#pa0829 454
+dic_fild01,240,198,2 duplicate(dic_enc#main) Jalapeno#pa0829 4_M_MERCAT1
+dic_fild01,251,183,3 duplicate(dic_enc#main) Brare#pa0829 4_M_MERCAT1
+dic_fild01,259,172,3 duplicate(dic_enc#main) Mancho#pa0829 4_M_MERCAT1
+dic_in01,353,37,5 duplicate(dic_enc#main) Kareka#pa0829 4_MAN_PIOM
-dic_fild01,228,159,4 script Jahbong#pa0829 496,{
+dic_fild01,228,159,4 script Jahbong#pa0829 4_M_MERCAT2,{
mes "[Jahbong]";
if (countitem(6304) < 1) {
mes "You haven't received a Sapha Certification yet?";
@@ -7445,7 +7445,7 @@ dic_fild01,228,159,4 script Jahbong#pa0829 496,{
// Cat Hand Agent
//============================================================
-moc_para01,44,19,3 script Cat Hand Agent#gekk 496,{
+moc_para01,44,19,3 script Cat Hand Agent#gekk 4_M_MERCAT2,{
if (BaseLevel < 70) {
mes "[Cat Hand Agent]";
mes "Hey, human! Did you come to make a request, too? When will it be my turn?";
@@ -7580,7 +7580,7 @@ moc_para01,44,19,3 script Cat Hand Agent#gekk 496,{
close;
}
-moc_fild20,368,197,3 script Cat#to22 876,{
+moc_fild20,368,197,3 script Cat#to22 4_CAT,{
if (ep13_start != 100) {
mes "[Cat]";
mes "Meow~";
@@ -7604,7 +7604,7 @@ moc_fild20,368,197,3 script Cat#to22 876,{
end;
}
-moc_fild22b,182,179,3 script Cat Hand Agent#Tat 495,{
+moc_fild22b,182,179,3 script Cat Hand Agent#Tat 4_M_MERCAT1,{
if (ep13_start != 100) {
mes "[Cat Hand Agent]";
mes "This place as no meaning for us.";
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index 291bcc1f9..bb5619c58 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -84,16 +84,16 @@
else if (compare(.@choice$,"Near Eclage")) warp "ecl_fild01",116,309;
close;
}
-ecl_fild01,118,311,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.1 421
-bif_fild02,293,325,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.2 421
-spl_fild02,53,242,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.3 421
-mid_camp,207,234,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.4 421
-man_fild02,135,49,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.5 421
-dic_fild01,161,266,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.6 421
+ecl_fild01,118,311,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.1 4_M_BOSSCAT
+bif_fild02,293,325,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.2 4_M_BOSSCAT
+spl_fild02,53,242,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.3 4_M_BOSSCAT
+mid_camp,207,234,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.4 4_M_BOSSCAT
+man_fild02,135,49,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.5 4_M_BOSSCAT
+dic_fild01,161,266,4 duplicate(Teleport Cat#ep14_2) Teleport Cat No.6 4_M_BOSSCAT
// Eclage's Entrance
//============================================================
-ecl_fild01,97,322,0 script #ep14_2Entrance 45,3,3,{
+ecl_fild01,97,322,0 script #ep14_2Entrance WARPNPC,3,3,{
OnTouch:
if (ep14_2_enter < 3) {
mes "[Security Guard]";
@@ -105,7 +105,7 @@ OnTouch:
end;
}
-ecl_fild01,94,322,5 script Security Guard#ep14_2 447,{
+ecl_fild01,94,322,5 script Security Guard#ep14_2 4_M_FAIRYSOLDIER,{
if (ep14_2_enter == 0) {
mes "[Security Guard]";
mes "All first-time visitors to Eclage must fill out the necessary forms here before entering.";
@@ -171,9 +171,9 @@ ecl_fild01,94,322,5 script Security Guard#ep14_2 447,{
close;
}
}
-ecl_fild01,100,323,3 duplicate(Security Guard#ep14_2) Security Guard#ep14_2_2 447
+ecl_fild01,100,323,3 duplicate(Security Guard#ep14_2) Security Guard#ep14_2_2 4_M_FAIRYSOLDIER
-ecl_fild01,111,320,2 script Immigration Officer#ep1 445,{
+ecl_fild01,111,320,2 script Immigration Officer#ep1 4_M_FAIRYKID4,{
if (ep14_2_enter == 0) {
mes "[Immigration Officer]";
mes "What do you need?";
@@ -340,7 +340,7 @@ ecl_fild01,111,320,2 script Immigration Officer#ep1 445,{
// Oliver Wolf Hood
//============================================================
-eclage,102,32,4 script Fairy Carpenter#ep14_2 443,{
+eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
if (BaseLevel < 120) {
mes "[Fairy Carpenter]";
mes "The bridge is kind of broken so please be careful.";
@@ -464,7 +464,7 @@ OnTouch:
*/
}
-eclage,283,275,4 script Glaces#ep14_2 438,{
+eclage,283,275,4 script Glaces#ep14_2 4_F_FAIRYKID3,{
mes "[Glaces]";
mes "Hm......";
mes "The guys are late.";
@@ -478,7 +478,7 @@ eclage,283,275,4 script Glaces#ep14_2 438,{
close;
}
-eclage,266,216,4 script Moreng#ep14_2 444,{
+eclage,266,216,4 script Moreng#ep14_2 4_M_FAIRYKID3,{
mes "[Moreng]";
mes "Eclage is a really nice place to live.";
mes "The flowers are always in full bloom and the weather is always comfortable.";
@@ -493,34 +493,34 @@ eclage,266,216,4 script Moreng#ep14_2 444,{
close;
}
-eclage,191,200,4 script Yube#ep14_2 446,{
+eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{
mes "- Shuffle shuffle -";
mes "He's working on something.";
mes "Let's not bother him.";
close;
}
-eclage,292,265,0 script #ep14_2Yube Entrance 45,2,2,{
+eclage,292,265,0 script #ep14_2Yube Entrance WARPNPC,2,2,{
OnTouch:
mes "- Looks like the door is locked. -";
close;
}
-eclage,265,166,4 script Shul#ep14_2 443,{
+eclage,265,166,4 script Shul#ep14_2 4_M_FAIRYKID2,{
mes "[Shul]";
mes "Laphine's put their lives on the line to make Yai beautiful.";
mes "I'm a Laphine myself but that kind of priority is difficult to understand.";
close;
}
-eclage,137,169,4 script Tato#ep14_2 439,{
+eclage,137,169,4 script Tato#ep14_2 4_F_FAIRYKID4,{
mes "[Tato]";
mes "A friend of mine recently applied to the Splendide unit.";
mes "I heard Jotunheim is really cold. I hope he's doing well.";
close;
}
-ecl_in01,60,71,4 script Old Man#ep14_2 443,{
+ecl_in01,60,71,4 script Old Man#ep14_2 4_M_FAIRYKID2,{
mes "[Old Man]";
mes "Hohoho~!";
next;
@@ -542,7 +542,7 @@ ecl_in01,60,71,4 script Old Man#ep14_2 443,{
close;
}
-ecl_in01,44,53,4 script Delivery Man#ep14_2 513,{
+ecl_in01,44,53,4 script Delivery Man#ep14_2 4_M_DOGTRAVELER,{
mes "[Delivery Man]";
mes "Sigh...";
mes "I need to get going in order to make it on time.";
@@ -555,7 +555,7 @@ ecl_in01,44,53,4 script Delivery Man#ep14_2 513,{
close;
}
-ecl_in01,70,88,4 script Sack Merchant#ep14_2 495,{
+ecl_in01,70,88,4 script Sack Merchant#ep14_2 4_M_MERCAT1,{
mes "[Sack Merchant]";
mes "Meow?";
mes "Helloeow~";
@@ -565,14 +565,14 @@ ecl_in01,70,88,4 script Sack Merchant#ep14_2 495,{
close;
}
-ecl_in01,73,51,4 script Murah#ep14_2 442,{
+ecl_in01,73,51,4 script Murah#ep14_2 4_M_FAIRYKID,{
mes "[Murah]";
mes "Hmm... What amazing present should I give?";
emotion e_flash;
close;
}
-ecl_fild01,192,94,4 script Golie#ep14_2 442,{
+ecl_fild01,192,94,4 script Golie#ep14_2 4_M_FAIRYKID,{
mes "[Golie]";
mes "To grow Elder Willow trees,";
mes "since Spring, Peco Peco";
@@ -591,7 +591,7 @@ ecl_fild01,192,94,4 script Golie#ep14_2 442,{
close;
}
-ecl_fild01,97,315,4 script Traveler#ep14_2 732,{
+ecl_fild01,97,315,4 script Traveler#ep14_2 4_M_JOB_HUNTER,{
mes "[Traveler]";
mes "Who are you?";
mes "I've never seen you before.";
@@ -611,13 +611,13 @@ ecl_fild01,97,315,4 script Traveler#ep14_2 732,{
// Wanted to be Big and Beautiful
//============================================================
-eclage,282,255,4 script Wuhari#eclbig 620,{
+eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{
mes "[Wuhari]";
mes "Ah... Is there anyone with more experienced with this...";
close;
}
-eclage,163,228,4 script Goatie#eclbig 438,{
+eclage,163,228,4 script Goatie#eclbig 4_F_FAIRYKID3,{
mes "[Goatie]";
mes "Have you ever been to the palace?";
mes "They say that it is so much more beautiful than our Yai's could ever be.";
@@ -627,7 +627,7 @@ eclage,163,228,4 script Goatie#eclbig 438,{
close;
}
-eclage,170,195,4 script Svery#eclbig 443,{
+eclage,170,195,4 script Svery#eclbig 4_M_FAIRYKID2,{
mes "[Svery]";
mes "It's my wife's big wish to visit the palace.";
next;
@@ -637,7 +637,7 @@ eclage,170,195,4 script Svery#eclbig 443,{
close;
}
-eclage,126,151,4 script Pompe#eclbig 444,{
+eclage,126,151,4 script Pompe#eclbig 4_M_FAIRYKID3,{
mes "[Pompe]";
mes "I saw it!";
next;
@@ -648,9 +648,9 @@ eclage,126,151,4 script Pompe#eclbig 444,{
// Mystery Robbery Investigation
//============================================================
-eclage,164,102,3 script Cruyan#eclage 442,{}
+eclage,164,102,3 script Cruyan#eclage 4_M_FAIRYKID,{}
-eclage,222,131,4 script Wandering Merchant#ecla 807,{
+eclage,222,131,4 script Wandering Merchant#ecla 1_M_SIGNMCNT,{
mes "[Wandering Merchant]";
mes "Go away kids~";
close;
@@ -658,7 +658,7 @@ eclage,222,131,4 script Wandering Merchant#ecla 807,{
// Troublesome Fairie
//============================================================
-ecl_in01,26,88,4 script Cecilia#nk 440,{
+ecl_in01,26,88,4 script Cecilia#nk 4_F_FAIRYKID5,{
mes "[Cecilia]";
mes "Mm...mm... what should I do...";
next;
@@ -666,13 +666,13 @@ ecl_in01,26,88,4 script Cecilia#nk 440,{
close;
}
-ecl_in01,80,77,4 script Dominic#nk 445,{
+ecl_in01,80,77,4 script Dominic#nk 4_M_FAIRYKID4,{
mes "[Dominic]";
mes "I won't stop you from walking around in Eclage but, don't bother me you outsider!";
close;
}
-ecl_in02,160,36,4 script Eirinn#nk 441,{
+ecl_in02,160,36,4 script Eirinn#nk 4_F_FAIRYKID6,{
mes "[Eirinn]";
mes "Oww, my stomach hurts!!";
mes "What are you looking at?";
@@ -682,18 +682,18 @@ ecl_in02,160,36,4 script Eirinn#nk 441,{
close;
}
-ecl_in03,175,69,4 script Bourbon#nk 444,{
+ecl_in03,175,69,4 script Bourbon#nk 4_M_FAIRYKID3,{
mes "[Bourbon]";
mes "How strange. I've been losing my stuff recently like things I put in my pocket or even the things I put away properly.";
close;
}
-ecl_in01,82,80,0 script Monthly Eclage#pa0829 111,{
+ecl_in01,82,80,0 script Monthly Eclage#pa0829 HIDDEN_NPC,{
mes "^000099I see a plain-looking journal. It seems to deal with third-rate gossip stories.^000000";
close;
}
-ecl_in01,82,78,0 script Magazine#01 111,{
+ecl_in01,82,78,0 script Magazine#01 HIDDEN_NPC,{
mes "- I saw a book and stretched my hand out to reach for it. I think it's about Midgard. -";
next;
mes "[Dominic]";
@@ -702,14 +702,14 @@ ecl_in01,82,78,0 script Magazine#01 111,{
mes "Stay away from my bookshelves!";
close;
}
-ecl_in01,82,79,0 duplicate(Magazine#01) Magazine#02 111
-ecl_in01,83,81,0 duplicate(Magazine#01) Exploration of Midgard::ExplorationMidgard1 111
-ecl_in01,82,84,0 duplicate(Magazine#01) Exploration of Midgard::ExplorationMidgard2 111
-ecl_in01,80,86,0 duplicate(Magazine#01) Exploration of Midgard::ExplorationMidgard3 111
+ecl_in01,82,79,0 duplicate(Magazine#01) Magazine#02 HIDDEN_NPC
+ecl_in01,83,81,0 duplicate(Magazine#01) Exploration of Midgard::ExplorationMidgard1 HIDDEN_NPC
+ecl_in01,82,84,0 duplicate(Magazine#01) Exploration of Midgard::ExplorationMidgard2 HIDDEN_NPC
+ecl_in01,80,86,0 duplicate(Magazine#01) Exploration of Midgard::ExplorationMidgard3 HIDDEN_NPC
// Hiel's Workshop
//============================================================
-eclage,155,91,4 script #pa0829Hiel's Door10 836,{
+eclage,155,91,4 script #pa0829Hiel's Door10 2_BOARD2,{
mes "[Notice]";
mes "Pan-galactic ultra genius engineer Hiel's strange and creepy workshop.";
mes "Normal Laphines, animals, and Saphas are prohibited.";
@@ -719,7 +719,7 @@ eclage,155,91,4 script #pa0829Hiel's Door10 836,{
close;
}
-ecl_in04,108,215,0 script Supreme Electronic Rope 111,{
+ecl_in04,108,215,0 script Supreme Electronic Rope HIDDEN_NPC,{
mes "If you would like to go down, please press the bell~";
next;
if(select("Forget it.:Go down.") == 2)
@@ -727,12 +727,12 @@ ecl_in04,108,215,0 script Supreme Electronic Rope 111,{
close;
}
-ecl_in04,105,216,0 script Hiel's Workshop#pa0829 111,{
+ecl_in04,105,216,0 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
mes "^000099It's a workshop with lots of oddities.^000000";
close;
}
-ecl_in04,109,215,2 script Hiel#pa0829 621,{
+ecl_in04,109,215,2 script Hiel#pa0829 4_M_FAIRYSCHOLAR,{
mes "[Hiel]";
mes "It is said that the leaves from home tree have the length X with the average m and standard deviation of 4. If P(m<X<a)=0.3413 ... (Mumble mumble)";
next;
@@ -790,7 +790,7 @@ function script F_Eclage_Traveler {
return;
}
-ecl_in01,32,52,4 script Traveler Fome#tl01 515,3,3,{
+ecl_in01,32,52,4 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{
if (ep14_2_tl == 0) {
if (checkquest(7411) == -1) {
mes "[Fome]";
@@ -918,7 +918,7 @@ OnTouch:
end;
}
-ecl_in01,32,51,6 script Traveler Litrip#tl02 513,{
+ecl_in01,32,51,6 script Traveler Litrip#tl02 4_M_DOGTRAVELER,{
if (ep14_2_tl == 0) {
if (checkquest(7412) == -1) {
mes "[Litrip]";
@@ -1006,7 +1006,7 @@ ecl_in01,32,51,6 script Traveler Litrip#tl02 513,{
}
}
-ecl_in01,35,51,2 script Traveler Chiba#tl03 514,{
+ecl_in01,35,51,2 script Traveler Chiba#tl03 4_M_DOGTRAVELER2,{
if (ep14_2_tl == 0) {
if (checkquest(7413) == -1) {
mes "[Chiba]";
@@ -1094,7 +1094,7 @@ ecl_in01,35,51,2 script Traveler Chiba#tl03 514,{
}
}
-ecl_in01,82,70,2 script Eclage Guard#tl02 447,{
+ecl_in01,82,70,2 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{
if (ep14_2_tl == 0) {
mes "[Eclage Guard]";
mes "Welcome to Eclage."; //custom
@@ -1287,7 +1287,7 @@ ecl_in01,82,70,2 script Eclage Guard#tl02 447,{
}
}
-ecl_in03,245,93,2 script Chief of Staff#tl01 435,{
+ecl_in03,245,93,2 script Chief of Staff#tl01 4_F_FAIRY,{
if (ep14_2_tl < 2) {
mes "[Chief of Staff]";
mes "Sorry, but no unauthorized entry is allowed here.";
@@ -1468,7 +1468,7 @@ ecl_in03,245,93,2 script Chief of Staff#tl01 435,{
}
}
-ecl_in03,41,90,2 script Mayor Jun Kardui#tl01 624,{
+ecl_in03,41,90,2 script Mayor Jun Kardui#tl01 4_M_FARIYKING,{
if (ep14_2_tl < 4) {
mes "[Kardui]";
mes "Mmm...";
@@ -1596,7 +1596,7 @@ ecl_in03,41,90,2 script Mayor Jun Kardui#tl01 624,{
}
}
-ecl_in01,31,49,6 script Eclage Guard#tl01 447,{
+ecl_in01,31,49,6 script Eclage Guard#tl01 4_M_FAIRYSOLDIER,{
mes "[Eclage Guard]";
mes "Oh, I should hurry and go back to where I was.";
mes "Excuse me.";
@@ -1610,7 +1610,7 @@ OnEnable:
end;
}
-ecl_fild01,205,86,4 script Eclage Messenger Roy#tl 461,{
+ecl_fild01,205,86,4 script Eclage Messenger Roy#tl 4_M_FAIRYSOLDIER2,{
if (ep14_2_tl < 5) {
mes "[Roy]";
mes "I can make it to Mora Village.";
@@ -1698,7 +1698,7 @@ ecl_fild01,205,86,4 script Eclage Messenger Roy#tl 461,{
}
}
-eclage,112,40,4 script Eclage Guard Leo#tl 461,{
+eclage,112,40,4 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{
if (ep14_2_tl < 5) {
mes "[Leo]";
mes "Welcome to Eclage, the capital of Laphines and a gateway to Alpheim.";
@@ -1780,42 +1780,42 @@ eclage,112,40,4 script Eclage Guard Leo#tl 461,{
}
}
-ecl_in03,245,54,2 script Working Laphine 439,{ //Laphine on official duty#tl01
+ecl_in03,245,54,2 script Working Laphine 4_F_FAIRYKID4,{ //Laphine on official duty#tl01
mes "[Working Laphine]";
mes "This is the office area designated for official business.";
mes "You're not supposed to be here.";
close;
}
-ecl_in03,244,57,4 script Resting Laphine#tl01 440,{
+ecl_in03,244,57,4 script Resting Laphine#tl01 4_F_FAIRYKID5,{
mes "Two Laphines from the upper class are talking about something.";
mes "One of them seems to be working and very annoyed.";
mes "As if they were aware of my stare, they waved me away with a show of irritation.";
close;
}
-ecl_in02,98,32,2 script Eclage Guard#tl1b 461,{
+ecl_in02,98,32,2 script Eclage Guard#tl1b 4_M_FAIRYSOLDIER2,{
mes "[Eclage Guard]";
mes "This the prison where we put criminals.";
mes "No outsiders can enter.";
close;
}
-eclage,274,294,4 script Conversing Laphine 436,{ //Laphines in a conversation#tl02
+eclage,274,294,4 script Conversing Laphine 4_F_FAIRYKID,{ //Laphines in a conversation#tl02
mes "A female Laphine and a male Laphine are talking about something.";
mes "But they stopped talking as soon as they saw me.";
mes "I think I've interrupted the conversation.";
close;
}
-eclage,275,294,2 script Eclage Resident#tl02 445,{
+eclage,275,294,2 script Eclage Resident#tl02 4_M_FAIRYKID4,{
mes "[Male Laphine]";
mes "You're visiting Eclage?";
mes "I hope you have a good time here.";
close;
}
-eclage,307,237,0 script Normal Yai#tllb 844,{
+eclage,307,237,0 script Normal Yai#tllb CLEAR_NPC,{
mes "This is a Laphine's Yai.";
mes "The door is locked shut.";
cutin "avn_labo.bmp",4;
@@ -1826,7 +1826,7 @@ eclage,307,237,0 script Normal Yai#tllb 844,{
// Unknown
//============================================================
-ecl_fild01,173,95,4 script Diary Frog No. 30#worm 614,{
+ecl_fild01,173,95,4 script Diary Frog No. 30#worm 4_FROG,{
mes "[Diary Frog No. 30]";
mes "As you can see, I am a broken Diary Frog.";
mes "Professor Worm threw me out really hard all the way out here.";
@@ -1834,4 +1834,4 @@ ecl_fild01,173,95,4 script Diary Frog No. 30#worm 614,{
close;
}
-eclage,156,56,0 script Residence Entrance 844,{}
+eclage,156,56,0 script Residence Entrance CLEAR_NPC,{}
diff --git a/npc/re/quests/quests_izlude.txt b/npc/re/quests/quests_izlude.txt
index 2bc548b70..9e7b34746 100644
--- a/npc/re/quests/quests_izlude.txt
+++ b/npc/re/quests/quests_izlude.txt
@@ -12,8 +12,8 @@
//= 1.1 Added Izlude duplicates. [Euphy]
//============================================================
-izlude,179,219,2 duplicate(Edgar_izlude) Edgar#izlude 49
-izlude_a,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_a 49
-izlude_b,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_b 49
-izlude_c,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_c 49
-izlude_d,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_d 49
+izlude,179,219,2 duplicate(Edgar_izlude) Edgar#izlude 1_M_03
+izlude_a,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_a 1_M_03
+izlude_b,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_b 1_M_03
+izlude_c,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_c 1_M_03
+izlude_d,179,219,2 duplicate(Edgar_izlude) Edgar#izlude_d 1_M_03
diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt
index 18f5e42d4..68148a1b4 100644
--- a/npc/re/quests/quests_lighthalzen.txt
+++ b/npc/re/quests/quests_lighthalzen.txt
@@ -14,15 +14,15 @@
// Renewal split [Daegaladh]
//============================================================
-izlude,172,73,6 duplicate(Scamp) Scamp#iz 853
-izlude_a,172,73,6 duplicate(Scamp) Scamp#iz_a 853
-izlude_b,172,73,6 duplicate(Scamp) Scamp#iz_b 853
-izlude_c,172,73,6 duplicate(Scamp) Scamp#iz_c 853
-izlude_d,172,73,6 duplicate(Scamp) Scamp#iz_d 853
+izlude,172,73,6 duplicate(Scamp) Scamp#iz 4_M_YURI
+izlude_a,172,73,6 duplicate(Scamp) Scamp#iz_a 4_M_YURI
+izlude_b,172,73,6 duplicate(Scamp) Scamp#iz_b 4_M_YURI
+izlude_c,172,73,6 duplicate(Scamp) Scamp#iz_c 4_M_YURI
+izlude_d,172,73,6 duplicate(Scamp) Scamp#iz_d 4_M_YURI
// Somatology Laboratory F4
//============================================================
-lighthalzen,303,304,5 script Jerome Jameson#start 904,{
+lighthalzen,303,304,5 script Jerome Jameson#start 4_M_KHMAN,{
if (lhz_dun04 == 0) {
mes "[Jerome Jameson]";
mes "Wow, what a "+((Sex)?"strong man!":"beautiful dame!");
@@ -106,7 +106,7 @@ function script lhz4enter {
close;
}
-lhz_dun03,239,77,0 script #warplhz3lhz4 45,1,1,{
+lhz_dun03,239,77,0 script #warplhz3lhz4 WARPNPC,1,1,{
OnTouch:
if (lhz_dun04 == 0) {
mes "It doesn't make sense to go down these flooded stairs.";
@@ -141,7 +141,7 @@ OnEnable:
end;
}
-lhz_dun04,151,276,3 script Researcher#lhz4 865,{
+lhz_dun04,151,276,3 script Researcher#lhz4 4_LGTSCIENCE,{
if (lhz_dun04 == 0) {
mes "[Researcher]";
mes "................";
@@ -217,7 +217,7 @@ lhz_dun04,151,276,3 script Researcher#lhz4 865,{
end;
}
-que_lhz,207,75,3 script Researcher#ins 865,3,3,{
+que_lhz,207,75,3 script Researcher#ins 4_LGTSCIENCE,3,3,{
OnTouch:
if (lhz_dun04 == 1) {
mes "[Researcher]";
@@ -264,7 +264,7 @@ OnTouch:
close;
}
-que_lhz,94,119,3 script Researcher#ins2 865,{
+que_lhz,94,119,3 script Researcher#ins2 4_LGTSCIENCE,{
if (lhz_dun04 == 2) {
mes "[Wolfchev]";
mes "Hehehe. You are really persistent. What do you want from someone like me?";
@@ -302,7 +302,7 @@ que_lhz,94,119,3 script Researcher#ins2 865,{
mes "..........";
close;
}
-que_lhz,147,224,3 script Researcher#ins3 865,{
+que_lhz,147,224,3 script Researcher#ins3 4_LGTSCIENCE,{
if (lhz_dun04 == 4 || mobcount("que_lhz","#controllhz4::OnMyMobDead") > 0) {
mes "[Wolfchev]";
mes "Wolfchev is freaking out. He is out of his mind.";
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index e120f0e39..ea03d66bb 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -24,7 +24,7 @@
// Utility NPCs :: cat_merchant
//============================================================
-mal_in02,134,31,5 script Investment Cat Helper 505,{
+mal_in02,134,31,5 script Investment Cat Helper 4_WHITETIGER,{
if (MaxWeight - Weight < 100 || checkweight(1201,1) == 0) {
mes "[Investment Cat Helper]";
mes "You have a heavy load. Maybe you're a peddler? No peddlers in this area.";
@@ -306,7 +306,7 @@ mal_in02,134,31,5 script Investment Cat Helper 505,{
}
}
-malangdo,184,139,4 script Storekeeper#mal 560,{
+malangdo,184,139,4 script Storekeeper#mal 4_CAT_ADV2,{
mes "[Storekeeper]";
mes "Hey, looks like you might be looking to unload some of your stuff from your pack.";
mes "Want to open storage? For free?";
@@ -357,7 +357,7 @@ malangdo,184,139,4 script Storekeeper#mal 560,{
// Malangdo Island :: ma_tomas
//============================================================
-mal_in02,28,56,5 script Samuel#mal 495,{
+mal_in02,28,56,5 script Samuel#mal 4_M_MERCAT1,{
mes "[Samuel]";
mes "Ah, you mean the ad... well, you mean our village chief?";
mes "You'd better not bother him, since he's always busy.";
@@ -401,7 +401,7 @@ mal_in02,28,56,5 script Samuel#mal 495,{
}
}
-mal_in02,22,62,3 script Tomas#mal 556,{
+mal_in02,22,62,3 script Tomas#mal 4_CAT_ADMIRAL,{
if (BaseLevel < 60) {
mes "[Tomas, Village Chief]";
mes "Ummm... Who are you?";
@@ -628,7 +628,7 @@ mal_in02,22,62,3 script Tomas#mal 556,{
end;
}
-mal_in02,182,61,3 script President of Meeting#mal 421,{
+mal_in02,182,61,3 script President of Meeting#mal 4_M_BOSSCAT,{
if (ma_tomas == 0) {
mes "[President of Meeting]";
mes "Please be silent, the regular meeting is getting started a moment later~";
@@ -694,7 +694,7 @@ mal_in02,182,61,3 script President of Meeting#mal 421,{
close;
}
-mal_in02,178,66,5 script Scottfold#mal 422,{
+mal_in02,178,66,5 script Scottfold#mal 4_M_BABYCAT,{
if (ma_tomas == 0) {
mes "[Scottfold]";
mes "Attending the meeting is an important thing to do.";
@@ -732,7 +732,7 @@ mal_in02,178,66,5 script Scottfold#mal 422,{
close;
}
-mal_in02,177,58,7 script Koon#mal 546,{
+mal_in02,177,58,7 script Koon#mal 4_CAT_SAILOR3,{
if (ma_tomas == 0) {
mes "[Koon]";
mes "Though I'm busy, I always attend this meeting.";
@@ -770,7 +770,7 @@ mal_in02,177,58,7 script Koon#mal 546,{
close;
}
-mal_in02,174,64,5 script Linguist Devore#mal 549,{
+mal_in02,174,64,5 script Linguist Devore#mal 4_CAT_MERMASTER,{
if (ma_tomas < 4) {
mes "[Linguist Devore]";
mes "Most of our cats are especially talented in language.";
@@ -944,7 +944,7 @@ mal_in02,174,64,5 script Linguist Devore#mal 549,{
close;
}
-mal_in02,179,57,1 script Geologist Mali#mal 559,{
+mal_in02,179,57,1 script Geologist Mali#mal 4_CAT_ADV1,{
if (ma_tomas < 5) {
mes "[Geologist Mali]";
mes "Malangdo is named because the ground here is so soft, mew~";
@@ -1145,7 +1145,7 @@ mal_in02,179,57,1 script Geologist Mali#mal 559,{
close;
}
-mal_in02,140,94,0 script Bob#mal 553,{
+mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{
if (ma_tomas < 14) {
mes "[Bob]";
mes "You bow-wow! bow! wow! I mew! mew! mew!";
@@ -1387,16 +1387,16 @@ OnDisable:
disablenpc strnpcinfo(0);
end;
}
-malangdo,114,157,0 duplicate(Crack#mal0) Crack#mal1 550
-malangdo,284,237,0 duplicate(Crack#mal0) Crack#mal2 550
-malangdo,134,150,0 duplicate(Crack#mal0) Crack#mal3 550
-malangdo,173,199,0 duplicate(Crack#mal0) Crack#mal4 550
-malangdo,233,197,0 duplicate(Crack#mal0) Crack#mal5 550
-malangdo,137,239,0 duplicate(Crack#mal0) Crack#mal6 550
-malangdo,239,157,0 duplicate(Crack#mal0) Crack#mal7 550
-malangdo,221,155,0 duplicate(Crack#mal0) Crack#mal8 550
-malangdo,217,109,0 duplicate(Crack#mal0) Crack#mal9 550
-malangdo,162,183,0 duplicate(Crack#mal0) Crack#mal10 550
+malangdo,114,157,0 duplicate(Crack#mal0) Crack#mal1 4_CRACK
+malangdo,284,237,0 duplicate(Crack#mal0) Crack#mal2 4_CRACK
+malangdo,134,150,0 duplicate(Crack#mal0) Crack#mal3 4_CRACK
+malangdo,173,199,0 duplicate(Crack#mal0) Crack#mal4 4_CRACK
+malangdo,233,197,0 duplicate(Crack#mal0) Crack#mal5 4_CRACK
+malangdo,137,239,0 duplicate(Crack#mal0) Crack#mal6 4_CRACK
+malangdo,239,157,0 duplicate(Crack#mal0) Crack#mal7 4_CRACK
+malangdo,221,155,0 duplicate(Crack#mal0) Crack#mal8 4_CRACK
+malangdo,217,109,0 duplicate(Crack#mal0) Crack#mal9 4_CRACK
+malangdo,162,183,0 duplicate(Crack#mal0) Crack#mal10 4_CRACK
- script Crackt0#mal -1,{
end;
@@ -1430,7 +1430,7 @@ OnTimer30000:
- duplicate(Crackt0#mal) Crackt9#mal -1
- duplicate(Crackt0#mal) Crackt10#mal -1
-mal_in02,181,55,3 script Brie#mal 545,{
+mal_in02,181,55,3 script Brie#mal 4_CAT_SAILOR2,{
if (ma_tomas < 6) {
mes "[Brie]";
mes "Sorry, but I don't feel like talking with you. Please leave me alone.";
@@ -1560,7 +1560,7 @@ mal_in02,181,55,3 script Brie#mal 545,{
close;
}
-mal_in01,114,169,5 script Rican#mal 547,{
+mal_in01,114,169,5 script Rican#mal 4_CAT_SAILOR4,{
if (ma_tomas < 9) {
mes "[Rican]";
mes "Woo waa hoohoo...";
@@ -1859,7 +1859,7 @@ mal_in01,114,169,5 script Rican#mal 547,{
close;
}
-mal_in01,116,168,0 script Dry Machine#mal 563,{
+mal_in01,116,168,0 script Dry Machine#mal 2_SLOT_MACHINE,{
if (ma_tomas == 10) {
if (countitem(6435) < 30) {
mes "[Rican]";
@@ -1925,16 +1925,16 @@ OnDisable:
disablenpc strnpcinfo(0);
end;
}
-malangdo,221,139,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#1 557
-malangdo,208,174,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#2 557
-malangdo,191,223,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#3 557
-malangdo,150,195,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#4 557
-malangdo,116,196,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#5 557
-malangdo,178,145,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#6 557
-malangdo,142,120,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#7 557
-malangdo,136,122,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#8 557
-malangdo,152,143,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#9 557
-malangdo,242,175,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#10 557
+malangdo,221,139,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#1 4_SOIL
+malangdo,208,174,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#2 4_SOIL
+malangdo,191,223,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#3 4_SOIL
+malangdo,150,195,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#4 4_SOIL
+malangdo,116,196,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#5 4_SOIL
+malangdo,178,145,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#6 4_SOIL
+malangdo,142,120,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#7 4_SOIL
+malangdo,136,122,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#8 4_SOIL
+malangdo,152,143,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#9 4_SOIL
+malangdo,242,175,0 duplicate(Suspicious Sand Pile#0) Suspicious Sand Pile#10 4_SOIL
- script Water Sand0#mal -1,{
OnInit:
@@ -1967,7 +1967,7 @@ OnTimer30000:
- duplicate(Water Sand0#mal) Water Sand9#mal -1
- duplicate(Water Sand0#mal) Water Sand10#mal -1
-mal_dun01,136,120,6 script Linguist Devore#mald 549,{
+mal_dun01,136,120,6 script Linguist Devore#mald 4_CAT_MERMASTER,{
end;
OnInit:
disablenpc "Linguist Devore#mald";
@@ -1985,7 +1985,7 @@ OnTimer100000:
end;
}
-mal_dun01,136,122,3 script Biscuit#mal 551,{
+mal_dun01,136,122,3 script Biscuit#mal 4_ASTER,{
if (ma_tomas < 20) {
mes "- There's something strange. -";
mes "- It feels like somehow - ";
@@ -2418,7 +2418,7 @@ mal_dun01,136,122,3 script Biscuit#mal 551,{
close;
}
-mal_in02,102,94,3 script Cleaning Staff#mal 544,2,2,{
+mal_in02,102,94,3 script Cleaning Staff#mal 4_CAT_SAILOR1,2,2,{
OnTouch:
if (checkweight(1201,1) == 0) {
mes " - Notice !! -";
@@ -2506,7 +2506,7 @@ malangdo,246,184,0 script 1st Rate Point 111,{
}
}
-mal_dun01,133,125,5 script Star Candy#mal 552,{
+mal_dun01,133,125,5 script Star Candy#mal 4_F_STARFISHGIRL,{
if (ma_tomas == 19) {
mes "[Star Candy]";
mes "....";
@@ -2673,12 +2673,12 @@ mal_dun01,133,125,5 script Star Candy#mal 552,{
close;
}
}
-mal_dun01,143,137,0 duplicate(#skin_mal) Dry Skin#29 111
-mal_dun01,131,150,0 duplicate(#skin_mal) Prickly Skin#30 111
-mal_dun01,116,144,0 duplicate(#skin_mal) Chapped Skin#31 111
-mal_dun01,120,129,0 duplicate(#skin_mal) Hard Skin#32 111
+mal_dun01,143,137,0 duplicate(#skin_mal) Dry Skin#29 HIDDEN_NPC
+mal_dun01,131,150,0 duplicate(#skin_mal) Prickly Skin#30 HIDDEN_NPC
+mal_dun01,116,144,0 duplicate(#skin_mal) Chapped Skin#31 HIDDEN_NPC
+mal_dun01,120,129,0 duplicate(#skin_mal) Hard Skin#32 HIDDEN_NPC
-malangdo,190,167,7 script Portali#mal 546,{
+malangdo,190,167,7 script Portali#mal 4_CAT_SAILOR3,{
if (ma_tomas < 100) {
mes "[Portali]";
mes "I have no business for an immature fellow!";
@@ -2751,7 +2751,7 @@ L_Warp:
// Malangdo Island :: mal_ppl
//============================================================
-malangdo,137,200,6 script Pipielle 549,{
+malangdo,137,200,6 script Pipielle 4_CAT_MERMASTER,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -2883,7 +2883,7 @@ malangdo,137,200,6 script Pipielle 549,{
// Help the Bad Cats in Danger :: mal_bad_guys
//============================================================
-malangdo,175,206,3 script Gobonge#ml 561,{
+malangdo,175,206,3 script Gobonge#ml 4_CAT_SAILOR5,{
if (checkweight(1201,1) == 0) {
mes "- Can't go next step due to having too many items. -";
close;
@@ -3087,20 +3087,20 @@ OnDisable:
close;
}
-malangdo,181,205,3 script Gobulee#ml1 547,{
+malangdo,181,205,3 script Gobulee#ml1 4_CAT_SAILOR4,{
mes "[Gobulee]";
mes "What a time to show up!";
mes "You should come around when we're healthy.";
close;
}
-malangdo,180,202,3 script Gobyungee#ml1 547,{
+malangdo,180,202,3 script Gobyungee#ml1 4_CAT_SAILOR4,{
mes "[Gobyungee]";
mes "I can't even look another cat in the eye since I'm too sick to be doin' crimes properly.";
close;
}
-malangdo,186,201,3 script Gosigee#ml1 547,{
+malangdo,186,201,3 script Gosigee#ml1 4_CAT_SAILOR4,{
mes "[Gosigee]";
mes "I wish I had some peppy bistmuth pills...";
mes "Meanwhile the Captain only thinks about catching the bad guys and getting revenge!";
@@ -3111,14 +3111,14 @@ malangdo,186,201,3 script Gosigee#ml1 547,{
close;
}
-malangdo,177,202,3 script Gonanee#ml2 547,{
+malangdo,177,202,3 script Gonanee#ml2 4_CAT_SAILOR4,{
mes "[Gonanee]";
mes "We are the only violent gang in Malangdo and we are very proud.";
mes "I don't feel right just lying in bed.";
close;
}
-malangdo,183,202,3 script Godoree#ml3 547,{
+malangdo,183,202,3 script Godoree#ml3 4_CAT_SAILOR4,{
mes "[Godoree]";
mes "I saw unfamiliar cats around";
mes "the dock recently.";
@@ -3128,7 +3128,7 @@ malangdo,183,202,3 script Godoree#ml3 547,{
close;
}
-malangdo,203,116,5 script Suspious Dealer#ml 543,{
+malangdo,203,116,5 script Suspious Dealer#ml 4_MASK_SMOKEY,{
mes "He appears to be listening intently.";
mes "Upon hearing you approach, he pretends to be completely oblivious.";
next;
@@ -3137,7 +3137,7 @@ malangdo,203,116,5 script Suspious Dealer#ml 543,{
close;
}
-malangdo,205,116,3 script Very Suspious Dealer#ml1 543,{
+malangdo,205,116,3 script Very Suspious Dealer#ml1 4_MASK_SMOKEY,{
mes "On listening to the story for";
mes "a while, he pretends to be indifferent once hearing someone's noise.";
next;
@@ -3146,7 +3146,7 @@ malangdo,205,116,3 script Very Suspious Dealer#ml1 543,{
close;
}
-malangdo,197,120,5 script A Foolish Cat#ml 546,{
+malangdo,197,120,5 script A Foolish Cat#ml 4_CAT_SAILOR3,{
mes "[A Foolish Cat]";
mes "If you stay here, you";
mes "can hear all they're saying.";
@@ -3234,7 +3234,7 @@ OnTouch:
end;
}
-malangdo,171,163,3 script Awfully Suspious Dealer 543,{
+malangdo,171,163,3 script Awfully Suspious Dealer 4_MASK_SMOKEY,{
if (malang_bad_guys < 4) {
mes "[Awfully Suspious Dealer]";
mes "We quit selling them, find another merchant!";
@@ -3364,7 +3364,7 @@ malangdo,171,163,3 script Awfully Suspious Dealer 543,{
close;
}
-mal_in02,184,72,3 script Gozangee#ml 547,{
+mal_in02,184,72,3 script Gozangee#ml 4_CAT_SAILOR4,{
mes "[Gozangee]";
mes "I have too much pain in my stomach...";
mes "Should endure myself!";
@@ -3407,7 +3407,7 @@ OnTouch:
end;
}
-malangdo,125,147,3 script Patrol Leader#ml 545,{
+malangdo,125,147,3 script Patrol Leader#ml 4_CAT_SAILOR2,{
if (checkweight(1201,1) == 0) {
mes "- Can't go next step due to having too many items. -";
close;
@@ -3488,7 +3488,7 @@ malangdo,125,147,3 script Patrol Leader#ml 545,{
close;
}
-malangdo,129,146,3 script Crime Prevention Staff 545,{
+malangdo,129,146,3 script Crime Prevention Staff 4_CAT_SAILOR2,{
if (malang_bad_guys > 11) {
mes "[Crime Prevention Staff]";
mes "A work to do means happy things!";
@@ -3511,7 +3511,7 @@ malangdo,129,146,3 script Crime Prevention Staff 545,{
close;
}
-malangdo,3,1,3 script Guidance for quest#ml 543,{
+malangdo,3,1,3 script Guidance for quest#ml 4_MASK_SMOKEY,{
if (callfunc("F_GM_NPC",1854,0) < 1) {
mes "[Helper]";
mes "What is this security code?";
@@ -3560,7 +3560,7 @@ malangdo,3,1,3 script Guidance for quest#ml 543,{
// Clean the Ship :: mal_day_qook
//============================================================
-mal_in02,76,63,7 script Cleanyang 544,{
+mal_in02,76,63,7 script Cleanyang 4_CAT_SAILOR1,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -3945,7 +3945,7 @@ mal_in02,76,63,7 script Cleanyang 544,{
}
}
-mal_in02,29,67,0 script #CaptainRoom3 844,{
+mal_in02,29,67,0 script #CaptainRoom3 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -4024,7 +4024,7 @@ mal_in02,29,67,0 script #CaptainRoom3 844,{
close;
}
-mal_in02,183,49,0 script #MeetingFloor4 844,{
+mal_in02,183,49,0 script #MeetingFloor4 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -4071,7 +4071,7 @@ mal_in02,183,49,0 script #MeetingFloor4 844,{
close;
}
-mal_in02,103,22,0 script #MalBed5 844,{
+mal_in02,103,22,0 script #MalBed5 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -4116,7 +4116,7 @@ mal_in02,103,22,0 script #MalBed5 844,{
close;
}
-malangdo,141,178,0 script #Darkweed6 844,{
+malangdo,141,178,0 script #Darkweed6 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -4153,7 +4153,7 @@ malangdo,141,178,0 script #Darkweed6 844,{
close;
}
-malangdo,133,134,0 script Strange Pile of Sand#7 557,{
+malangdo,133,134,0 script Strange Pile of Sand#7 4_SOIL,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -4195,9 +4195,9 @@ malangdo,133,134,0 script Strange Pile of Sand#7 557,{
mes "- That's it... -";
close;
}
-malangdo,197,237,0 duplicate(Strange Pile of Sand#7) Strange Pile of Sand#12 557
+malangdo,197,237,0 duplicate(Strange Pile of Sand#7) Strange Pile of Sand#12 4_SOIL
-malangdo,232,131,0 script #UnderStairs8 844,{
+malangdo,232,131,0 script #UnderStairs8 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -4231,7 +4231,7 @@ malangdo,232,131,0 script #UnderStairs8 844,{
close;
}
-mal_in01,74,20,0 script #CornerTower9 844,{
+mal_in01,74,20,0 script #CornerTower9 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -4262,7 +4262,7 @@ mal_in01,74,20,0 script #CornerTower9 844,{
close;
}
-mal_in01,159,225,0 script #CornerLocker10 844,{
+mal_in01,159,225,0 script #CornerLocker10 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -4293,7 +4293,7 @@ mal_in01,159,225,0 script #CornerLocker10 844,{
close;
}
-mal_in01,24,72,0 script #FootholdTower11 844,{
+mal_in01,24,72,0 script #FootholdTower11 CLEAR_NPC,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -4327,7 +4327,7 @@ mal_in01,24,72,0 script #FootholdTower11 844,{
// Help Chef Nyas :: mal_day_qook
//============================================================
-mal_in02,187,58,3 script Chef Nyas 548,{
+mal_in02,187,58,3 script Chef Nyas 4_CAT_CHEF,{
if (checkweight(1201,1) == 0) {
mes "- You have too many items so you can't continue the quest. -";
close;
@@ -4642,7 +4642,7 @@ mal_in02,187,58,3 script Chef Nyas 548,{
// Play with Baby Cats :: mal_nyadventurer
//============================================================
-malangdo,165,223,4 script Expert Cat#nya_01 561,{
+malangdo,165,223,4 script Expert Cat#nya_01 4_CAT_SAILOR5,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 4000) {
mes "- You have too many items to proceed in this quest. -";
close;
@@ -4802,7 +4802,7 @@ malangdo,165,223,4 script Expert Cat#nya_01 561,{
}
}
-malangdo,211,203,4 script [Meow Team] Charo#nya_11 560,{
+malangdo,211,203,4 script [Meow Team] Charo#nya_11 4_CAT_ADV2,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 4000) {
mes "- You have too many items to proceed in this quest. -";
close;
@@ -5156,7 +5156,7 @@ malangdo,211,203,4 script [Meow Team] Charo#nya_11 560,{
}
}
-malangdo,214,204,3 script [Meow Team] Rosy#nya_09 559,{
+malangdo,214,204,3 script [Meow Team] Rosy#nya_09 4_CAT_ADV1,{
if (nyadven < 2) {
mes "A young cat with white fur tries so hard with the weird machine.";
mes "The machine might be broken.";
@@ -5201,7 +5201,7 @@ malangdo,214,204,3 script [Meow Team] Rosy#nya_09 559,{
}
}
-malangdo,215,201,3 script [Meow Team] Roku#nya_10 553,{
+malangdo,215,201,3 script [Meow Team] Roku#nya_10 4_CAT_DOWN,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 4000) {
mes "- You have too many items to proceed in this quest. -";
close;
@@ -5384,7 +5384,7 @@ malangdo,215,201,3 script [Meow Team] Roku#nya_10 553,{
}
}
-malangdo,212,204,0 script Beginning Compass#nya_02 844,{
+malangdo,212,204,0 script Beginning Compass#nya_02 CLEAR_NPC,{
if (countitem(6428) == 0) {
mes "There is a strange machine.";
mes "The kids said this was the ride called Duruduru compass of the Meow Bravery Team.";
@@ -5576,13 +5576,13 @@ L_Viewpoint:
}
close;
}
-malangdo,213,89,0 duplicate(#malangdo_compass) Red Flame Compass#1 844
-malangdo,128,103,0 duplicate(#malangdo_compass) Blue Flame Compass#2 844
-malangdo,73,253,0 duplicate(#malangdo_compass) Gold Flame Compass#3 844
-malangdo,153,146,0 duplicate(#malangdo_compass) Forest Compass#4 844
-malangdo,111,178,0 duplicate(#malangdo_compass) Cloud Compass#5 844
+malangdo,213,89,0 duplicate(#malangdo_compass) Red Flame Compass#1 CLEAR_NPC
+malangdo,128,103,0 duplicate(#malangdo_compass) Blue Flame Compass#2 CLEAR_NPC
+malangdo,73,253,0 duplicate(#malangdo_compass) Gold Flame Compass#3 CLEAR_NPC
+malangdo,153,146,0 duplicate(#malangdo_compass) Forest Compass#4 CLEAR_NPC
+malangdo,111,178,0 duplicate(#malangdo_compass) Cloud Compass#5 CLEAR_NPC
-malangdo,175,163,0 script Meowbell#nya_12 844,{
+malangdo,175,163,0 script Meowbell#nya_12 CLEAR_NPC,{
if (countitem(6428) == 0) {
mes "There is a fancy bell which doesn't fit in with the ship.";
mes "This bell is used in a game by the Meow Bravery Team.";
@@ -5657,7 +5657,7 @@ malangdo,175,163,0 script Meowbell#nya_12 844,{
}
}
-malangdo,176,165,3 script Deckhand Bubi#nya_16 544,{
+malangdo,176,165,3 script Deckhand Bubi#nya_16 4_CAT_SAILOR1,{
mes "[Bubi]";
mes "Hey, human adventurer, what are you here for?";
mes "Yeah~ this is a beautiful view.";
@@ -5673,7 +5673,7 @@ malangdo,176,165,3 script Deckhand Bubi#nya_16 544,{
close;
}
-malangdo,172,178,7 script Cat Detective#nya_14 560,{
+malangdo,172,178,7 script Cat Detective#nya_14 4_CAT_ADV2,{
cutin "mal_homnya_n",2;
if (nyadven < 6) {
mes "[Cat Detective]";
@@ -6077,7 +6077,7 @@ malangdo,172,178,7 script Cat Detective#nya_14 560,{
end;
}
-malangdo,173,177,7 script Friend of Detective#mal 559,{
+malangdo,173,177,7 script Friend of Detective#mal 4_CAT_ADV1,{
cutin "mal_homnya_n",2;
mes "[Nyangson]";
mes "I am a friend of Detective Homnya, Nyangson.";
@@ -6091,7 +6091,7 @@ malangdo,173,177,7 script Friend of Detective#mal 559,{
end;
}
-malangdo,174,175,0 script Noisy Machine#nya_13 844,{
+malangdo,174,175,0 script Noisy Machine#nya_13 CLEAR_NPC,{
if (nyadven < 7) {
mes "There is a strange machine.";
mes "It has a Red, Blue, Yellow, and Green luminous body with buttons to react,";
@@ -6329,7 +6329,7 @@ function script F_Mal_Picture {
}
}
-mal_in02,187,45,0 script Box#nya01 844,{
+mal_in02,187,45,0 script Box#nya01 CLEAR_NPC,{
switch(callfunc(
"F_Mal_Picture",
7251,1,
@@ -6355,7 +6355,7 @@ mal_in02,187,45,0 script Box#nya01 844,{
}
}
-mal_in02,170,75,0 script Book#nya02 844,{
+mal_in02,170,75,0 script Book#nya02 CLEAR_NPC,{
switch(callfunc(
"F_Mal_Picture",
7252,1,
@@ -6380,7 +6380,7 @@ mal_in02,170,75,0 script Book#nya02 844,{
}
}
-mal_in02,133,98,0 script Dirty Bed#nya03 844,{
+mal_in02,133,98,0 script Dirty Bed#nya03 CLEAR_NPC,{
switch(callfunc(
"F_Mal_Picture",
7253,1,
@@ -6407,7 +6407,7 @@ mal_in02,133,98,0 script Dirty Bed#nya03 844,{
}
}
-mal_in02,31,57,0 script Seashell#nya04 844,{
+mal_in02,31,57,0 script Seashell#nya04 CLEAR_NPC,{
switch(callfunc(
"F_Mal_Picture",
7254,0,
@@ -6424,7 +6424,7 @@ mal_in02,31,57,0 script Seashell#nya04 844,{
}
}
-mal_in02,114,56,0 script Ship Pillar#nya05 844,{
+mal_in02,114,56,0 script Ship Pillar#nya05 CLEAR_NPC,{
switch(callfunc(
"F_Mal_Picture",
7255,1,
@@ -6450,7 +6450,7 @@ mal_in02,114,56,0 script Ship Pillar#nya05 844,{
}
}
-mal_in02,139,30,0 script Ventilation Window#nya06 844,{
+mal_in02,139,30,0 script Ventilation Window#nya06 CLEAR_NPC,{
switch(callfunc(
"F_Mal_Picture",
7256,0,
@@ -6471,7 +6471,7 @@ mal_in02,139,30,0 script Ventilation Window#nya06 844,{
}
}
-mal_in02,166,74,4 script Neat Crew#nyaong01 555,{
+mal_in02,166,74,4 script Neat Crew#nyaong01 4_CAT_3COLOR,{
mes "[Neat Crew]";
mes "Please clean up your stuff by yourself.";
mes "Especially you guys getting dirty after we came to this island!";
@@ -6488,7 +6488,7 @@ mal_in02,166,74,4 script Neat Crew#nyaong01 555,{
close;
}
-mal_in02,132,95,5 script Scary Crew#nyaong02 561,{
+mal_in02,132,95,5 script Scary Crew#nyaong02 4_CAT_SAILOR5,{
mes "[Scary Crew]";
mes "I try to be nice these days, and kids just take liberties with me.";
mes "Will you too?";
@@ -6499,7 +6499,7 @@ mal_in02,132,95,5 script Scary Crew#nyaong02 561,{
close;
}
-mal_in02,109,62,4 script Picky Crew#nyaong03 545,{
+mal_in02,109,62,4 script Picky Crew#nyaong03 4_CAT_SAILOR2,{
mes "[Picky Crew]";
mes "Do not run in the hall!";
mes "My fur falls out because of someone who";
@@ -6509,7 +6509,7 @@ mal_in02,109,62,4 script Picky Crew#nyaong03 545,{
// Cat Gamers :: mal_gamer
//============================================================
-mal_in01,31,210,2 script Cat Gamers Director 549,{
+mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -7303,7 +7303,7 @@ L_CompleteQuest:
close;
}
-malangdo,127,111,4 script Strange Cat#gamer 547,{
+malangdo,127,111,4 script Strange Cat#gamer 4_CAT_SAILOR4,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -7595,7 +7595,7 @@ malangdo,127,111,4 script Strange Cat#gamer 547,{
}
}
-malangdo,161,197,4 script Eryu#gamer 876,{
+malangdo,161,197,4 script Eryu#gamer 4_CAT,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -7811,7 +7811,7 @@ OnDisable:
end;
}
-malangdo,230,197,4 script Stew#gamer 555,{
+malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -8040,7 +8040,7 @@ OnDisable:
end;
}
-malangdo,244,144,4 script Ketchup#gamer 546,{
+malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -8229,7 +8229,7 @@ OnDisable:
end;
}
-malangdo,181,119,7 script Eff#gamer 560,{
+malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -8490,7 +8490,7 @@ OnDisable:
end;
}
-mal_in01,91,216,4 script Ser#gamer 544,{
+mal_in01,91,216,4 script Ser#gamer 4_CAT_SAILOR1,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -8834,7 +8834,7 @@ mal_in01,91,216,4 script Ser#gamer 544,{
}
}
-mal_in01,86,222,4 script Paa#gamer 544,{
+mal_in01,86,222,4 script Paa#gamer 4_CAT_SAILOR1,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -9164,7 +9164,7 @@ mal_in01,86,222,4 script Paa#gamer 544,{
}
}
-mal_in01,91,222,4 script Kuka#gamer 422,{
+mal_in01,91,222,4 script Kuka#gamer 4_M_BABYCAT,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -9486,7 +9486,7 @@ mal_in01,91,222,4 script Kuka#gamer 422,{
}
}
-mal_in01,134,221,4 script KungKung#gamer 422,{
+mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -9904,7 +9904,7 @@ mal_in01,134,221,4 script KungKung#gamer 422,{
end;
}
-mal_in01,133,214,6 script Leader#gamer 546,{
+mal_in01,133,214,6 script Leader#gamer 4_CAT_SAILOR3,{
if (MaxWeight - Weight < 1000) {
mes "Your inventory is too heavy to proceed. Come back after lightening your load.";
close;
@@ -10277,7 +10277,7 @@ mal_in01,133,214,6 script Leader#gamer 546,{
close;
}
-mal_in01,136,216,2 script Seichi#gamer 553,{
+mal_in01,136,216,2 script Seichi#gamer 4_CAT_DOWN,{
if (malang_gamer == 20) {
mes "[Seichi]";
mes "Ah~ I'm hungry. Any rats wandering around?";
@@ -10301,7 +10301,7 @@ mal_in01,136,216,2 script Seichi#gamer 553,{
end;
}
-mal_in01,136,215,2 script Row#gamer 559,{
+mal_in01,136,215,2 script Row#gamer 4_CAT_ADV1,{
if (malang_gamer == 20) {
mes "[Row]";
mes "Hut! Human, you came to see me, Row the Great? What? No?";
@@ -10324,7 +10324,7 @@ mal_in01,136,215,2 script Row#gamer 559,{
end;
}
-mal_in01,136,214,2 script Debong#gamer 876,{
+mal_in01,136,214,2 script Debong#gamer 4_CAT,{
if (malang_gamer == 20) {
mes "[Debong]";
mes "Hair picking is my best hobby meow.";
@@ -10344,7 +10344,7 @@ mal_in01,136,214,2 script Debong#gamer 876,{
end;
}
-mal_in01,136,213,2 script Libs#gamer 421,{
+mal_in01,136,213,2 script Libs#gamer 4_M_BOSSCAT,{
if (malang_gamer == 20) {
mes "[Libs]";
mes "Arrgg!! Why should I play this stupid flag waving game here?";
@@ -10375,7 +10375,7 @@ mal_in01,136,213,2 script Libs#gamer 421,{
end;
}
-mal_in01,136,212,2 script YongYong#gamer 554,{
+mal_in01,136,212,2 script YongYong#gamer 4_CAT_REST,{
if (malang_gamer == 20) {
mes "[YongYong]";
mes "Meow~ I'm annoyed meow~";
@@ -10406,7 +10406,7 @@ mal_in01,136,212,2 script YongYong#gamer 554,{
end;
}
-malangdo,120,140,7 script Sign#Cat G Entrance 858,{
+malangdo,120,140,7 script Sign#Cat G Entrance 4_BULLETIN_BOARD2,{
mes "A small sign.";
next;
mes "[Cat Gamers Headquarters]";
@@ -10416,7 +10416,7 @@ malangdo,120,140,7 script Sign#Cat G Entrance 858,{
close;
}
-mal_in01,15,221,6 script Sign#Cat G 1F 858,{
+mal_in01,15,221,6 script Sign#Cat G 1F 4_BULLETIN_BOARD2,{
mes "[Cat Gamers Headquarters 1F]";
mes "- ~ B 1 ~ -";
mes "Rock Paper Scissors practice room";
@@ -10424,7 +10424,7 @@ mal_in01,15,221,6 script Sign#Cat G 1F 858,{
close;
}
-mal_in01,77,214,4 script Sign#Cat G B1 858,{
+mal_in01,77,214,4 script Sign#Cat G B1 4_BULLETIN_BOARD2,{
mes "[Cat Gamers Headquarters B1]";
mes "- ~ 1 F ~ -";
mes "Consult with the director...";
@@ -10435,7 +10435,7 @@ mal_in01,77,214,4 script Sign#Cat G B1 858,{
close;
}
-mal_in01,142,220,6 script Sign#Cat G B2 858,{
+mal_in01,142,220,6 script Sign#Cat G B2 4_BULLETIN_BOARD2,{
mes "[Cat Gamers Headquarters B2]";
mes "- ~ B 1 ~ -";
mes "Rock Paper Scissors practice room";
@@ -10443,7 +10443,7 @@ mal_in01,142,220,6 script Sign#Cat G B2 858,{
close;
}
-mal_in01,155,222,2 script Uneet#gamer 890,{
+mal_in01,155,222,2 script Uneet#gamer 4_LAM,{
set .@playtime, checkquest(5069,PLAYTIME);
if (.@playtime == 0 || .@playtime == 1) {
mes "[Uneet]";
@@ -10482,7 +10482,7 @@ mal_in01,155,222,2 script Uneet#gamer 890,{
end;
}
-mal_in01,30,222,4 script Interview Cat#gamer 560,{
+mal_in01,30,222,4 script Interview Cat#gamer 4_CAT_ADV2,{
mes "[Interview Cat]";
mes "I want join 'Cat Gamers'.";
mes "But it seems the Cat Gamers Director is busy now. Should I just leave?";
@@ -10492,7 +10492,7 @@ mal_in01,30,222,4 script Interview Cat#gamer 560,{
close;
}
-mal_in01,19,213,1 script Waiting Cat#gamer 555,{
+mal_in01,19,213,1 script Waiting Cat#gamer 4_CAT_3COLOR,{
mes "[Waiting Cat]";
mes "Why did someone put that vase inside of a glass?";
mes "The Cat Gamers Director did that?";
@@ -10505,14 +10505,14 @@ mal_in01,19,213,1 script Waiting Cat#gamer 555,{
// Archangel Wing Enchants :: enc_angel
//============================================================
-malangdo,234,153,6 script Notice Board#mal 837,{
+malangdo,234,153,6 script Notice Board#mal 2_BULLETIN_BOARD,{
mes "^0000FFThere's a hastily written message on this bulletin board.^000000";
next;
mes "A fallen angel within will unlock a hidden enchantment to Archangel Wings.";
close;
}
-mal_in01,15,16,3 script Fallen Angel#mal 403,{
+mal_in01,15,16,3 script Fallen Angel#mal 4_F_VALKYRIE2,{
disable_items;
if (checkweight(1201,1) == 0) {
mes "You are carrying too many items, please reduce them and come back!";
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index 177638895..3487871b4 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -24,7 +24,7 @@
// Cautious Village & Daily Quests :: hi_malaya
//============================================================
-malaya,266,76,3 script Rodel the Guard#malaya 570,4,4,{
+malaya,266,76,3 script Rodel the Guard#malaya 4_MAL_SOLDIER,4,4,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -186,7 +186,7 @@ OnInit:
end;
}
-malaya,185,358,3 script Leader Phong in Mumbaki 580,{
+malaya,185,358,3 script Leader Phong in Mumbaki 4_BARYO_CHIEF,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -523,7 +523,7 @@ malaya,185,358,3 script Leader Phong in Mumbaki 580,{
}
}
-malaya,169,350,5 script Imelda#malaya 475,{
+malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -900,7 +900,7 @@ malaya,169,350,5 script Imelda#malaya 475,{
end;
}
-malaya,181,353,5 script Old Man Nardo#malaya 574,{
+malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -1167,7 +1167,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 574,{
end;
}
-malaya,224,267,3 script Romel#malaya 573,{
+malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{
if (malaya_hi < 10) {
mes "[Romel]";
mes ".........";
@@ -1323,7 +1323,7 @@ malaya,224,267,3 script Romel#malaya 573,{
end;
}
-malaya,223,267,5 script Talah#malaya 941,{
+malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{
if (malaya_hi < 10) {
mes "[Talah]";
mes "..........gasp!";
@@ -1454,7 +1454,7 @@ malaya,223,267,5 script Talah#malaya 941,{
end;
}
-malaya,62,274,0 script Sand Trap#malaya 557,{
+malaya,62,274,0 script Sand Trap#malaya 4_SOIL,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -1485,10 +1485,10 @@ OnTimer30000:
stopnpctimer;
end;
}
-malaya,66,277,0 duplicate(Sand Trap#malaya) Sand Trap#malaya01 557
-malaya,70,282,0 duplicate(Sand Trap#malaya) Sand Trap#malaya02 557
+malaya,66,277,0 duplicate(Sand Trap#malaya) Sand Trap#malaya01 4_SOIL
+malaya,70,282,0 duplicate(Sand Trap#malaya) Sand Trap#malaya02 4_SOIL
-ma_fild01,178,206,0 script Black Bamboo#malaya 844,4,4,{
+ma_fild01,178,206,0 script Black Bamboo#malaya CLEAR_NPC,4,4,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -1521,13 +1521,13 @@ OnTimer30000:
stopnpctimer;
end;
}
-ma_fild01,225,186,0 duplicate(Black Bamboo#malaya) Black Bamboo#malaya01 844,4,4
-ma_fild01,230,244,0 duplicate(Black Bamboo#malaya) Black Bamboo#malaya02 844,4,4
-ma_fild01,174,238,0 duplicate(Black Bamboo#malaya) Black Bamboo#malaya03 844,4,4
-ma_fild01,180,273,0 duplicate(Black Bamboo#malaya) Black Bamboo#malaya04 844,4,4
-ma_fild01,179,145,0 duplicate(Black Bamboo#malaya) Black Bamboo#malaya05 844,4,4
+ma_fild01,225,186,0 duplicate(Black Bamboo#malaya) Black Bamboo#malaya01 CLEAR_NPC,4,4
+ma_fild01,230,244,0 duplicate(Black Bamboo#malaya) Black Bamboo#malaya02 CLEAR_NPC,4,4
+ma_fild01,174,238,0 duplicate(Black Bamboo#malaya) Black Bamboo#malaya03 CLEAR_NPC,4,4
+ma_fild01,180,273,0 duplicate(Black Bamboo#malaya) Black Bamboo#malaya04 CLEAR_NPC,4,4
+ma_fild01,179,145,0 duplicate(Black Bamboo#malaya) Black Bamboo#malaya05 CLEAR_NPC,4,4
-malaya,295,171,3 script Collection Dealer Woeon 582,{
+malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -1765,7 +1765,7 @@ malaya,295,171,3 script Collection Dealer Woeon 582,{
end;
}
-malaya,119,217,3 script Blacksmith Pandoi 538,{
+malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -2112,7 +2112,7 @@ malaya,119,217,3 script Blacksmith Pandoi 538,{
end;
}
-malaya,326,68,2 script Pedro the Sailor 100,{
+malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -2720,7 +2720,7 @@ OnTouch:
end;
}
-ma_fild01,261,208,2 script Kiko in Mumbaki 580,{
+ma_fild01,261,208,2 script Kiko in Mumbaki 4_BARYO_CHIEF,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -2831,7 +2831,7 @@ ma_fild01,261,208,2 script Kiko in Mumbaki 580,{
end;
}
-ma_fild01,239,253,3 script Dhong the Guard 570,{
+ma_fild01,239,253,3 script Dhong the Guard 4_MAL_SOLDIER,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -2970,7 +2970,7 @@ ma_fild01,239,253,3 script Dhong the Guard 570,{
end;
}
-ma_fild01,238,257,2 script Guard Dog Vantai 972,{
+ma_fild01,238,257,2 script Guard Dog Vantai 4_RUS_DWOLF,{
mes "[Vantai]";
mes "Grrrrrrr...";
mes " ";
@@ -2978,7 +2978,7 @@ ma_fild01,238,257,2 script Guard Dog Vantai 972,{
close;
}
-ma_fild01,200,190,3 script Maries#malaya 579,{
+ma_fild01,200,190,3 script Maries#malaya 4_F_BARYO_WOMAN,{
if (MaxWeight - Weight < 1000 || checkweight(1201,1) == 0) {
mes "- Cannot proceed with the quest. You are carrying too many items. -";
close;
@@ -3086,7 +3086,7 @@ ma_fild01,200,190,3 script Maries#malaya 579,{
end;
}
-ma_fild01,203,189,3 script Little Girl#malaya 576,{
+ma_fild01,203,189,3 script Little Girl#malaya 4_F_BARYO_GIRL,{
mes "[Little Girl]";
mes "He he, the forest is scary, but it's so much fun so I go there often to play~";
mes "Strange, how we always get lost.";
@@ -3097,7 +3097,7 @@ ma_fild01,203,189,3 script Little Girl#malaya 576,{
close;
}
-ma_fild01,251,93,3 script Lost Child#malaya01 576,{
+ma_fild01,251,93,3 script Lost Child#malaya01 4_F_BARYO_GIRL,{
if (checkquest(7388) > -1) {
if (!countitem(12700)) {
mes "[Little Kid]";
@@ -3169,10 +3169,10 @@ OnInit:
if (strnpcinfo(0) != "Lost Child#malaya01")
disablenpc strnpcinfo(0);
}
-ma_fild01,114,141,3 duplicate(Lost Child#malaya01) Lost Child#malaya02 576
-ma_fild01,130,314,3 duplicate(Lost Child#malaya01) Lost Child#malaya03 576
+ma_fild01,114,141,3 duplicate(Lost Child#malaya01) Lost Child#malaya02 4_F_BARYO_GIRL
+ma_fild01,130,314,3 duplicate(Lost Child#malaya01) Lost Child#malaya03 4_F_BARYO_GIRL
-ma_fild02,241,39,5 script Good Capre Budidai 572,{
+ma_fild02,241,39,5 script Good Capre Budidai 4_MAL_BUDIDAI,{
mes "[Budidai]";
mes "Hey hey hey~";
mes "I am such a nice Capre~ Hey!";
@@ -3338,7 +3338,7 @@ ma_fild02,241,39,5 script Good Capre Budidai 572,{
// Traders :: malaya_npc
//============================================================
-ma_fild01,166,214,6 script Old Man in Dilemma#GA 575,{
+ma_fild01,166,214,6 script Old Man in Dilemma#GA 4_F_BARYO_OLD,{
if (MaxWeight - Weight < 600 || checkweight(1201,1) == 0) {
mes "Cannot proceed because you have too many items in your possession.";
close;
@@ -3412,7 +3412,7 @@ ma_fild01,166,214,6 script Old Man in Dilemma#GA 575,{
}
}
-ma_fild01,238,198,4 script Tikbalang Expert#malaya 582,{
+ma_fild01,238,198,4 script Tikbalang Expert#malaya 4_M_MALAYA,{
if (MaxWeight - Weight < 50 || checkweight(1201,1) == 0) {
mes "Cannot proceed because you have too many items in your possession.";
close;
@@ -3599,7 +3599,7 @@ ma_fild01,238,198,4 script Tikbalang Expert#malaya 582,{
// Upgrade Boss Equipment :: malaya_mvpitem
//============================================================
-ma_fild01,158,243,6 script Tribe Blacksmith#malaya 582,{
+ma_fild01,158,243,6 script Tribe Blacksmith#malaya 4_M_MALAYA,{
mes "[Bayani]";
mes "I will upgrade your armor if you bring one that holds enormous power.";
next;
@@ -3829,7 +3829,7 @@ ma_fild01,158,243,6 script Tribe Blacksmith#malaya 582,{
// Secret in the Woods :: malaya_buwaya
//============================================================
-malaya,305,281,3 script Guard#buwaya 570,7,7,{
+malaya,305,281,3 script Guard#buwaya 4_MAL_SOLDIER,7,7,{
if (malaya_hi < 10) {
mes "- From the wary looks on the guard's face, it is obvious he is at alert at the sight of you. He won't intimidate you but seems he won't even deal with you either. -";
next;
@@ -3889,7 +3889,7 @@ OnTouch:
}
end;
}
-malaya,276,288,5 script Port Malaya Villager::buwaya_A 582,{
+malaya,276,288,5 script Port Malaya Villager::buwaya_A 4_M_MALAYA,{
if (malaya_hi < 20) {
mes "- Look at you warily while whispering to each other. -";
close;
@@ -3989,10 +3989,10 @@ malaya,276,288,5 script Port Malaya Villager::buwaya_A 582,{
close;
}
}
-malaya,278,288,3 duplicate(buwaya_A) Port Malaya Villager::buwaya_B 583
-malaya,276,286,7 duplicate(buwaya_A) Port Malaya Villager::buwaya_C 582
+malaya,278,288,3 duplicate(buwaya_A) Port Malaya Villager::buwaya_B 4_F_MALAYA
+malaya,276,286,7 duplicate(buwaya_A) Port Malaya Villager::buwaya_C 4_M_MALAYA
-ma_in01,47,101,3 script Totoy#buwaya 577,7,7,{
+ma_in01,47,101,3 script Totoy#buwaya 4_M_BARYO_BOY,7,7,{
if ((malaya_hi < 20) || (malaya_buwaya < 2)) {
mes "- See someone shaky with dopey eyes. -";
close;
@@ -4277,14 +4277,14 @@ OnTouch:
end;
}
-ma_in01,43,101,7 script Dog#buwaya_totoi 81,{
+ma_in01,43,101,7 script Dog#buwaya_totoi 4_DOG01,{
end;
OnInit:
disablenpc "Dog#buwaya_totoi";
end;
}
-ma_in01,44,105,3 script Drawer#buwaya 844,{
+ma_in01,44,105,3 script Drawer#buwaya CLEAR_NPC,{
if (malaya_buwaya == 3) {
mes "- You look for the Green Potion in Totoys drawer. -";
next;
@@ -4303,7 +4303,7 @@ ma_in01,44,105,3 script Drawer#buwaya 844,{
end;
}
-malaya,290,152,5 script Master of Hunting#buwaya 578,{
+malaya,290,152,5 script Master of Hunting#buwaya 4_M_BARYO_MAN,{
if ((malaya_hi < 20) || (malaya_buwaya < 5)) {
mes "[Master of Hunting]";
mes "Oh! Ho! Ho!";
@@ -4447,7 +4447,7 @@ malaya,290,152,5 script Master of Hunting#buwaya 578,{
}
}
-malaya,291,152,3 script #buwaya_soil 557,{
+malaya,291,152,3 script #buwaya_soil 4_SOIL,{
if (malaya_buwaya == 9) {
mes "- Rummaging, fumbling. -";
next;
@@ -4551,15 +4551,15 @@ OnTimer20000:
stopnpctimer;
end;
}
-ma_fild02,155,235,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_1 557
-ma_fild02,143,142,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_2 557
-ma_fild02,266,155,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_3 557
-ma_fild02,221,91,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_4 557
-ma_fild02,205,85,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_5 557
-ma_fild02,300,98,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_6 557
-ma_fild02,100,275,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_7 557
+ma_fild02,155,235,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_1 4_SOIL
+ma_fild02,143,142,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_2 4_SOIL
+ma_fild02,266,155,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_3 4_SOIL
+ma_fild02,221,91,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_4 4_SOIL
+ma_fild02,205,85,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_5 4_SOIL
+ma_fild02,300,98,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_6 4_SOIL
+ma_fild02,100,275,3 duplicate(Unknown Trace#buwaya) Unknown Trace#buwaya_7 4_SOIL
-malaya,290,340,3 script Guard Leader#buwaya 571,{
+malaya,290,340,3 script Guard Leader#buwaya 4_MAL_CAPTAIN,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) {
mes "- Wait!! -";
mes "- You have too many items on you. -";
@@ -4709,7 +4709,7 @@ malaya,290,340,3 script Guard Leader#buwaya 571,{
close;
}
-ma_fild02,307,245,0 script #buwaya_todog1 139,3,3,{
+ma_fild02,307,245,0 script #buwaya_todog1 HIDDEN_WARP_NPC,3,3,{
end;
OnTouch:
if (malaya_buwaya == 11) {
@@ -4720,10 +4720,10 @@ OnTouch:
}
end;
}
-ma_fild02,320,241,0 duplicate(#buwaya_todog1) #buwaya_todog2 139,3,3
-ma_fild02,317,250,0 duplicate(#buwaya_todog1) #buwaya_todog3 139,7,7
+ma_fild02,320,241,0 duplicate(#buwaya_todog1) #buwaya_todog2 HIDDEN_WARP_NPC,3,3
+ma_fild02,317,250,0 duplicate(#buwaya_todog1) #buwaya_todog3 HIDDEN_WARP_NPC,7,7
-ma_fild02,312,259,3 script Dog#buwaya 81,{
+ma_fild02,312,259,3 script Dog#buwaya 4_DOG01,{
if (malaya_buwaya == 11) {
mes "[Dog]";
mes "Bark bark!!";
@@ -4797,7 +4797,7 @@ OnInit:
end;
}
-ma_fild02,308,262,3 script Guard#buwayacave 570,{
+ma_fild02,308,262,3 script Guard#buwayacave 4_MAL_SOLDIER,{
end;
OnInit:
disablenpc "Guard#buwayacave";
@@ -4806,7 +4806,7 @@ OnInit:
// Bakonawa Extermination :: malaya_bakonawa
//============================================================
-malaya,280,331,4 script Singing Man#bako1 578,{
+malaya,280,331,4 script Singing Man#bako1 4_M_BARYO_MAN,{
if (malaya_bakona1 < 5) {
mes "[Singing Man]";
mes "Story of dragon that lives at a lake~";
@@ -4860,7 +4860,7 @@ malaya,280,331,4 script Singing Man#bako1 578,{
}
}
-malaya,275,333,5 script Singing Woman#bako1 579,{
+malaya,275,333,5 script Singing Woman#bako1 4_F_BARYO_WOMAN,{
if (malaya_bakona1 < 5) {
mes "[Singing Woman]";
mes "Bakonawa that live at a lake,";
@@ -4903,7 +4903,7 @@ malaya,275,333,5 script Singing Woman#bako1 579,{
}
}
-malaya,290,329,4 script Frightened Boy#bako1 577,{
+malaya,290,329,4 script Frightened Boy#bako1 4_M_BARYO_BOY,{
if (malaya_hi < 20) {
mes "- He seems cautious of you. -";
close;
@@ -4924,7 +4924,7 @@ malaya,290,329,4 script Frightened Boy#bako1 577,{
}
}
-malaya,264,338,4 script Frightened Maiden#bako1 576,{
+malaya,264,338,4 script Frightened Maiden#bako1 4_F_BARYO_GIRL,{
if (malaya_hi < 20) {
mes "- She seems cautious of you. -";
close;
@@ -4975,7 +4975,7 @@ malaya,264,338,4 script Frightened Maiden#bako1 576,{
}
}
-malaya,272,339,5 script Old Fortune Teller#bako1 575,{
+malaya,272,339,5 script Old Fortune Teller#bako1 4_F_BARYO_OLD,{
if (malaya_hi < 20) {
mes "- Old Fortune Teller seems cautious of you. -";
close;
@@ -5008,7 +5008,7 @@ malaya,272,339,5 script Old Fortune Teller#bako1 575,{
}
}
-malaya,285,332,4 script Old Legend Teller#bako1 574,{
+malaya,285,332,4 script Old Legend Teller#bako1 4_M_BARYO_OLD,{
if (checkweight(1301,3) == 0) {
mes "You cannot start the conversation. You are carrying too many items. -";
close;
@@ -5246,7 +5246,7 @@ malaya,285,332,4 script Old Legend Teller#bako1 574,{
}
}
-ma_fild02,40,240,4 script Malaya Immigrant#bako1 578,{
+ma_fild02,40,240,4 script Malaya Immigrant#bako1 4_M_BARYO_MAN,{
if (malaya_bakona1 < 3) {
mes "[Malaya Immigrant]";
mes "You must have a brave heart";
@@ -5357,7 +5357,7 @@ ma_fild02,40,240,4 script Malaya Immigrant#bako1 578,{
}
}
-ma_fild01,165,237,4 script Malaya Immigrant#bako2 582,{
+ma_fild01,165,237,4 script Malaya Immigrant#bako2 4_M_MALAYA,{
if (malaya_bakona1 < 4) {
mes "[Malaya Immigrant]";
mes "Have you been to";
@@ -5468,7 +5468,7 @@ ma_fild01,165,237,4 script Malaya Immigrant#bako2 582,{
}
}
-ma_fild01,171,235,0 script #bako1 139,2,2,{
+ma_fild01,171,235,0 script #bako1 HIDDEN_WARP_NPC,2,2,{
end;
OnTouch:
if (malaya_bakona1 == 5) {
@@ -5542,7 +5542,7 @@ L_Record:
return;
}
-malaya,304,100,4 script Old Man's Granddaughter 576,{
+malaya,304,100,4 script Old Man's Granddaughter 4_F_BARYO_GIRL,{
if (malaya_hi < 20) {
mes "- He seems cautious of you. -";
close;
@@ -5585,7 +5585,7 @@ malaya,304,100,4 script Old Man's Granddaughter 576,{
}
}
-malaya,286,269,4 script Angry Man#bako2 578,{
+malaya,286,269,4 script Angry Man#bako2 4_M_BARYO_MAN,{
if (malaya_hi < 20) {
mes "- He seems cautious of you. -";
close;
@@ -5598,7 +5598,7 @@ malaya,286,269,4 script Angry Man#bako2 578,{
close;
}
-malaya,276,269,5 script Calm Woman#bako2 579,{
+malaya,276,269,5 script Calm Woman#bako2 4_F_BARYO_WOMAN,{
if (malaya_hi < 20) {
mes "- He seems cautious of you. -";
close;
@@ -5611,7 +5611,7 @@ malaya,276,269,5 script Calm Woman#bako2 579,{
close;
}
-malaya,276,262,4 script Angry Boy#bako2 577,{
+malaya,276,262,4 script Angry Boy#bako2 4_M_BARYO_BOY,{
if (malaya_hi < 20) {
mes "- He seems cautious of you. -";
close;
@@ -5623,7 +5623,7 @@ malaya,276,262,4 script Angry Boy#bako2 577,{
close;
}
-malaya,283,265,4 script Village Chief#bako2 580,{
+malaya,283,265,4 script Village Chief#bako2 4_BARYO_CHIEF,{
if (checkweight(1301,3) == 0) {
mes "You cannot start the conversation. You are carrying too many items. -";
close;
@@ -5868,7 +5868,7 @@ malaya,283,265,4 script Village Chief#bako2 580,{
}
}
-malaya,269,267,5 script Missing Person's Father 582,{
+malaya,269,267,5 script Missing Person's Father 4_M_MALAYA,{
if (malaya_hi < 20) {
mes "- He seems cautious of you. -";
close;
@@ -5919,7 +5919,7 @@ malaya,269,267,5 script Missing Person's Father 582,{
}
}
-malaya,265,274,5 script Missing Person's Friend 577,{
+malaya,265,274,5 script Missing Person's Friend 4_M_BARYO_BOY,{
if (malaya_hi < 20) {
mes "- He seems cautious of you. -";
close;
@@ -5974,7 +5974,7 @@ L_Quest:
return;
}
-malaya,270,278,4 script Missing Person's Son 578,{
+malaya,270,278,4 script Missing Person's Son 4_M_BARYO_MAN,{
if (malaya_hi < 20) {
mes "- He seems cautious of you. -";
close;
@@ -6020,7 +6020,7 @@ L_Quest:
return;
}
-malaya,265,284,4 script Missing Person's Mother 579,{
+malaya,265,284,4 script Missing Person's Mother 4_F_BARYO_WOMAN,{
if (malaya_hi < 20) {
mes "- He seems cautious of you. -";
close;
@@ -6074,7 +6074,7 @@ malaya,265,284,4 script Missing Person's Mother 579,{
}
}
-malaya,289,364,4 script Young Fortune Teller 583,{
+malaya,289,364,4 script Young Fortune Teller 4_F_MALAYA,{
if (checkweight(1301,3) == 0) {
mes "You cannot start the conversation. You are carrying too many items. -";
close;
@@ -6162,7 +6162,7 @@ malaya,289,364,4 script Young Fortune Teller 583,{
end;
}
-ma_fild01,54,253,4 script Gruffy Worker#bako2 582,{
+ma_fild01,54,253,4 script Gruffy Worker#bako2 4_M_MALAYA,{
if (malaya_bakona2 < 9) {
mes "[Gruffy Worker]";
mes "The Village Chief told me to";
@@ -6189,7 +6189,7 @@ ma_fild01,54,253,4 script Gruffy Worker#bako2 582,{
end;
}
-ma_fild01,54,244,0 script #bako2 139,2,2,{
+ma_fild01,54,244,0 script #bako2 HIDDEN_WARP_NPC,2,2,{
end;
OnTouch:
if (malaya_bakona2 == 9) {
@@ -6230,7 +6230,7 @@ OnTouch:
end;
}
-ma_fild01,236,119,5 script Grumpy Worker#bako2 577,{
+ma_fild01,236,119,5 script Grumpy Worker#bako2 4_M_BARYO_BOY,{
if (malaya_bakona2 < 10) {
mes "[Grumpy Worker]";
mes "Village Chief told me to";
@@ -6258,7 +6258,7 @@ ma_fild01,236,119,5 script Grumpy Worker#bako2 577,{
}
}
-ma_fild01,242,116,0 script #bako3 139,2,2,{
+ma_fild01,242,116,0 script #bako3 HIDDEN_WARP_NPC,2,2,{
end;
OnTouch:
if (malaya_bakona2 == 10) {
@@ -6300,7 +6300,7 @@ OnTouch:
end;
}
-ma_scene01,177,89,4 script Cowardly Worker#bako2 578,{
+ma_scene01,177,89,4 script Cowardly Worker#bako2 4_M_BARYO_MAN,{
if (malaya_bakona2 < 11) {
mes "[Cowardly Worker]";
mes "Village Chief told me to";
@@ -6331,7 +6331,7 @@ ma_scene01,177,89,4 script Cowardly Worker#bako2 578,{
end;
}
-ma_scene01,179,85,0 script #bako4 139,2,2,{
+ma_scene01,179,85,0 script #bako4 HIDDEN_WARP_NPC,2,2,{
end;
OnTouch:
if (malaya_bakona2 == 11) {
@@ -6372,7 +6372,7 @@ OnTouch:
end;
}
-ma_scene01,141,118,4 script Gloomy Worker#bako2 582,{
+ma_scene01,141,118,4 script Gloomy Worker#bako2 4_M_MALAYA,{
if (malaya_bakona2 < 12) {
mes "[Gloomy Worker]";
mes "Village Chief told me to wait for you here.";
@@ -6401,7 +6401,7 @@ ma_scene01,141,118,4 script Gloomy Worker#bako2 582,{
end;
}
-ma_scene01,138,122,0 script #bako5 139,2,2,{
+ma_scene01,138,122,0 script #bako5 HIDDEN_WARP_NPC,2,2,{
end;
OnTouch:
if (malaya_bakona2 == 12) {
@@ -6435,7 +6435,7 @@ OnTouch:
end;
}
-ma_scene01,175,170,5 script Sentimental Worker#bako2 578,{
+ma_scene01,175,170,5 script Sentimental Worker#bako2 4_M_BARYO_MAN,{
if (malaya_bakona2 < 13) {
mes "[Sentimental Worker]";
mes "Village Chief told me to wait for you here.";
@@ -6468,7 +6468,7 @@ ma_scene01,175,170,5 script Sentimental Worker#bako2 578,{
end;
}
-ma_scene01,171,174,0 script #bako6 139,2,2,{
+ma_scene01,171,174,0 script #bako6 HIDDEN_WARP_NPC,2,2,{
end;
OnTouch:
if (malaya_bakona2 == 13) {
@@ -6504,7 +6504,7 @@ OnTouch:
}
// Original name: "Bakonawa Introduction Quest Helper#bako1"
-sec_in02,10,16,5 script Bakonawa Intro Helper 543,{
+sec_in02,10,16,5 script Bakonawa Intro Helper 4_MASK_SMOKEY,{
if (callfunc("F_GM_NPC",1854,0) < 1) {
mes "Seafood and Black Bean Sauce Noodle!";
close;
@@ -6828,7 +6828,7 @@ L_Incomplete:
return;
}
-malaya,55,72,4 script Nurse#ma_n1 569,{
+malaya,55,72,4 script Nurse#ma_n1 4_F_NURSE,{
if (malaya_hi < 20) {
mes "[Nurse]";
mes "People of this town are too cautious of outsiders.";
@@ -7404,7 +7404,7 @@ malaya,55,72,4 script Nurse#ma_n1 569,{
close;
}
-ma_dun01,35,108,4 script Nurse#ma_n2 569,{
+ma_dun01,35,108,4 script Nurse#ma_n2 4_F_NURSE,{
if (malaya_bang < 19) {
// fall through
} else if (malaya_bang < 30) {
@@ -7444,7 +7444,7 @@ ma_dun01,35,108,4 script Nurse#ma_n2 569,{
end;
}
-ma_dun01,152,23,4 script Suspicious Wooden Stick::MalayaStick0 858,{
+ma_dun01,152,23,4 script Suspicious Wooden Stick::MalayaStick0 4_BULLETIN_BOARD2,{
if (malaya_bang == 20) {
mes "There's a talisman similar to the ones outside the hospital.";
mes "Let's look around for something else.";
@@ -7512,7 +7512,7 @@ ma_dun01,152,23,4 script Suspicious Wooden Stick::MalayaStick0 858,{
}
}
-malaya,48,76,4 script Hospital Door#ma_n1 844,{
+malaya,48,76,4 script Hospital Door#ma_n1 CLEAR_NPC,{
if (malaya_bang == 3) {
mes "Pushed hard on the door, but it won't open.";
mes "It doesn't feel like it's locked or stuck, but encased by a layer of something.";
@@ -7547,7 +7547,7 @@ malaya,48,76,4 script Hospital Door#ma_n1 844,{
}
}
-malaya,64,78,4 script Village Woman#mab 583,{
+malaya,64,78,4 script Village Woman#mab 4_F_MALAYA,{
if (malaya_hi < 20) {
mes "[Village Woman]";
mes "......";
@@ -7611,7 +7611,7 @@ malaya,64,78,4 script Village Woman#mab 583,{
}
}
-malaya,62,37,4 script Village Man#mab 582,{
+malaya,62,37,4 script Village Man#mab 4_M_MALAYA,{
if (malaya_hi < 20) {
mes "[Village Man]";
mes "Hmmm! Haven't seen you around?";
@@ -7693,7 +7693,7 @@ malaya,62,37,4 script Village Man#mab 582,{
}
}
-malaya,210,200,5 script Dr. Boon#ma 865,{
+malaya,210,200,5 script Dr. Boon#ma 4_LGTSCIENCE,{
if (malaya_hi < 20) {
mes "[Dr. Boon]";
mes "......";
@@ -7766,7 +7766,7 @@ malaya,210,200,5 script Dr. Boon#ma 865,{
}
}
-malaya,53,68,4 script Bushes#ma 844,{
+malaya,53,68,4 script Bushes#ma CLEAR_NPC,{
if (malaya_bang < 13) {
mes "It's just a bush.";
mes "A sweet scent of wood rises when shaken.";
@@ -7934,16 +7934,16 @@ OnDisable:
disablenpc strnpcinfo(3);
end;
}
-malaya,40,52,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick1 858
-malaya,31,42,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick2 858
-malaya,34,36,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick3 858
-malaya,40,32,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick4 858
-malaya,50,85,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick5 858
-malaya,46,93,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick6 858
-malaya,36,98,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick7 858
-malaya,48,79,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick8 858
-malaya,50,46,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick9 858
-malaya,59,84,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick10 858
+malaya,40,52,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick1 4_BULLETIN_BOARD2
+malaya,31,42,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick2 4_BULLETIN_BOARD2
+malaya,34,36,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick3 4_BULLETIN_BOARD2
+malaya,40,32,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick4 4_BULLETIN_BOARD2
+malaya,50,85,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick5 4_BULLETIN_BOARD2
+malaya,46,93,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick6 4_BULLETIN_BOARD2
+malaya,36,98,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick7 4_BULLETIN_BOARD2
+malaya,48,79,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick8 4_BULLETIN_BOARD2
+malaya,50,46,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick9 4_BULLETIN_BOARD2
+malaya,59,84,4 duplicate(MalayaStick) Suspicious Wooden Stick::MalayaStick10 4_BULLETIN_BOARD2
- script Tent#ma -1,{ //557
end;
@@ -7977,7 +7977,7 @@ OnTimer30000:
- duplicate(Tent#ma) Tent9#ma -1
- duplicate(Tent#ma) Tent10#ma -1
-malaya,114,183,3 script Bent Old Lady#ma 575,{
+malaya,114,183,3 script Bent Old Lady#ma 4_F_BARYO_OLD,{
if (malaya_bang == 16) {
mes "[Bent Old Lady]";
mes "Ho ho ho ho~~";
@@ -8166,7 +8166,7 @@ malaya,114,183,3 script Bent Old Lady#ma 575,{
}
}
-malaya,276,367,4 script Bent Shaman#ma 782,{
+malaya,276,367,4 script Bent Shaman#ma 4_F_UMOLDWOMAN,{
if (malaya_hi < 20) {
mes "[Bent Shaman]";
mes "Urgh Urgh Urghhhhhh";
@@ -8215,7 +8215,7 @@ $malaya_pintados_03 - Number of dyestuffs collected. (range: 0~300)
$malaya_pintados_04$ - Last player to create a tattoo.
*/
-ma_fild01,1,1,4 script Pintados Manager#pin 894,{
+ma_fild01,1,1,4 script Pintados Manager#pin 4_F_KHELLISIA,{
if (callfunc("F_GM_NPC",1854,0) == 1) {
mes "Bingo!";
next;
@@ -8373,7 +8373,7 @@ OnDisableNPC:
end;
}
-ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{
+ma_fild01,179,260,2 script Festival Helper Boy#pin 4_M_BARYO_BOY,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "Cannot proceed because you have too many items in your possession.";
close;
@@ -8595,7 +8595,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 577,{
close;
}
-ma_fild01,172,223,6 script Tattooist#pin 574,{
+ma_fild01,172,223,6 script Tattooist#pin 4_M_BARYO_OLD,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "Cannot proceed because you have too many items in your possession.";
close;
@@ -8896,13 +8896,13 @@ ma_fild01,172,223,6 script Tattooist#pin 574,{
close;
}
-ma_fild01,171,224,0 script Ancient Grudge#01 139,{ end; }
-ma_fild01,173,224,0 duplicate(Ancient Grudge#01) Ancient Grudge#02 139
-ma_fild01,173,223,0 duplicate(Ancient Grudge#01) Ancient Grudge#03 139
-ma_fild01,172,222,0 duplicate(Ancient Grudge#01) Ancient Grudge#04 139
-ma_fild01,171,223,0 duplicate(Ancient Grudge#01) Ancient Grudge#05 139
+ma_fild01,171,224,0 script Ancient Grudge#01 HIDDEN_WARP_NPC,{ end; }
+ma_fild01,173,224,0 duplicate(Ancient Grudge#01) Ancient Grudge#02 HIDDEN_WARP_NPC
+ma_fild01,173,223,0 duplicate(Ancient Grudge#01) Ancient Grudge#03 HIDDEN_WARP_NPC
+ma_fild01,172,222,0 duplicate(Ancient Grudge#01) Ancient Grudge#04 HIDDEN_WARP_NPC
+ma_fild01,171,223,0 duplicate(Ancient Grudge#01) Ancient Grudge#05 HIDDEN_WARP_NPC
-ma_fild01,192,200,8 script Tourist#pin01 58,{
+ma_fild01,192,200,8 script Tourist#pin01 1_M_MERCHANT,{
mes "[Tourist]";
mes "I came from afar and dropped everything to come and enjoy the 'Pintados Festival'.";
next;
@@ -8933,7 +8933,7 @@ OnDisable:
end;
}
-ma_fild01,211,200,6 script Tourist#pin02 775,{
+ma_fild01,211,200,6 script Tourist#pin02 4_M_TWMASKMAN,{
mes "[Tourist]";
mes "I heard of the 'Pintados Festival' and came all the way from Gonryun.";
next;
@@ -8952,7 +8952,7 @@ OnDisable:
end;
}
-ma_fild01,251,205,2 script Tourist#pin03 824,{
+ma_fild01,251,205,2 script Tourist#pin03 4_M_CHNOLD,{
mes "[Tourist]";
mes "Hey, hear me. This isn't the Tattoo I wanted.";
next;
@@ -8980,7 +8980,7 @@ OnDisable:
end;
}
-ma_fild01,249,206,6 script Young Tattooist#pin04 582,{
+ma_fild01,249,206,6 script Young Tattooist#pin04 4_M_MALAYA,{
mes "[Tattooist]";
mes "Ah... I can't work with customers like this.";
next;
@@ -9002,7 +9002,7 @@ OnDisable:
end;
}
-ma_fild01,162,235,6 script Tourist#pin05 815,{
+ma_fild01,162,235,6 script Tourist#pin05 4_F_CHNDRESS1,{
mes "[Tourist]";
mes "They say the Pintados Festival will only be held for one week.";
next;
@@ -9021,7 +9021,7 @@ OnDisable:
end;
}
-ma_fild01,164,234,6 script Drumming Young Man#pin06 578,{
+ma_fild01,164,234,6 script Drumming Young Man#pin06 4_M_BARYO_MAN,{
mes "ba-dum-DUM- ba-dum-DUM";
next;
mes "[Drumming Young Man]";
@@ -9042,7 +9042,7 @@ OnDisable:
end;
}
-ma_fild01,170,231,4 script Drumming Young Man#pin07 578,{
+ma_fild01,170,231,4 script Drumming Young Man#pin07 4_M_BARYO_MAN,{
mes "ba-dum-DUM- ba-dum-DUM";
next;
mes "[Drumming Young Man]";
@@ -9063,7 +9063,7 @@ OnDisable:
end;
}
-ma_fild01,164,228,6 script Drumming Young Man#pin08 578,{
+ma_fild01,164,228,6 script Drumming Young Man#pin08 4_M_BARYO_MAN,{
mes "ba-dum-DUM- ba-dum-DUM";
next;
mes "[Drumming Young Man]";
@@ -9081,7 +9081,7 @@ OnDisable:
end;
}
-ma_fild01,170,234,4 script Beat Catching Boy#pin09 577,{
+ma_fild01,170,234,4 script Beat Catching Boy#pin09 4_M_BARYO_BOY,{
mes "ba-dum-TSH- ba-dum-TSH-";
next;
mes "[Beat Catching Boy]";
@@ -9102,7 +9102,7 @@ OnDisable:
end;
}
-ma_fild01,164,231,6 script Beat Catching Boy#pin10 577,{
+ma_fild01,164,231,6 script Beat Catching Boy#pin10 4_M_BARYO_BOY,{
mes "ba-dum-TSH- ba-dum-TSH-";
next;
mes "[Beat Catching Boy]";
@@ -9119,4 +9119,4 @@ OnDisable:
disablenpc strnpcinfo(0);
end;
}
-ma_fild01,170,228,4 duplicate(Beat Catching Boy#pin10) Beat Catching Boy#pin11 577
+ma_fild01,170,228,4 duplicate(Beat Catching Boy#pin10) Beat Catching Boy#pin11 4_M_BARYO_BOY
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index 9e6660c01..9acebd207 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -18,7 +18,7 @@
// Theore's Request :: ep14_1_bs
//============================================================
-mid_camp,148,222,4 script Theore#ep14_1_bs 982,3,3,{
+mid_camp,148,222,4 script Theore#ep14_1_bs 4_F_SCIENCE,3,3,{
if (BaseLevel < 100) {
mes "- A person with a white gown -";
mes "- is pulling at his hair. -";
@@ -444,41 +444,41 @@ OnTimer5000:
end;
}
-spl_fild02,79,104,0 duplicate(#mora_bush) Bush#ep14_1_bs1 111
-spl_fild02,79,104,0 duplicate(#mora_pouch) #ep14_1_bs1 139,2,2
-spl_fild02,79,104,6 duplicate(#mora_fairy) Fairy#cmd11 440
-spl_fild02,79,104,6 duplicate(#mora_fairy) Fairy#cmd12 445
-spl_fild02,79,104,6 duplicate(#mora_fairy) Fairy#cmd13 439
+spl_fild02,79,104,0 duplicate(#mora_bush) Bush#ep14_1_bs1 HIDDEN_NPC
+spl_fild02,79,104,0 duplicate(#mora_pouch) #ep14_1_bs1 HIDDEN_WARP_NPC,2,2
+spl_fild02,79,104,6 duplicate(#mora_fairy) Fairy#cmd11 4_F_FAIRYKID5
+spl_fild02,79,104,6 duplicate(#mora_fairy) Fairy#cmd12 4_M_FAIRYKID4
+spl_fild02,79,104,6 duplicate(#mora_fairy) Fairy#cmd13 4_F_FAIRYKID4
-spl_fild02,103,344,0 duplicate(#mora_bush) Bush#ep14_1_bs2 111
-spl_fild02,103,344,0 duplicate(#mora_pouch) #ep14_1_bs2 139,2,2
-spl_fild02,103,344,6 duplicate(#mora_fairy) Fairy#cmd21 440
-spl_fild02,103,344,6 duplicate(#mora_fairy) Fairy#cmd22 445
-spl_fild02,103,344,6 duplicate(#mora_fairy) Fairy#cmd23 439
+spl_fild02,103,344,0 duplicate(#mora_bush) Bush#ep14_1_bs2 HIDDEN_NPC
+spl_fild02,103,344,0 duplicate(#mora_pouch) #ep14_1_bs2 HIDDEN_WARP_NPC,2,2
+spl_fild02,103,344,6 duplicate(#mora_fairy) Fairy#cmd21 4_F_FAIRYKID5
+spl_fild02,103,344,6 duplicate(#mora_fairy) Fairy#cmd22 4_M_FAIRYKID4
+spl_fild02,103,344,6 duplicate(#mora_fairy) Fairy#cmd23 4_F_FAIRYKID4
-spl_fild02,261,323,0 duplicate(#mora_bush) Bush#ep14_1_bs3 111
-spl_fild02,261,323,0 duplicate(#mora_pouch) #ep14_1_bs3 139,2,2
-spl_fild02,261,323,6 duplicate(#mora_fairy) Fairy#cmd31 440
-spl_fild02,261,323,6 duplicate(#mora_fairy) Fairy#cmd32 445
-spl_fild02,261,323,6 duplicate(#mora_fairy) Fairy#cmd33 439
+spl_fild02,261,323,0 duplicate(#mora_bush) Bush#ep14_1_bs3 HIDDEN_NPC
+spl_fild02,261,323,0 duplicate(#mora_pouch) #ep14_1_bs3 HIDDEN_WARP_NPC,2,2
+spl_fild02,261,323,6 duplicate(#mora_fairy) Fairy#cmd31 4_F_FAIRYKID5
+spl_fild02,261,323,6 duplicate(#mora_fairy) Fairy#cmd32 4_M_FAIRYKID4
+spl_fild02,261,323,6 duplicate(#mora_fairy) Fairy#cmd33 4_F_FAIRYKID4
-spl_fild02,137,305,0 duplicate(#mora_bush) Bush#ep14_1_bs4 111
-spl_fild02,137,305,0 duplicate(#mora_pouch) #ep14_1_bs4 139,2,2
-spl_fild02,137,305,6 duplicate(#mora_fairy) Fairy#cmd41 440
-spl_fild02,137,305,6 duplicate(#mora_fairy) Fairy#cmd42 445
-spl_fild02,137,305,6 duplicate(#mora_fairy) Fairy#cmd43 439
+spl_fild02,137,305,0 duplicate(#mora_bush) Bush#ep14_1_bs4 HIDDEN_NPC
+spl_fild02,137,305,0 duplicate(#mora_pouch) #ep14_1_bs4 HIDDEN_WARP_NPC,2,2
+spl_fild02,137,305,6 duplicate(#mora_fairy) Fairy#cmd41 4_F_FAIRYKID5
+spl_fild02,137,305,6 duplicate(#mora_fairy) Fairy#cmd42 4_M_FAIRYKID4
+spl_fild02,137,305,6 duplicate(#mora_fairy) Fairy#cmd43 4_F_FAIRYKID4
-spl_fild02,23,196,0 duplicate(#mora_bush) Bush#ep14_1_bs5 111
-spl_fild02,23,196,0 duplicate(#mora_pouch) #ep14_1_bs5 139,2,2
-spl_fild02,23,196,6 duplicate(#mora_fairy) Fairy#cmd51 440
-spl_fild02,23,196,6 duplicate(#mora_fairy) Fairy#cmd52 445
-spl_fild02,23,196,6 duplicate(#mora_fairy) Fairy#cmd53 439
+spl_fild02,23,196,0 duplicate(#mora_bush) Bush#ep14_1_bs5 HIDDEN_NPC
+spl_fild02,23,196,0 duplicate(#mora_pouch) #ep14_1_bs5 HIDDEN_WARP_NPC,2,2
+spl_fild02,23,196,6 duplicate(#mora_fairy) Fairy#cmd51 4_F_FAIRYKID5
+spl_fild02,23,196,6 duplicate(#mora_fairy) Fairy#cmd52 4_M_FAIRYKID4
+spl_fild02,23,196,6 duplicate(#mora_fairy) Fairy#cmd53 4_F_FAIRYKID4
-spl_fild02,186,260,0 duplicate(#mora_bush) Bush#ep14_1_bs6 111
-spl_fild02,186,260,0 duplicate(#mora_pouch) #ep14_1_bs6 139,2,2
-spl_fild02,186,260,6 duplicate(#mora_fairy) Fairy#cmd61 440
-spl_fild02,186,260,6 duplicate(#mora_fairy) Fairy#cmd62 445
-spl_fild02,186,260,6 duplicate(#mora_fairy) Fairy#cmd63 439
+spl_fild02,186,260,0 duplicate(#mora_bush) Bush#ep14_1_bs6 HIDDEN_NPC
+spl_fild02,186,260,0 duplicate(#mora_pouch) #ep14_1_bs6 HIDDEN_WARP_NPC,2,2
+spl_fild02,186,260,6 duplicate(#mora_fairy) Fairy#cmd61 4_F_FAIRYKID5
+spl_fild02,186,260,6 duplicate(#mora_fairy) Fairy#cmd62 4_M_FAIRYKID4
+spl_fild02,186,260,6 duplicate(#mora_fairy) Fairy#cmd63 4_F_FAIRYKID4
- script #mora_bush_timer -1,{
end;
@@ -501,20 +501,20 @@ OnTimer600000:
donpcevent strnpcinfo(0)+"::OnDisable";
end;
}
-spl_fild02,180,1,0 duplicate(#mora_bush_timer) Bush1Timer 440
-spl_fild02,181,1,0 duplicate(#mora_bush_timer) Bush2Timer 440
-spl_fild02,182,1,0 duplicate(#mora_bush_timer) Bush3Timer 440
-spl_fild02,183,1,0 duplicate(#mora_bush_timer) Bush4Timer 440
-spl_fild02,184,1,0 duplicate(#mora_bush_timer) Bush5Timer 440
-spl_fild02,186,1,0 duplicate(#mora_bush_timer) Bush6Timer 440
+spl_fild02,180,1,0 duplicate(#mora_bush_timer) Bush1Timer 4_F_FAIRYKID5
+spl_fild02,181,1,0 duplicate(#mora_bush_timer) Bush2Timer 4_F_FAIRYKID5
+spl_fild02,182,1,0 duplicate(#mora_bush_timer) Bush3Timer 4_F_FAIRYKID5
+spl_fild02,183,1,0 duplicate(#mora_bush_timer) Bush4Timer 4_F_FAIRYKID5
+spl_fild02,184,1,0 duplicate(#mora_bush_timer) Bush5Timer 4_F_FAIRYKID5
+spl_fild02,186,1,0 duplicate(#mora_bush_timer) Bush6Timer 4_F_FAIRYKID5
-spl_fild02,187,1,0 script Field Bush Switch 440,{
+spl_fild02,187,1,0 script Field Bush Switch 4_F_FAIRYKID5,{
callfunc "F_GM_NPC";
donpcevent "Bush#ep14_1_bs1::OnEnable";
end;
}
-splendide,183,117,4 script Tired-looking Fairy 438,{
+splendide,183,117,4 script Tired-looking Fairy 4_F_FAIRYKID3,{
if (!isequipped(2782)) {
mes "[Tired-looking Fairy]";
mes "VeOsaRiveh No ModAsh";
@@ -618,7 +618,7 @@ splendide,183,117,4 script Tired-looking Fairy 438,{
close;
}
-splendide,119,138,4 script Kusmi#ep14_1_bs 440,{
+splendide,119,138,4 script Kusmi#ep14_1_bs 4_F_FAIRYKID5,{
if (!isequipped(2782)) {
mes "[Kusmi]";
mes "DimFusTal Mu Lars";
@@ -813,7 +813,7 @@ splendide,119,138,4 script Kusmi#ep14_1_bs 440,{
close;
}
-splendide,304,295,4 script Theodore#ep14_1_bs 445,{
+splendide,304,295,4 script Theodore#ep14_1_bs 4_M_FAIRYKID4,{
if (!isequipped(2782)) {
mes "[Theodore]";
mes "DimFusTal Mu Lars";
@@ -995,7 +995,7 @@ splendide,304,295,4 script Theodore#ep14_1_bs 445,{
close;
}
-splendide,168,301,4 script Pauchon#ep14_1_bs 439,{
+splendide,168,301,4 script Pauchon#ep14_1_bs 4_F_FAIRYKID4,{
if (!isequipped(2782)) {
mes "[Pauchon]";
mes "DimFusTal Mu Lars";
@@ -1178,7 +1178,7 @@ splendide,168,301,4 script Pauchon#ep14_1_bs 439,{
close;
}
-splendide,262,376,4 script Laphine Soldier#ep14_1 447,{
+splendide,262,376,4 script Laphine Soldier#ep14_1 4_M_FAIRYSOLDIER,{
if (!isequipped(2782)) {
mes "[Laphine Soldier]";
mes "DielFarmar Di RiniIyazser Ha mahAgolAsh U U ";
@@ -1212,7 +1212,7 @@ splendide,262,376,4 script Laphine Soldier#ep14_1 447,{
close;
}
-mora,185,163,2 script Warehouse Manager#ep14_1 516,{
+mora,185,163,2 script Warehouse Manager#ep14_1 4_M_RAFLE_GR,{
if (ep14_1_bs < 15) {
mes "[Warehouse Manager]";
mes "No, sir!";
@@ -1256,7 +1256,7 @@ mora,185,163,2 script Warehouse Manager#ep14_1 516,{
end;
}
-mora,35,119,4 script Rondo#ep14_1_bs 513,{
+mora,35,119,4 script Rondo#ep14_1_bs 4_M_DOGTRAVELER,{
mes "[Rondo]";
mes "Mora is such a mysterious place.";
mes "You can understand any language.";
@@ -1274,7 +1274,7 @@ mora,35,119,4 script Rondo#ep14_1_bs 513,{
close;
}
-mora,98,66,4 script Lilitia#ep14_1_bs 518,{
+mora,98,66,4 script Lilitia#ep14_1_bs 4_F_RAFLE_PK,{
if (ep14_1_bs > 13 && ep14_1_bs2 == 11) {
mes "[Lilitia]";
mes "Boo!!!";
@@ -1301,7 +1301,7 @@ mora,98,66,4 script Lilitia#ep14_1_bs 518,{
close;
}
-mora,139,102,2 script Humming#ep14_1_bs 515,{
+mora,139,102,2 script Humming#ep14_1_bs 4_F_DOGTRAVELER,{
if (ep14_1_bs > 13 && ep14_1_bs2 == 12) {
mes "[Humming]";
mes "Oh!";
@@ -1329,7 +1329,7 @@ mora,139,102,2 script Humming#ep14_1_bs 515,{
close;
}
-mora,55,124,2 script Jones#ep14_1_bs 495,{
+mora,55,124,2 script Jones#ep14_1_bs 4_M_MERCAT1,{
if (ep14_1_bs < 15) {
mes "[Jones]";
mes "Oh.... Darn.......";
@@ -1396,7 +1396,7 @@ mora,55,124,2 script Jones#ep14_1_bs 495,{
end;
}
-splendide,121,260,4 script Daphrer#ep14_1_bs 435,{
+splendide,121,260,4 script Daphrer#ep14_1_bs 4_F_FAIRY,{
if (!isequipped(2782)) {
mes "[Daphrer]";
mes "DRHSfhsdfGSDH FGkkmvoifk DFG DFHshfeksmn fgg FDbbd fjnnvk n skncki dfgd F FHdfkdfjkmv";
@@ -1442,7 +1442,7 @@ splendide,121,260,4 script Daphrer#ep14_1_bs 435,{
close;
}
-sec_in02,35,175,0 script Theore Set Guid 436,{
+sec_in02,35,175,0 script Theore Set Guid 4_F_FAIRYKID,{
callfunc "F_GM_NPC";
switch(select("Set0:Set33:Set2_0")) {
case 1:
@@ -1460,7 +1460,7 @@ sec_in02,35,175,0 script Theore Set Guid 436,{
// Chesire's New Day :: ep14_1_cheshir2
//============================================================
-dic_in01,262,191,0 script #ep14_1_xq02 139,0,3,{
+dic_in01,262,191,0 script #ep14_1_xq02 HIDDEN_WARP_NPC,0,3,{
end;
OnTouch:
if (ep13_3_secret > 22 && checkquest(7206) == -1) {
@@ -1493,14 +1493,14 @@ OnTouch:
end;
}
-dic_in01,260,194,4 script Cheshire#ep14_1_xq01 498,{
+dic_in01,260,194,4 script Cheshire#ep14_1_xq01 4_M_CATMAN2,{
end;
OnInit:
disablenpc "Cheshire#ep14_1_xq01";
end;
}
-dic_dun01,274,114,0 script Stacked Boxes of Goods 844,{
+dic_dun01,274,114,0 script Stacked Boxes of Goods CLEAR_NPC,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "- You have too many items to do this quest. -";
close;
@@ -1554,7 +1554,7 @@ dic_dun01,274,114,0 script Stacked Boxes of Goods 844,{
end;
}
-bif_fild01,335,168,3 script Cheshire#ep14_1_xq04 497,{
+bif_fild01,335,168,3 script Cheshire#ep14_1_xq04 4_M_CATMAN1,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
mes "- You have too many items to do this quest. -";
close;
@@ -1851,7 +1851,7 @@ L_CheckPlaytime:
return;
}
-dicastes02,125,192,0 script #call_cheshir_ep14 139,0,3,{
+dicastes02,125,192,0 script #call_cheshir_ep14 HIDDEN_WARP_NPC,0,3,{
end;
OnTouch:
if (ep13_3_secret > 22) {
@@ -1870,7 +1870,7 @@ OnTouch:
end;
}
-dicastes02,103,190,3 script Cheshire#ep14_extra 497,{
+dicastes02,103,190,3 script Cheshire#ep14_extra 4_M_CATMAN1,{
if (ep13_3_secret > 22) {
cutin "ep13_cheshire",1;
mes "[Cheshire]";
@@ -1952,7 +1952,7 @@ OnTimer600000:
// Helping Lope and Euridi :: ep14_1_rofe
//============================================================
-mora,117,66,3 script Euridi#pa 521,{
+mora,117,66,3 script Euridi#pa 4_F_MORAFINE2,{
if (BaseLevel < 100) {
mes "[Euridi]";
mes "You are very delicate.";
@@ -2138,7 +2138,7 @@ mora,117,66,3 script Euridi#pa 521,{
}
}
-mora,115,68,3 script Euridi's Friend#pa 520,{
+mora,115,68,3 script Euridi's Friend#pa 4_F_MORAFINE1,{
if (ep14_1_rope < 2) {
mes "[Euridi's Friend]";
mes "Please stop Euridi.";
@@ -2238,7 +2238,7 @@ mora,115,68,3 script Euridi's Friend#pa 520,{
}
}
-mora,65,145,3 script Pitt#pa 519,{
+mora,65,145,3 script Pitt#pa 4_M_LYINGDOG,{
if (ep14_1_rope == 0) {
mes "[Pitt]";
mes "So you're quite good,";
@@ -2386,7 +2386,7 @@ mora,65,145,3 script Pitt#pa 519,{
}
}
-bif_fild01,132,338,3 script Lope#pa 461,2,2,{
+bif_fild01,132,338,3 script Lope#pa 4_M_FAIRYSOLDIER2,2,2,{
if (ep14_1_rope < 8) {
mes "[Suspicious Man]";
mes "......";
@@ -2506,7 +2506,7 @@ OnTouch:
// Find the Research Tools :: ep14_1_muk
//============================================================
-mora,31,138,6 script Raffle Researcher#ep14 522,{
+mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
mes "^FF0000- Warning message -";
mes "- Hang on there!! -";
@@ -3444,7 +3444,7 @@ L_CheckWeight:
return;
}
-mora,114,79,0 script Black Shadow#ep14_muk 844,{
+mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{
if (checkweight(1201,1) == 0 || MaxWeight - Weight < 500) {
mes "^FF0000- Warning message -";
mes "- Hang on there!! -";
@@ -4209,11 +4209,11 @@ OnTouch:
end;
}
}
-mora,108,86,0 duplicate(???#mora) ???#ep14_muk01 844,2,2
-mora,107,82,0 duplicate(???#mora) ???#ep14_muk02 844,2,2
-mora,113,84,0 duplicate(???#mora) ???#ep14_muk03 844,2,2
-mora,116,81,0 duplicate(???#mora) ???#ep14_muk04 844,2,2
-mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 844,2,2
+mora,108,86,0 duplicate(???#mora) ???#ep14_muk01 CLEAR_NPC,2,2
+mora,107,82,0 duplicate(???#mora) ???#ep14_muk02 CLEAR_NPC,2,2
+mora,113,84,0 duplicate(???#mora) ???#ep14_muk03 CLEAR_NPC,2,2
+mora,116,81,0 duplicate(???#mora) ???#ep14_muk04 CLEAR_NPC,2,2
+mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2
- script #mora_puddle -1,{
set .@i, atoi(charat(strnpcinfo(2),9));
@@ -4349,14 +4349,14 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 844,2,2
mes "You see a puddle with a calm surface.";
close;
}
-bif_fild02,315,285,0 duplicate(#mora_puddle) Puddle#ep14_muk01 844
-bif_fild02,65,109,0 duplicate(#mora_puddle) Puddle#ep14_muk02 844
-bif_fild02,223,71,0 duplicate(#mora_puddle) Puddle#ep14_muk03 844
-bif_fild02,113,340,0 duplicate(#mora_puddle) Puddle#ep14_muk04 844
+bif_fild02,315,285,0 duplicate(#mora_puddle) Puddle#ep14_muk01 CLEAR_NPC
+bif_fild02,65,109,0 duplicate(#mora_puddle) Puddle#ep14_muk02 CLEAR_NPC
+bif_fild02,223,71,0 duplicate(#mora_puddle) Puddle#ep14_muk03 CLEAR_NPC
+bif_fild02,113,340,0 duplicate(#mora_puddle) Puddle#ep14_muk04 CLEAR_NPC
// Mora Daily Quests :: ep14_1_dealer
//============================================================
-mora,133,80,6 script Elephantine#pa0829 509,{
+mora,133,80,6 script Elephantine#pa0829 4_ELEPHANT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -4464,7 +4464,7 @@ mora,133,80,6 script Elephantine#pa0829 509,{
close;
}
-mora,115,98,8 script Hotcha#pa0829 509,{
+mora,115,98,8 script Hotcha#pa0829 4_ELEPHANT,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -4539,7 +4539,7 @@ mora,115,98,8 script Hotcha#pa0829 509,{
close;
}
-mora,119,103,4 script Bow-wow#pa0829 513,{
+mora,119,103,4 script Bow-wow#pa0829 4_M_DOGTRAVELER,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -4647,7 +4647,7 @@ mora,119,103,4 script Bow-wow#pa0829 513,{
close;
}
-mora,119,118,4 script General Good Dealer#pa0 516,{
+mora,119,118,4 script General Good Dealer#pa0 4_M_RAFLE_GR,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -4735,7 +4735,7 @@ L_CheckQuest:
return;
}
-mora,124,108,7 script Woof-grrr#pa0829 514,{
+mora,124,108,7 script Woof-grrr#pa0829 4_M_DOGTRAVELER2,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -4843,7 +4843,7 @@ mora,124,108,7 script Woof-grrr#pa0829 514,{
close;
}
-mora,127,112,4 script Commodities Dealer#pa08 518,{
+mora,127,112,4 script Commodities Dealer#pa08 4_F_RAFLE_PK,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -4931,7 +4931,7 @@ L_CheckQuest:
return;
}
-mora,170,101,4 script Soul Guide#pa0829 515,{
+mora,170,101,4 script Soul Guide#pa0829 4_F_DOGTRAVELER,{
if (checkweight(1201,1) == 0) {
mes "You have too many kinds of things with you to do that. Throw out some of them and try again.";
close;
@@ -5056,19 +5056,19 @@ mora,170,101,4 script Soul Guide#pa0829 515,{
close;
}
-mora,131,165,7 script Wandering Customer#pa082 520,{
+mora,131,165,7 script Wandering Customer#pa082 4_F_MORAFINE1,{
mes "[Wandering Customer]";
mes "I don't know whether to believe this art dealer... He made me stand here like this for days.... Ah... I feel dizzy.";
close;
}
-mora,125,174,2 script A Random Customer#pa0829 520,{
+mora,125,174,2 script A Random Customer#pa0829 4_F_MORAFINE1,{
mes "[Naive Customer]";
mes "I don't know when carving my pendant will be completed. Since he is a reliable art dealer, I suppose he won't break my pendant.";
close;
}
-mora,104,172,7 script Victim#pa0829 520,{
+mora,104,172,7 script Victim#pa0829 4_F_MORAFINE1,{
mes "[Victim]";
mes "You Bastard! I want my rugged outwear! That was passed on to me by my father *SOB*";
next;
@@ -5076,7 +5076,7 @@ mora,104,172,7 script Victim#pa0829 520,{
close;
}
-sec_in02,29,34,5 script Initializing Mora Sanjo 453,{
+sec_in02,29,34,5 script Initializing Mora Sanjo 4_MAN_NITT,{
callfunc "F_GM_NPC";
mes "Enter your password";
if (callfunc("F_GM_NPC","1854",1) == 0) {
@@ -5123,20 +5123,20 @@ function script mora_remains {
mes "You see traces of recent digging.";
close;
}
-1@mist,132,100,0 script Tazaar's Remains#33 844,{ callfunc "mora_remains",12243,"Tazaar",6,526,3; } //Royal_Jelly
-1@mist,102,242,0 script Naizar's Remains#33 844,{ callfunc "mora_remains",12244,"Naizar",5,942,17; } //Yoyo_Tail
-1@mist,145,245,0 script Meshir's Remains#33 844,{ callfunc "mora_remains",12245,"Meshir",5,943,4; } //Solid_Shell
-1@mist,196,276,0 script Noirit's Remains#33 844,{ callfunc "mora_remains",12246,"Noirit",6,549,3; } //Nice_Sweet_Potato
-1@mist,304,327,0 script Pajama God's Remains#33 844,{ callfunc "mora_remains",12247,"Pajama God",5,945,18; } //Raccoon_Leaf
-1@mist,334,287,0 script Mendel's Remains#33 844,{ callfunc "mora_remains",12248,"Mendel",7,946,31; } //Snail's_Shell
-1@mist,330,177,0 script Milebit's Remains#33 844,{ callfunc "mora_remains",12249,"Milebit",5,7008,17; } //Stiff_Horn
-1@mist,284,84,0 script Kunmun's Remains#33 844,{ callfunc "mora_remains",12250,"Kunmun",4,6380,20; } //Mora_Coin
-1@mist,170,54,0 script Tsaihokin's Remains#33 844,{ callfunc "mora_remains",12251,"Tsaihokin",2,929,5; } //Immortal_Heart
-1@mist,118,43,0 script Tuar's Remains#33 844,{ callfunc "mora_remains",12252,"Tuar",3,6380,20; } //Mora_Coin
+1@mist,132,100,0 script Tazaar's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12243,"Tazaar",6,526,3; } //Royal_Jelly
+1@mist,102,242,0 script Naizar's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12244,"Naizar",5,942,17; } //Yoyo_Tail
+1@mist,145,245,0 script Meshir's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12245,"Meshir",5,943,4; } //Solid_Shell
+1@mist,196,276,0 script Noirit's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12246,"Noirit",6,549,3; } //Nice_Sweet_Potato
+1@mist,304,327,0 script Pajama God's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12247,"Pajama God",5,945,18; } //Raccoon_Leaf
+1@mist,334,287,0 script Mendel's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; } //Snail's_Shell
+1@mist,330,177,0 script Milebit's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12249,"Milebit",5,7008,17; } //Stiff_Horn
+1@mist,284,84,0 script Kunmun's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12250,"Kunmun",4,6380,20; } //Mora_Coin
+1@mist,170,54,0 script Tsaihokin's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12251,"Tsaihokin",2,929,5; } //Immortal_Heart
+1@mist,118,43,0 script Tuar's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12252,"Tuar",3,6380,20; } //Mora_Coin
// Knights of the Neighborhood :: ep14_1_mora_knight
//============================================================
-mora,118,166,6 script Knights Chief#mo 525,{
+mora,118,166,6 script Knights Chief#mo 4_F_RAFLE_VI,{
mes "[Order of the Knights Chief]";
mes "We are the legendary order of the Neighborhood Knights, founded just five minutes ago!";
next;
@@ -5152,7 +5152,7 @@ mora,118,166,6 script Knights Chief#mo 525,{
close;
}
-mora,116,165,5 script Knights Boss#mo 524,{
+mora,116,165,5 script Knights Boss#mo 4_M_RAFLE_VI,{
set .@playtime, checkquest(1119,PLAYTIME);
if (.@playtime == 0 || .@playtime == 1) {
mes "[Order of the Knights Boss]";
@@ -5214,7 +5214,7 @@ mora,116,165,5 script Knights Boss#mo 524,{
}
}
-mora,114,163,5 script Knights Head#mo 522,{
+mora,114,163,5 script Knights Head#mo 4_M_RAFLE_OR,{
if (checkweight(6380,1) == 0) {
mes "[Order of the Knights Head]";
mes "You have a lot of things with you!";
@@ -5342,7 +5342,7 @@ mora,114,163,5 script Knights Head#mo 522,{
end;
}
-mora,112,161,5 script Knights Leader#mo 523,{
+mora,112,161,5 script Knights Leader#mo 4_F_RAFLE_YE,{
mes "[Order of the Knights Leader]";
mes "I'm the Leader of the Order -";
mes "you can tell me.";
diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt
index b1eb02a35..5c062bdf4 100644
--- a/npc/re/quests/quests_morocc.txt
+++ b/npc/re/quests/quests_morocc.txt
@@ -37,19 +37,19 @@
end;
}
}
-moc_fild07,380,202,1 duplicate(Continental Guard#man) Continental Guard#man1 852
-moc_fild11,189,360,6 duplicate(Continental Guard#man) Continental Guard#man2 852
-prt_fild10,263,23,1 duplicate(Continental Guard#man) Continental Guard#man3 852
-prt_fild09,95,19,1 duplicate(Continental Guard#man) Continental Guard#man4 852
-prt_fild09,246,17,1 duplicate(Continental Guard#man) Continental Guard#man5 852
-moc_fild13,32,171,6 duplicate(Continental Guard#man) Continental Guard#man6 852
-moc_fild16,124,381,4 duplicate(Continental Guard#man) Continental Guard#man7 852
-moc_fild16,333,380,4 duplicate(Continental Guard#man) Continental Guard#man8 852
-moc_fild01,84,19,1 duplicate(Continental Guard#man) Continental Guard#man9 852
+moc_fild07,380,202,1 duplicate(Continental Guard#man) Continental Guard#man1 4_M_EIN_SOLDIER
+moc_fild11,189,360,6 duplicate(Continental Guard#man) Continental Guard#man2 4_M_EIN_SOLDIER
+prt_fild10,263,23,1 duplicate(Continental Guard#man) Continental Guard#man3 4_M_EIN_SOLDIER
+prt_fild09,95,19,1 duplicate(Continental Guard#man) Continental Guard#man4 4_M_EIN_SOLDIER
+prt_fild09,246,17,1 duplicate(Continental Guard#man) Continental Guard#man5 4_M_EIN_SOLDIER
+moc_fild13,32,171,6 duplicate(Continental Guard#man) Continental Guard#man6 4_M_EIN_SOLDIER
+moc_fild16,124,381,4 duplicate(Continental Guard#man) Continental Guard#man7 4_M_EIN_SOLDIER
+moc_fild16,333,380,4 duplicate(Continental Guard#man) Continental Guard#man8 4_M_EIN_SOLDIER
+moc_fild01,84,19,1 duplicate(Continental Guard#man) Continental Guard#man9 4_M_EIN_SOLDIER
// Pyramids Nightmare Mode
//============================================================
-moc_prydb1,103,54,3 script Suspicious Cat#night 547,{
+moc_prydb1,103,54,3 script Suspicious Cat#night 4_CAT_SAILOR4,{
mes "[Suspicious Cat]";
mes "I can't believe a mummy could do this to me. Oh man, it hurts. Nobody should find out about this....";
next;
@@ -107,7 +107,7 @@ moc_prydb1,103,54,3 script Suspicious Cat#night 547,{
}
}
-moc_prydn1,94,98,3 script Suspicious Cat#night2 547,{
+moc_prydn1,94,98,3 script Suspicious Cat#night2 4_CAT_SAILOR4,{
mes "[Suspicious Cat]";
mes "That stupid mummy slapped me again while you were looking away! Sniff sniff... Let's go back, meow!";
next;
diff --git a/npc/re/quests/quests_nameless.txt b/npc/re/quests/quests_nameless.txt
index ebe7a7cfd..04f138d2f 100644
--- a/npc/re/quests/quests_nameless.txt
+++ b/npc/re/quests/quests_nameless.txt
@@ -12,4 +12,4 @@
//= 1.0 Moved Dorian to pre-re/re paths.
//============================================================
-izlude_in,57,92,3 duplicate(Dorian_izlude) Dorian 878,2,2
+izlude_in,57,92,3 duplicate(Dorian_izlude) Dorian 4_M_OILMAN,2,2
diff --git a/npc/re/quests/quests_veins.txt b/npc/re/quests/quests_veins.txt
index 28e92d504..707516b4e 100644
--- a/npc/re/quests/quests_veins.txt
+++ b/npc/re/quests/quests_veins.txt
@@ -10,4 +10,4 @@
//= 1.0 First version.
//============================================================
-ve_fild02,337,314,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 945
+ve_fild02,337,314,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 4_M_DST_GRAND
diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt
index 8d43c8edd..6ad933aa3 100644
--- a/npc/re/warps/cities/dicastes.txt
+++ b/npc/re/warps/cities/dicastes.txt
@@ -30,7 +30,7 @@ dicastes02,120,237,0 warp eldicastes0013 1,1,dic_in01,45,246
dic_in01,45,244,0 warp eldicastes0014 1,1,dicastes02,119,235
dic_in01,299,248,0 warp eldicastes0015 1,1,dic_in01,262,191
-dic_in01,242,182,0 script #eldicastes0016 844,{
+dic_in01,242,182,0 script #eldicastes0016 CLEAR_NPC,{
if (isequipped(2782)) select("Administrative Office");
else select("¡÷¡ú¡ð");
warp "dic_in01",138,221;
@@ -57,16 +57,16 @@ dic_in01,242,182,0 script #eldicastes0016 844,{
warp "dic_in01",.@xy[.@m*2],.@xy[.@m*2+1];
end;
}
-dic_in01,46,288,0 duplicate(Elevator#main) Elevator#1 844
-dic_in01,122,284,0 duplicate(Elevator#main) Elevator#2 844
-dic_in01,121,203,0 duplicate(Elevator#main) Elevator#3 844
-dic_in01,35,214,0 duplicate(Elevator#main) Elevator#4 844
-dic_in01,44,116,0 duplicate(Elevator#main) Elevator#5 844
-dic_in01,112,108,0 duplicate(Elevator#main) Elevator#6 844
-dic_in01,180,108,0 duplicate(Elevator#main) Elevator#7 844
-dic_in01,261,115,0 duplicate(Elevator#main) Elevator#8 844
-dic_in01,57,48,0 duplicate(Elevator#main) Elevator#9 844
-dic_in01,137,46,0 duplicate(Elevator#main) Elevator#10 844
-dic_in01,222,46,0 duplicate(Elevator#main) Elevator#11 844
-dic_in01,388,272,0 duplicate(Elevator#main) Elevator#12 844
-dic_in01,389,208,0 duplicate(Elevator#main) Elevator#13 844 \ No newline at end of file
+dic_in01,46,288,0 duplicate(Elevator#main) Elevator#1 CLEAR_NPC
+dic_in01,122,284,0 duplicate(Elevator#main) Elevator#2 CLEAR_NPC
+dic_in01,121,203,0 duplicate(Elevator#main) Elevator#3 CLEAR_NPC
+dic_in01,35,214,0 duplicate(Elevator#main) Elevator#4 CLEAR_NPC
+dic_in01,44,116,0 duplicate(Elevator#main) Elevator#5 CLEAR_NPC
+dic_in01,112,108,0 duplicate(Elevator#main) Elevator#6 CLEAR_NPC
+dic_in01,180,108,0 duplicate(Elevator#main) Elevator#7 CLEAR_NPC
+dic_in01,261,115,0 duplicate(Elevator#main) Elevator#8 CLEAR_NPC
+dic_in01,57,48,0 duplicate(Elevator#main) Elevator#9 CLEAR_NPC
+dic_in01,137,46,0 duplicate(Elevator#main) Elevator#10 CLEAR_NPC
+dic_in01,222,46,0 duplicate(Elevator#main) Elevator#11 CLEAR_NPC
+dic_in01,388,272,0 duplicate(Elevator#main) Elevator#12 CLEAR_NPC
+dic_in01,389,208,0 duplicate(Elevator#main) Elevator#13 CLEAR_NPC \ No newline at end of file
diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt
index b18a1f52d..190f1831a 100644
--- a/npc/re/warps/cities/malaya.txt
+++ b/npc/re/warps/cities/malaya.txt
@@ -32,7 +32,7 @@ ma_in01,105,160,0 warp mf_in_minga_mf_minga 1,1,ma_fild01,248,190
// Locked Warps
//============================================================
-malaya,178,211,0 script malaya_inn 45,1,1,{
+malaya,178,211,0 script malaya_inn WARPNPC,1,1,{
end;
OnTouch:
if (malaya_hi < 10) {
@@ -43,7 +43,7 @@ OnTouch:
end;
}
-malaya,112,212,0 script malaya_ws 45,1,1,{
+malaya,112,212,0 script malaya_ws WARPNPC,1,1,{
end;
OnTouch:
if (malaya_hi < 20) {
@@ -54,7 +54,7 @@ OnTouch:
end;
}
-malaya,299,167,0 script malaya_ts 45,1,1,{
+malaya,299,167,0 script malaya_ts WARPNPC,1,1,{
end;
OnTouch:
if (malaya_hi < 20) {
@@ -65,7 +65,7 @@ OnTouch:
end;
}
-malaya,261,240,0 script malaya_shop 45,1,1,{
+malaya,261,240,0 script malaya_shop WARPNPC,1,1,{
end;
OnTouch:
if (malaya_hi < 20) {
@@ -76,7 +76,7 @@ OnTouch:
end;
}
-malaya,300,211,0 script malaya_house01 45,1,1,{
+malaya,300,211,0 script malaya_house01 WARPNPC,1,1,{
end;
OnTouch:
if (malaya_hi < 10) {
@@ -123,17 +123,17 @@ function script F_Malaya_Warp {
end;
}
-ma_zif01,30,22,0 script Town Warp#zif01 45,1,1,{ callfunc "F_Malaya_Warp","Center","Southwest","Southeast",1; }
-ma_zif02,30,22,0 script Town Warp#zif02 45,1,1,{ callfunc "F_Malaya_Warp","Southwest","Center","Southeast",1; }
-ma_zif03,30,22,0 script Town Warp#zif03 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Southwest",1; }
+ma_zif01,30,22,0 script Town Warp#zif01 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Center","Southwest","Southeast",1; }
+ma_zif02,30,22,0 script Town Warp#zif02 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southwest","Center","Southeast",1; }
+ma_zif03,30,22,0 script Town Warp#zif03 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Southwest",1; }
-ma_zif04,30,22,0 script Town Warp#zif04 45,1,1,{ callfunc "F_Malaya_Warp","Northwest","Southeast","Northeast",2; }
-ma_zif05,30,22,0 script Town Warp#zif05 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Northwest","Northeast",2; }
-ma_zif06,30,22,0 script Town Warp#zif06 45,1,1,{ callfunc "F_Malaya_Warp","Northeast","Northwest","Southeast",2; }
+ma_zif04,30,22,0 script Town Warp#zif04 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northwest","Southeast","Northeast",2; }
+ma_zif05,30,22,0 script Town Warp#zif05 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Northwest","Northeast",2; }
+ma_zif06,30,22,0 script Town Warp#zif06 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northeast","Northwest","Southeast",2; }
-ma_zif07,30,22,0 script Town Warp#zif07 45,1,1,{ callfunc "F_Malaya_Warp","Center","Northwest","Southeast",3; }
-ma_zif08,30,22,0 script Town Warp#zif08 45,1,1,{ callfunc "F_Malaya_Warp","Northwest","Center","Southeast",3; }
-ma_zif09,30,22,0 script Town Warp#zif09 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Northwest",3; }
+ma_zif07,30,22,0 script Town Warp#zif07 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Center","Northwest","Southeast",3; }
+ma_zif08,30,22,0 script Town Warp#zif08 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northwest","Center","Southeast",3; }
+ma_zif09,30,22,0 script Town Warp#zif09 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Northwest",3; }
//ma_zif01,30,22,0 warp malaya_car0001 1,1,malaya,241,238
//ma_zif02,30,22,0 warp malaya_car0002 1,1,malaya,71,43
diff --git a/npc/re/warps/dungeons/iz_dun.txt b/npc/re/warps/dungeons/iz_dun.txt
index 9a65e15a7..95e20d84c 100644
--- a/npc/re/warps/dungeons/iz_dun.txt
+++ b/npc/re/warps/dungeons/iz_dun.txt
@@ -14,7 +14,7 @@
// Undersea Tunnel Warper
//============================================================
-iz_dun04,130,234,5 script Gatekeeper#iz_dun 413,{
+iz_dun04,130,234,5 script Gatekeeper#iz_dun 4_M_CRU_SOLD,{
mes "[Gatekeeper]";
mes "Halt!";
mes "What brings you here, Adventurer?";
@@ -41,7 +41,7 @@ iz_dun04,130,234,5 script Gatekeeper#iz_dun 413,{
}
}
-iz_dun05,142,190,5 script Guard#iz_dun 413,{
+iz_dun05,142,190,5 script Guard#iz_dun 4_M_CRU_SOLD,{
mes "[Gatekeeper]";
mes "So I guess you want to go back to the fifth floor?";
next;
diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt
index b2a9594c0..5fc888b3c 100644
--- a/npc/re/warps/fields/bif_fild.txt
+++ b/npc/re/warps/fields/bif_fild.txt
@@ -37,6 +37,6 @@ OnTouch:
specialeffect EF_LEVEL99_4;
end;
}
-bif_fild02,285,332,0 duplicate(bifrost_field0000) Small Hole#ep14_mora1 844
-bif_fild02,95,310,0 duplicate(bifrost_field0000) Small Hole#ep14_mora2 844
-bif_fild02,174,162,0 duplicate(bifrost_field0000) Small Hole#ep14_mora3 844
+bif_fild02,285,332,0 duplicate(bifrost_field0000) Small Hole#ep14_mora1 CLEAR_NPC
+bif_fild02,95,310,0 duplicate(bifrost_field0000) Small Hole#ep14_mora2 CLEAR_NPC
+bif_fild02,174,162,0 duplicate(bifrost_field0000) Small Hole#ep14_mora3 CLEAR_NPC
diff --git a/npc/re/warps/fields/morroc_fild.txt b/npc/re/warps/fields/morroc_fild.txt
index 050c76038..3b40d2443 100644
--- a/npc/re/warps/fields/morroc_fild.txt
+++ b/npc/re/warps/fields/morroc_fild.txt
@@ -42,7 +42,7 @@ moc_fild03,70,341,0 warp mocf04-1 5,2,moc_fild02,332,23
//moc_fild04,14,98,0 warp mocf07 1,11,moc_fild05,378,119
//moc_fild04,175,18,0 warp mocf08 3,2,moc_fild08,170,380
//moc_fild04,19,206,0 warp mocf09 3,15,moc_fild05,373,208
-//moc_fild04,219,327,0 script mocf016 45,3,4,{ set @anthell,0; warp "anthell01",35,262; }
+//moc_fild04,219,327,0 script mocf016 WARPNPC,3,4,{ set @anthell,0; warp "anthell01",35,262; }
//moc_fild04,292,381,0 warp mocf01-2 10,1,moc_fild01,76,25
//moc_fild04,314,381,0 warp mocf01-3 10,1,moc_fild01,76,25
//moc_fild04,336,381,0 warp mocf01-4 10,1,moc_fild01,76,25
@@ -95,7 +95,7 @@ moc_fild13,308,49,0 warp mocf06-1 2,4,moc_fild03,20,37
//moc_fild14,196,382,0 warp mocf16-1 4,2,moc_fild08,204,19
//moc_fild15,104,16,0 warp mocf26 9,2,moc_fild16,125,380
//moc_fild15,158,363,0 warp mocf18-1 6,2,moc_fild09,126,23
-//moc_fild15,258,253,0 script mocf017 45,3,3,{ set @anthell,1; warp "anthell01",35,262; }
+//moc_fild15,258,253,0 script mocf017 WARPNPC,3,3,{ set @anthell,1; warp "anthell01",35,262; }
//moc_fild15,348,18,0 warp mocf27 5,2,moc_fild16,334,379
//moc_fild15,367,276,0 warp mocf25-1 2,4,moc_fild14,19,278
//moc_fild15,38,105,0 warp mocf23-1 2,4,moc_fild11,376,197
diff --git a/npc/re/warps/fields/veins_fild.txt b/npc/re/warps/fields/veins_fild.txt
index 255ce637c..69c10edf3 100644
--- a/npc/re/warps/fields/veins_fild.txt
+++ b/npc/re/warps/fields/veins_fild.txt
@@ -30,7 +30,7 @@ ve_fild04,115,50,0 warp ve_fild4-3 1,1,ve_fild06,80,183
//ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183
ve_fild06,153,220,0 warp ve_fild6-1 1,1,veins,218,355
/*
-ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{
+ve_fild06,81,177,0 script ve_fild6-2 WARPNPC,1,1,{
if (rand(2))
warp "ve_fild04",115,55;
else
diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt
index 1d9058ffa..f86c90d2c 100644
--- a/npc/warps/cities/umbala.txt
+++ b/npc/warps/cities/umbala.txt
@@ -26,7 +26,7 @@ umbala,100,203,0 warp um_houseA2-1 1,1,um_in,163,69
um_in,166,69,0 warp um_houseA2-2 1,1,umbala,102,205
umbala,107,130,0 warp um_houseB1-1 1,1,um_in,99,66
um_in,99,63,0 warp um_houseB1-2 1,1,umbala,108,127
-umbala,220,189,0 script um_shaman1-1 45,1,1,{
+umbala,220,189,0 script um_shaman1-1 WARPNPC,1,1,{
OnTouch:
if (event_umbala == 7) {
warp "um_in",32,71;
diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index 3b3e51fc8..4d6ebee86 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -88,7 +88,7 @@ yuno,245,147,0 warp yun65 1,1,yuno_in01,101,88
yuno_in01,101,85,0 warp yun66 1,1,yuno,245,144
// Yuno In05 (Entering Random Warps) -------------------------------------------
-yuno_in05,153,141,0 script #yun63 45,1,1,{
+yuno_in05,153,141,0 script #yun63 WARPNPC,1,1,{
if (rand(2))
warp "yuno_in05",192,102;
else
@@ -96,28 +96,28 @@ yuno_in05,153,141,0 script #yun63 45,1,1,{
end;
}
// Yuno In05 (Random Warps - Cross Shaped) -------------------------------------
-yuno_in05,196,102,0 script #yun64 45,1,1,{
+yuno_in05,196,102,0 script #yun64 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",169,102; end;
case 1: warp "yuno_in05",128,82; end;
case 2: warp "yuno_in05",156,141; end;
}
}
-yuno_in05,181,116,0 script #yun65 45,1,1,{
+yuno_in05,181,116,0 script #yun65 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,94; end;
case 1: warp "yuno_in05",176,13; end;
case 2: warp "yuno_in05",136,75; end;
}
}
-yuno_in05,165,102,0 script #yun66 45,1,1,{
+yuno_in05,165,102,0 script #yun66 WARPNPC,1,1,{
if (rand(2))
warp "yuno_in05",192,102;
else
warp "yuno_in05",145,82;
end;
}
-yuno_in05,181,91,0 script #yun67 45,1,1,{
+yuno_in05,181,91,0 script #yun67 WARPNPC,1,1,{
if (rand(2))
warp "yuno_in05",181,112;
else
@@ -125,21 +125,21 @@ yuno_in05,181,91,0 script #yun67 45,1,1,{
end;
}
// Yuno In05 (Random Warps - T-Shaped) -----------------------------------------
-yuno_in05,148,82,0 script #yun68 45,1,1,{
+yuno_in05,148,82,0 script #yun68 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",169,102; end;
case 1: warp "yuno_in05",128,82; end;
case 2: warp "yuno_in05",156,141; end;
}
}
-yuno_in05,125,82,0 script #yun69 45,1,1,{
+yuno_in05,125,82,0 script #yun69 WARPNPC,1,1,{
if (rand(2))
warp "yuno_in05",192,102;
else
warp "yuno_in05",145,82;
end;
}
-yuno_in05,136,71,0 script #yun70 45,1,1,{
+yuno_in05,136,71,0 script #yun70 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,112; end;
case 1: warp "yuno_in05",16,185; end;
@@ -147,21 +147,21 @@ yuno_in05,136,71,0 script #yun70 45,1,1,{
}
}
// Yuno In05 (Random Warps - Other) --------------------------------------------
-yuno_in05,16,188,0 script #yun71 45,1,1,{
+yuno_in05,16,188,0 script #yun71 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,94; end;
case 1: warp "yuno_in05",176,13; end;
case 2: warp "yuno_in05",136,75; end;
}
}
-yuno_in05,176,9,0 script #yun72 45,1,1,{
+yuno_in05,176,9,0 script #yun72 WARPNPC,1,1,{
if (rand(2))
warp "yuno_in05",181,112;
else
warp "yuno_in05",176,48;
end;
}
-yuno_in05,176,52,0 script #yun73 45,1,1,{
+yuno_in05,176,52,0 script #yun73 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,94; end;
case 1: warp "yuno_in05",176,13; end;
@@ -169,14 +169,14 @@ yuno_in05,176,52,0 script #yun73 45,1,1,{
}
}
// Yuno In05 (Destination - Room) ----------------------------------------------
-yuno_in05,40,178,0 script #yun74 45,1,1,{
+yuno_in05,40,178,0 script #yun74 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,94; end;
case 1: warp "yuno_in05",176,13; end;
case 2: warp "yuno_in05",136,75; end;
}
}
-yuno_in05,47,186,0 script #yun75 45,1,1,{
+yuno_in05,47,186,0 script #yun75 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,94; end;
case 1: warp "yuno_in05",176,13; end;
diff --git a/npc/warps/dungeons/alde_dun.txt b/npc/warps/dungeons/alde_dun.txt
index 563f926a0..f74bf7c48 100644
--- a/npc/warps/dungeons/alde_dun.txt
+++ b/npc/warps/dungeons/alde_dun.txt
@@ -26,7 +26,7 @@ alde_dun02,122,169,0 warp ald006 2,2,c_tower3,47,41
alde_dun02,187,234,0 warp ald007 2,2,c_tower3,65,147
//============================================================
//= Random B2 ================================================
-alde_dun02,267,41,4 script ald008r 45,1,1,{
+alde_dun02,267,41,4 script ald008r WARPNPC,1,1,{
if (rand(2))
warp "c_tower3",168,252;
else
@@ -40,7 +40,7 @@ alde_dun03,276,48,0 warp ald012 2,2,c_tower1,235,223
//============================================================
//7(npc)
//= Random B3-1 ================================================
-alde_dun03,130,125,4 script ald014r 45,1,1,{
+alde_dun03,130,125,4 script ald014r WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "c_tower2",228,267; end;
case 1: warp "alde_dun03",130,130; end;
@@ -49,7 +49,7 @@ alde_dun03,130,125,4 script ald014r 45,1,1,{
}
//============================================================
//= Random 3-2 ===============================================
-alde_dun03,171,127,4 script ald015r 45,1,1,{
+alde_dun03,171,127,4 script ald015r WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "c_tower2",13,282; end;
case 1: warp "alde_dun03",175,131; end;
@@ -62,7 +62,7 @@ alde_dun04,215,192,0 warp ald018 1,1,c_tower2,148,283
alde_dun04,32,74,0 warp aldd19 1,1,alde_dun02,187,239
alde_dun04,208,58,0 warp aldd20 2,2,alde_dun04,268,74
alde_dun04,272,74,0 warp aldd021 2,2,alde_dun04,204,62
-alde_dun04,80,34,4 script ald022r 45,1,1,{
+alde_dun04,80,34,4 script ald022r WARPNPC,1,1,{
switch(rand(4)) {
case 0: warp "c_tower2",13,282; end;
case 1: warp "alde_dun03",175,131; end;
diff --git a/npc/warps/dungeons/c_tower.txt b/npc/warps/dungeons/c_tower.txt
index 6523ceece..b7b46d16d 100644
--- a/npc/warps/dungeons/c_tower.txt
+++ b/npc/warps/dungeons/c_tower.txt
@@ -22,7 +22,7 @@ c_tower2,273,26,0 warp clt005 1,1,c_tower1,235,223
//============================================================
//= Level 2 ==================================================
//= Random 2-1 ===============================================
-c_tower2,13,288,4 script clt006r 45,1,1,{
+c_tower2,13,288,4 script clt006r WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "c_tower2",13,282; end;
case 1: warp "alde_dun03",175,131; end;
@@ -31,7 +31,7 @@ c_tower2,13,288,4 script clt006r 45,1,1,{
}
//============================================================
//= Random 2-2 ===============================================
-c_tower2,223,267,4 script clt007r 45,1,1,{
+c_tower2,223,267,4 script clt007r WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "c_tower2",288,267; end;
case 1: warp "alde_dun03",130,130; end;
@@ -47,7 +47,7 @@ c_tower3,42,41,0 warp clt012 1,1,alde_dun02,127,169
c_tower3,146,8,0 warp clt013 1,1,c_tower1,235,223
//============================================================
//= Random 3-1 ===============================================
-c_tower3,163,252,4 script clt014r 45,1,1,{
+c_tower3,163,252,4 script clt014r WARPNPC,1,1,{
if (rand(2))
warp "c_tower3",168,252;
else
@@ -56,7 +56,7 @@ c_tower3,163,252,4 script clt014r 45,1,1,{
}
//============================================================
//= Random 3-2 ===============================================
-c_tower3,240,7,4 script clt015r 45,1,1,{
+c_tower3,240,7,4 script clt015r WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "c_tower2",13,282; end;
case 1: warp "alde_dun03",175,131; end;
@@ -65,7 +65,7 @@ c_tower3,240,7,4 script clt015r 45,1,1,{
}
//============================================================
//= Random 3-3 ===============================================
-c_tower3,252,24,4 script clt016r 45,1,1,{
+c_tower3,252,24,4 script clt016r WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "c_tower2",228,267; end;
case 1: warp "alde_dun03",130,130; end;
@@ -86,7 +86,7 @@ c_tower4,198,59,0 warp clt025 1,1,c_tower4,152,98
c_tower4,204,57,0 warp clt026 1,1,c_tower4,65,77
//============================================================
//= Random 4-1 ===============================================
-c_tower4,75,156,4 script clt027r 45,0,0,{
+c_tower4,75,156,4 script clt027r WARPNPC,0,0,{
switch(rand(4)) {
case 0: warp "c_tower3",168,252; end;
case 1: warp "alde_dun02",262,41; end;
@@ -96,7 +96,7 @@ c_tower4,75,156,4 script clt027r 45,0,0,{
}
//============================================================
//= Random 4-2 ===============================================
-c_tower4,68,79,4 script clt028r 45,0,0,{
+c_tower4,68,79,4 script clt028r WARPNPC,0,0,{
switch(rand(4)) {
case 0: warp "c_tower2",13,282; end;
case 1: warp "alde_dun03",175,131; end;
@@ -106,7 +106,7 @@ c_tower4,68,79,4 script clt028r 45,0,0,{
}
//============================================================
//= Random 4-3 ===============================================
-c_tower4,142,151,4 script clt029r 45,0,0,{
+c_tower4,142,151,4 script clt029r WARPNPC,0,0,{
switch(rand(4)) {
case 0: warp "c_tower3",168,252; end;
case 1: warp "alde_dun02",262,41; end;
@@ -116,7 +116,7 @@ c_tower4,142,151,4 script clt029r 45,0,0,{
}
//============================================================
//= Random 4-4 ===============================================
-c_tower4,151,96,4 script clt030r 45,0,0,{
+c_tower4,151,96,4 script clt030r WARPNPC,0,0,{
switch(rand(4)) {
case 0: warp "c_tower2",228,267; end;
case 1: warp "alde_dun03",130,130; end;
@@ -126,7 +126,7 @@ c_tower4,151,96,4 script clt030r 45,0,0,{
}
//============================================================
//= Random 4-5 ===============================================
-c_tower4,189,40,4 script clt031r 45,2,2,{
+c_tower4,189,40,4 script clt031r WARPNPC,2,2,{
switch(rand(4)) {
case 0: warp "c_tower2",228,267; end;
case 1: warp "alde_dun03",130,130; end;
diff --git a/npc/warps/dungeons/kh_dun.txt b/npc/warps/dungeons/kh_dun.txt
index 7396ee91b..eaee1171a 100644
--- a/npc/warps/dungeons/kh_dun.txt
+++ b/npc/warps/dungeons/kh_dun.txt
@@ -24,7 +24,7 @@ kh_dun01,63,7,0 warp kh_dun_02 1,1,kh_dun01,227,176
kh_dun01,232,176,0 warp kh_dun_03 1,1,kh_dun01,63,12
//Second Floor -> First floor Random warp
-kh_dun02,43,195,0 script kh_dun04 45,1,1,{
+kh_dun02,43,195,0 script kh_dun04 WARPNPC,1,1,{
OnTouch:
if (rand(1,2) == 1) {
warp "kh_dun01",41,206;
diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt
index e95d2fe57..b0345b447 100644
--- a/npc/warps/dungeons/lhz_dun.txt
+++ b/npc/warps/dungeons/lhz_dun.txt
@@ -36,7 +36,7 @@ lhz_dun01,149,9,0 warp lhz_dun3-1 1,1,lhz_dun02,153,19
lhz_dun02,146,19,0 warp lhz_dun3-2 1,1,lhz_dun01,144,9
lhz_dun01,18,145,0 warp lhz_dun4-1 1,1,lhz_dun02,17,150
lhz_dun02,17,156,0 warp lhz_dun4-2 1,1,lhz_dun01,18,150
-lhz_dun02,149,149,4 script lhz_dun5-1 45,2,2,{
+lhz_dun02,149,149,4 script lhz_dun5-1 WARPNPC,2,2,{
OnTouch:
if ((Upper != 1 && BaseLevel<95) || (Upper == 1 && BaseLevel<90)) {
warp "lhz_dun02",145,149;
@@ -50,7 +50,7 @@ lhz_dun03,139,137,0 warp lhz_dun5-2 1,1,lhz_dun02,149,142
//--------------------------Sewer Pipe--------------------------
-lighthalzen,313,301,0 script Sewer Pipe#lt 111,{
+lighthalzen,313,301,0 script Sewer Pipe#lt HIDDEN_NPC,{
if (MISC_QUEST&512) {
mes "^3355FFYou found some sort";
mes "of large sewage pipe.";
@@ -88,54 +88,54 @@ lhz_cube,177,96,0 warp lhzcube4 1,1,lighthalzen,310,302
// -3 are warps facing west.
// -4 are warps facing north.
//----------------- Room 66 74 -------------------------------
-lhz_cube,74,74,0 script cubew01-1 45,1,1,{
+lhz_cube,74,74,0 script cubew01-1 WARPNPC,1,1,{
callfunc "randomw";
end;
}
lhz_cube,66,67,0 warp cubew01-2 2,2,lhz_cube,10,18
-lhz_cube,59,74,0 script cubew01-3 45,1,1,{
+lhz_cube,59,74,0 script cubew01-3 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-lhz_cube,66,82,0 script cubew01-4 45,1,1,{
+lhz_cube,66,82,0 script cubew01-4 WARPNPC,1,1,{
callfunc "randomw";
end;
}
//----------------- Room 66 136 ------------------------------
lhz_cube,74,136,0 warp cubew02-1 2,2,lhz_cube,10,193
-lhz_cube,66,129,0 script cubew02-2 45,1,1,{
+lhz_cube,66,129,0 script cubew02-2 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-lhz_cube,59,136,0 script cubew02-3 45,1,1,{
+lhz_cube,59,136,0 script cubew02-3 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-lhz_cube,66,144,0 script cubew02-4 45,1,1,{
+lhz_cube,66,144,0 script cubew02-4 WARPNPC,1,1,{
callfunc "randomw";
end;
}
//----------------- Room 67 193 ------------------------------
-lhz_cube,74,192,0 script cubew03-1 45,1,1,{
+lhz_cube,74,192,0 script cubew03-1 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-lhz_cube,67,185,0 script cubew03-2 45,1,1,{
+lhz_cube,67,185,0 script cubew03-2 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-lhz_cube,59,192,0 script cubew03-3 45,1,1,{
+lhz_cube,59,192,0 script cubew03-3 WARPNPC,1,1,{
callfunc "randomw";
end;
}
lhz_cube,67,200,0 warp cubew03-4 2,2,lhz_cube,10,136
//----------------- Room 66 18 -------------------------------
-lhz_cube,74,18,0 script cubew04-1 45,1,1,{
+lhz_cube,74,18,0 script cubew04-1 WARPNPC,1,1,{
callfunc "randomw";
end;
}
lhz_cube,66,11,0 warp cubew04-2 2,2,lhz_cube,10,18
-lhz_cube,59,18,0 script cubew04-3 45,1,1,{
+lhz_cube,59,18,0 script cubew04-3 WARPNPC,1,1,{
callfunc "randomw";
end;
}
@@ -143,61 +143,61 @@ lhz_cube,66,26,0 warp cubew04-4 2,2,lhz_cube,123,18
//----------------- Room 66 18 -------------------------------
lhz_cube,18,18,0 warp cubew05-1 2,2,lhz_cube,10,193
lhz_cube,10,11,0 warp cubew05-2 2,2,lhz_cube,123,18
-lhz_cube,3,18,0 script cubew05-3 45,1,1,{
+lhz_cube,3,18,0 script cubew05-3 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-lhz_cube,10,26,0 script cubew05-4 45,1,1,{
+lhz_cube,10,26,0 script cubew05-4 WARPNPC,1,1,{
callfunc "randomw";
end;
}
//----------------- Room 10 74 -------------------------------
-lhz_cube,18,74,0 script cubew06-1 45,1,1,{
+lhz_cube,18,74,0 script cubew06-1 WARPNPC,1,1,{
callfunc "randomw";
end;
}
lhz_cube,10,67,0 warp cubew06-2 2,2,lhz_cube,123,18
lhz_cube,3,74,0 warp cubew06-3 2,2,lhz_cube,66,18
-lhz_cube,10,82,0 script cubew06-4 45,1,1,{
+lhz_cube,10,82,0 script cubew06-4 WARPNPC,1,1,{
callfunc "randomw";
end;
}
//----------------- Room 10 136 ------------------------------
lhz_cube,18,136,0 warp cubew07-1 2,2,lhz_cube,10,74
-lhz_cube,10,129,0 script cubew07-2 45,1,1,{
+lhz_cube,10,129,0 script cubew07-2 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-lhz_cube,3,136,0 script cubew07-3 45,1,1,{
+lhz_cube,3,136,0 script cubew07-3 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-lhz_cube,10,144,0 script cubew07-4 45,1,1,{
+lhz_cube,10,144,0 script cubew07-4 WARPNPC,1,1,{
callfunc "randomw";
end;
}
//----------------- Room 10 193 ------------------------------
-lhz_cube,18,192,0 script cubew08-1 45,1,1,{
+lhz_cube,18,192,0 script cubew08-1 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-lhz_cube,10,185,0 script cubew08-2 45,1,1,{
+lhz_cube,10,185,0 script cubew08-2 WARPNPC,1,1,{
callfunc "randomw";
end;
}
lhz_cube,3,192,0 warp cubew08-3 2,2,lhz_cube,10,74
lhz_cube,10,200,0 warp cubew08-4 2,2,lhz_cube,66,18
//----------------- Room 123 18 ------------------------------
-lhz_cube,130,18,0 script cubew09-1 45,1,1,{
+lhz_cube,130,18,0 script cubew09-1 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-lhz_cube,123,11,0 script cubew09-2 45,1,1,{
+lhz_cube,123,11,0 script cubew09-2 WARPNPC,1,1,{
callfunc "randomw";
end;
}
lhz_cube,115,18,0 warp cubew09-3 2,2,lhz_cube,248,184
-lhz_cube,123,26,0 script cubew09-4 45,1,1,{
+lhz_cube,123,26,0 script cubew09-4 WARPNPC,1,1,{
callfunc "randomw";
end;
}
diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt
index 451bdc62b..f9a195d06 100644
--- a/npc/warps/dungeons/mosk_dun.txt
+++ b/npc/warps/dungeons/mosk_dun.txt
@@ -17,7 +17,7 @@ mosk_fild02,190,257,0 warp moscoviawarp0401 1,1,mosk_dun01,189,45
mosk_dun01,189,42,0 warp moscoviawarp0501 1,1,mosk_fild02,190,254
mosk_in,215,36,0 warp babayagaout 1,1,mosk_dun02,53,217
-mosk_dun02,53,220,4 script #babayagain 45,1,1,{
+mosk_dun02,53,220,4 script #babayagain WARPNPC,1,1,{
end;
OnTouch:
if (mos_nowinter == 11) {
@@ -115,7 +115,7 @@ OnTouch:
}
}
-mosk_dun02,53,215,3 script Soldier1#mos 966,{
+mosk_dun02,53,215,3 script Soldier1#mos 4_M_RUSKNIGHT,{
mes "[Soldier]";
mes "We're the Csar's soldiers.";
mes "We're called out for emergencies,";
@@ -131,7 +131,7 @@ OnEnable:
end;
}
-mosk_dun02,50,217,3 script Soldier2#mos 966,{
+mosk_dun02,50,217,3 script Soldier2#mos 4_M_RUSKNIGHT,{
mes "[Soldier]";
mes "We're the Csar's soldiers.";
mes "We're called out for emergencies,";
@@ -148,7 +148,7 @@ OnEnable:
}
-mosk_dun02,56,217,5 script Soldier3#mos 966,{
+mosk_dun02,56,217,5 script Soldier3#mos 4_M_RUSKNIGHT,{
mes "[Soldier]";
mes "We're the Csar's soldiers.";
mes "We're called out for emergencies,";
@@ -164,14 +164,14 @@ OnEnable:
end;
}
-mosk_dun01,170,164,3 script Milestone#1 111,{
+mosk_dun01,170,164,3 script Milestone#1 HIDDEN_NPC,{
mes "- There is writing on a big rock. -";
next;
mes "^3131FF- Those who serve the Sun will die, Go to the North. -^000000";
close;
}
-mosk_dun01,207,276,3 script Milestone#1-2 111,{
+mosk_dun01,207,276,3 script Milestone#1-2 HIDDEN_NPC,{
mes "- There is writing on a big rock. -";
next;
mes "^3131FF- Those who advance may get hurt but are courageous of heart and those who move back will remain safe.";
@@ -187,7 +187,7 @@ mosk_dun01,207,276,3 script Milestone#1-2 111,{
close;
}
-mosk_dun01,264,191,3 script Milestone#1-3 111,{
+mosk_dun01,264,191,3 script Milestone#1-3 HIDDEN_NPC,{
mes "- There is writing on a big rock. -";
next;
mes "^3131FF- Those who advance may get hurt but are brave of heart and those who move back will remain safe.";
@@ -203,7 +203,7 @@ mosk_dun01,264,191,3 script Milestone#1-3 111,{
close;
}
-mosk_dun02,168,28,3 script Milestone#2-1 111,{
+mosk_dun02,168,28,3 script Milestone#2-1 HIDDEN_NPC,{
mes "- There is writing on a big rock. -";
next;
mes "^3131FF- Those who advance may get hurt but are valorous of heart and those who move back will remain safe.";
@@ -219,7 +219,7 @@ mosk_dun02,168,28,3 script Milestone#2-1 111,{
close;
}
-mosk_dun02,268,117,3 script Milestone#2-3 111,{
+mosk_dun02,268,117,3 script Milestone#2-3 HIDDEN_NPC,{
mes "- There is writing on a big rock. -";
next;
mes "^3131FF- Those who step forward will gain honor but may die, those who step backward will have courage but may still get hurt.";
@@ -235,7 +235,7 @@ mosk_dun02,268,117,3 script Milestone#2-3 111,{
close;
}
-mosk_dun03,27,131,3 script Milestone#3-2 111,{
+mosk_dun03,27,131,3 script Milestone#3-2 HIDDEN_NPC,{
mes "- There is writing on a big rock. -";
next;
mes "^3131FF- Those who stay may die but will gain honor, those who go back may get hurt but will gain courage.";
@@ -251,7 +251,7 @@ mosk_dun03,27,131,3 script Milestone#3-2 111,{
close;
}
-mosk_dun03,119,46,3 script Milestone#3-1 111,{
+mosk_dun03,119,46,3 script Milestone#3-1 HIDDEN_NPC,{
mes "There is writing on a big rock.";
next;
mes "^3131FF- Those who stay may die but will gain honor, those who go back may get hurt but will gain courage.";
@@ -267,14 +267,14 @@ mosk_dun03,119,46,3 script Milestone#3-1 111,{
close;
}
-mosk_dun01,194,43,3 script Milestone#1-1 111,{
+mosk_dun01,194,43,3 script Milestone#1-1 HIDDEN_NPC,{
mes "- There is writing on a big rock. -";
next;
mes "- If you want to protect your life, go back -";
close;
}
-mosk_fild02,198,53,3 script Ship#mos_dun 111,{
+mosk_fild02,198,53,3 script Ship#mos_dun HIDDEN_NPC,{
mes "- You find a ship at anchor. -";
next;
if(select("Take the ship and go back to the village.:Explore more.") == 1) {
diff --git a/npc/warps/dungeons/pay_dun.txt b/npc/warps/dungeons/pay_dun.txt
index b34700446..e6c041188 100644
--- a/npc/warps/dungeons/pay_dun.txt
+++ b/npc/warps/dungeons/pay_dun.txt
@@ -18,7 +18,7 @@ pay_dun01,286,25,0 warp payd02 2,7,pay_dun02,19,63
pay_dun02,137,128,0 warp payd03 4,1,pay_dun03,155,159
pay_dun02,16,63,0 warp payd02-1 2,7,pay_dun01,283,28
pay_dun03,155,161,0 warp payd03-1 2,1,pay_dun02,137,126
-pay_dun03,127,62,4 script payd04r 45,2,2,{
+pay_dun03,127,62,4 script payd04r WARPNPC,2,2,{
switch(rand(4)) {
case 0: warp "pay_dun04",201,204; end;
case 1: warp "pay_dun04",189,43; end;
diff --git a/npc/warps/dungeons/prt_maze.txt b/npc/warps/dungeons/prt_maze.txt
index 7df4ac094..03ca59de5 100644
--- a/npc/warps/dungeons/prt_maze.txt
+++ b/npc/warps/dungeons/prt_maze.txt
@@ -106,7 +106,7 @@ prt_maze02,100,182,0 warp mazewarp5202 1,1,prt_maze03,182,88 /*To No.3-15*/
prt_maze03,22,194,0 warp mazewarp5301 1,1,prt_maze03,175,48 /*To No.3-20*/
prt_maze03,5,186,0 warp mazewarp5302 1,1,prt_maze03,151,134 /*To No.3-9*/
//3rd Floor No.02
-prt_maze03,58,194,0 script #mazewarp5303 45,1,1,{
+prt_maze03,58,194,0 script #mazewarp5303 WARPNPC,1,1,{
switch(rand(4)) {
case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/
case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/
@@ -164,7 +164,7 @@ prt_maze03,14,74,0 warp mazewarp5336 1,1,prt_maze03,63,111 /*To No.3-12*/
prt_maze03,14,45,0 warp mazewarp5337 1,1,prt_maze03,88,174 /*To No.3-3*/
prt_maze03,5,58,0 warp mazewarp5338 1,1,prt_maze03,191,15 /*To No.3-25*/
// 3rd Floor No.17
-prt_maze03,74,74,0 script #mazewarp5339 45,1,1,{
+prt_maze03,74,74,0 script #mazewarp5339 WARPNPC,1,1,{
switch(rand(4)) {
case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/
case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/
@@ -180,7 +180,7 @@ prt_maze03,114,56,0 warp mazewarp5343 1,1,prt_maze03,8,140 /*To No.3-6*/
prt_maze03,85,56,0 warp mazewarp5344 1,1,prt_maze03,176,31 /*To No.3-25*/
// 3rd Floor No.19
prt_maze03,137,74,0 warp mazewarp5345 1,1,prt_maze03,102,168 /*To No.3-3*/
-prt_maze03,139,45,0 script #mazewarp5346 45,1,1,{
+prt_maze03,139,45,0 script #mazewarp5346 WARPNPC,1,1,{
switch(rand(4)) {
case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/
case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/
@@ -204,7 +204,7 @@ prt_maze03,99,34,0 warp mazewarp5355 1,1,prt_maze03,98,151 /*To No.3-8*/
prt_maze03,114,22,0 warp mazewarp5356 1,1,prt_maze03,104,71 /*To No.3-18*/
prt_maze03,85,13,0 warp mazewarp5357 1,1,prt_maze03,23,8 /*To No.3-21*/
// 3rd Floor No.24
-prt_maze03,154,22,0 script #mazewarp5358 45,1,1,{
+prt_maze03,154,22,0 script #mazewarp5358 WARPNPC,1,1,{
switch(rand(4)) {
case 0: warp "prt_maze03",98,151; end; /*To No.3-8*/
case 1: warp "prt_maze03",137,128; end; /*To No.3-9*/
diff --git a/npc/warps/dungeons/ra_san.txt b/npc/warps/dungeons/ra_san.txt
index 0a31d6e14..d6757cf6a 100644
--- a/npc/warps/dungeons/ra_san.txt
+++ b/npc/warps/dungeons/ra_san.txt
@@ -14,7 +14,7 @@
//= Added Dungeon exit back into temple.
//============================================================
-ra_san01,139,13,0 script sanctuary01 45,1,1,{
+ra_san01,139,13,0 script sanctuary01 WARPNPC,1,1,{
if (ra_tem_q == 21) { warp "que_san04",119,110; end; }
switch(rand(3)) {
case 1: warp "ra_san02",213,275; break;
diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index a210eb12b..3a5fa7754 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -15,7 +15,7 @@
//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//============================================================
-hu_fild05,168,304,0 script Column#abyss1 111,{
+hu_fild05,168,304,0 script Column#abyss1 HIDDEN_NPC,{
mes "^3355FFThere are 3 oddly";
mes "shaped grooves on";
@@ -84,7 +84,7 @@ hu_fild05,168,304,0 script Column#abyss1 111,{
close;
}
-hu_fild05,171,211,0 script Column#abyss2 111,1,1,{
+hu_fild05,171,211,0 script Column#abyss2 HIDDEN_NPC,1,1,{
mes "^3355FFThis column looks";
mes "very similar to the";
@@ -144,7 +144,7 @@ hu_fild05,171,211,0 script Column#abyss2 111,1,1,{
}
}
-hu_fild05,196,210,1 script AbyssWarp 45,2,2,{
+hu_fild05,196,210,1 script AbyssWarp WARPNPC,2,2,{
OnInit:
disablenpc "AbyssWarp";
diff --git a/npc/warps/fields/glastheim.txt b/npc/warps/fields/glastheim.txt
index b40cac0b5..1edc677e6 100644
--- a/npc/warps/fields/glastheim.txt
+++ b/npc/warps/fields/glastheim.txt
@@ -51,7 +51,7 @@ gl_knt02,10,138,0 warp gl14-1 1,1,gl_knt01,7,148
gl_knt02,157,292,0 warp gl16-1 1,1,gl_knt01,150,286
gl_knt02,289,138,0 warp gl17-1 1,1,gl_knt01,292,144
gl_prison,149,183,0 warp gl18-1 1,1,gl_prison1,150,14
-gl_prison,11,70,0 script gl18-2 45,1,1,{
+gl_prison,11,70,0 script gl18-2 WARPNPC,1,1,{
switch(rand(4)) {
case 0: warp "gl_cas01",163,193; end;
case 1: warp "gl_cas01",238,192; end;
diff --git a/npc/warps/fields/jawaii.txt b/npc/warps/fields/jawaii.txt
index d1945ffad..d59563853 100644
--- a/npc/warps/fields/jawaii.txt
+++ b/npc/warps/fields/jawaii.txt
@@ -19,6 +19,6 @@ jawaii_in,113,61,0 warp jawaiiwarp002 1,1,jawaii,138,202
jawaii_in,133,107,0 warp jawaiiwarp003 1,1,jawaii,111,199
jawaii_in,88,117,0 warp jawaiiwarp004 1,1,jawaii,109,186
jawaii,192,215,0 warp jawaiiwarp005 1,1,jawaii_in,28,94
-jawaii_in,27,91,4 script jawaiiwarp006 45,1,1,{
+jawaii_in,27,91,4 script jawaiiwarp006 WARPNPC,1,1,{
if (getpartnerid() > 0) warp "jawaii",192,218; else warp "jawaii_in",27,94;
}
diff --git a/npc/warps/guildcastles.txt b/npc/warps/guildcastles.txt
index 0b8dc0548..a3d00cafb 100644
--- a/npc/warps/guildcastles.txt
+++ b/npc/warps/guildcastles.txt
@@ -366,7 +366,7 @@ aldeg_cas04,21,123,0 warp aldeg-4-11_aldeg-4-12 1,1,aldeg_cas04,125,168
aldeg_cas04,121,168,0 warp aldeg-4-12_aldeg-4-11 1,1,aldeg_cas04,25,123
aldeg_cas04,156,210,0 warp aldeg-4-13_aldeg-4-5 1,1,aldeg_cas04,169,97
aldeg_cas04,108,210,0 warp aldeg-4-14_aldeg-4-4 1,1,aldeg_cas04,186,92
-aldeg_cas04,132,231,0 script aldeg-4-15_aldeg-4- 45,1,1,{
+aldeg_cas04,132,231,0 script aldeg-4-15_aldeg-4- WARPNPC,1,1,{
OnTouch:
switch (rand(1,5)) {
diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt
index efc2e42da..5ab756c96 100644
--- a/npc/warps/other/arena.txt
+++ b/npc/warps/other/arena.txt
@@ -61,7 +61,7 @@ force_1-2,33,178,0 warp force_10_09 1,1,force_1-2,59,178
// GM Control Panel
//============================================================
-sec_in02,79,180,3 script #arenacontrol 81,{
+sec_in02,79,180,3 script #arenacontrol 4_DOG01,{
set .@i, callfunc("F_GM_NPC",1357,0);
if (.@i == -1) {
mes "Error!";
diff --git a/src/map/npc.c b/src/map/npc.c
index ff95cf82d..e5a72df83 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2013,6 +2013,67 @@ void npc_parsename(struct npc_data* nd, const char* name, const char* start, con
}
}
+// Parse View
+// Support for using Constants in place of NPC View IDs.
+int npc_parseview(const char* w4, const char* start, const char* buffer, const char* filepath) {
+ int num, val, i = 0;
+ char viewid[1024];
+
+ // Check if view (w4) has a comma (Work around for Duplicate types).
+ if(strstr(w4, ",") != NULL) {
+ num = strstr(w4, ",") - w4;
+ strncpy(viewid, w4, num); // Strip view from w4.
+ viewid[num] = 0;
+ }else{
+ strcpy(viewid, w4);
+ }
+
+ // Remove any in-line whitspacing / comments
+ while (viewid[i] != '\0') {
+ if (isspace(viewid[i]))
+ {
+ viewid[i] = 0;
+ break;
+ }
+
+ viewid[i] = viewid[i];
+ i++;
+ }
+
+ // Check if view is not an ID (only numbers).
+ if(!npc->viewisid(viewid))
+ {
+ // Check if constant exists and get its value.
+ if(!script->get_constant(viewid, &val)) {
+ ShowWarning("npc_parseview: Invalid NPC constant '%s' specified in file '%s', line'%d'. Defaulting to INVISIBLE_CLASS. \n", viewid, filepath, strline(buffer,start-buffer));
+ val = INVISIBLE_CLASS;
+ }
+ } else {
+ // NPC has ID specified for view.
+ val = atoi(w4);
+ }
+
+ if(val == -1)
+ val = INVISIBLE_CLASS;
+
+ return val;
+}
+
+// View is ID
+// Checks if given view is an ID or constant.
+bool npc_viewisid(const char * viewid)
+{
+ if(atoi(viewid) != -1)
+ {
+ // Loop through view, looking for non-numeric character.
+ while (*viewid) {
+ if (isdigit(*viewid++) == 0) return false;
+ }
+ }
+
+ return true;
+}
+
//Add then display an npc warp on map
struct npc_data* npc_add_warp(char* name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y) {
int i, flag = 0;
@@ -2220,7 +2281,7 @@ const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const char* s
nd->bl.y = y;
nd->bl.id = npc->get_new_npc_id();
npc->parsename(nd, w3, start, buffer, filepath);
- nd->class_ = m==-1?-1:atoi(w4);
+ nd->class_ = m == -1 ? -1 : npc->parseview(w4, start, buffer, filepath);
nd->speed = 200;
++npc_shop;
@@ -2383,14 +2444,13 @@ const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, const char*
CREATE(nd, struct npc_data, 1);
- if( sscanf(w4, "%d,%d,%d", &class_, &xs, &ys) == 3 )
+ if( sscanf(w4, "%*[^,],%d,%d", &xs, &ys) == 2 )
{// OnTouch area defined
nd->u.scr.xs = xs;
nd->u.scr.ys = ys;
}
else
{// no OnTouch area
- class_ = atoi(w4);
nd->u.scr.xs = -1;
nd->u.scr.ys = -1;
}
@@ -2401,7 +2461,7 @@ const char* npc_parse_script(char* w1, char* w2, char* w3, char* w4, const char*
nd->bl.y = y;
npc->parsename(nd, w3, start, buffer, filepath);
nd->bl.id = npc->get_new_npc_id();
- nd->class_ = class_;
+ nd->class_ = m == -1 ? -1 : npc->parseview(w4, start, buffer, filepath);
nd->speed = 200;
nd->u.scr.script = scriptroot;
nd->u.scr.label_list = label_list;
@@ -2530,7 +2590,7 @@ const char* npc_parse_duplicate(char* w1, char* w2, char* w3, char* w4, const ch
nd->bl.y = y;
npc->parsename(nd, w3, start, buffer, filepath);
nd->bl.id = npc->get_new_npc_id();
- nd->class_ = class_;
+ nd->class_ = m == -1 ? -1 : npc->parseview(w4, start, buffer, filepath);
nd->speed = 200;
nd->src_id = src_id;
nd->bl.type = BL_NPC;
@@ -4045,6 +4105,8 @@ void npc_defaults(void) {
npc->addsrcfile = npc_addsrcfile;
npc->delsrcfile = npc_delsrcfile;
npc->parsename = npc_parsename;
+ npc->parseview = npc_parseview;
+ npc->viewisid = npc_viewisid;
npc->add_warp = npc_add_warp;
npc->parse_warp = npc_parse_warp;
npc->parse_shop = npc_parse_shop;
diff --git a/src/map/npc.h b/src/map/npc.h
index e1ec6e5e4..5ec201e55 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -92,7 +92,7 @@ enum actor_classes {
#define MAX_NPC_CLASS 1000
// New NPC range
#define MAX_NPC_CLASS2_START 10000
-#define MAX_NPC_CLASS2_END 10049
+#define MAX_NPC_CLASS2_END 10070
//Checks if a given id is a valid npc id. [Skotlex]
//Since new npcs are added all the time, the max valid value is the one before the first mob (Scorpion = 1001)
@@ -197,6 +197,8 @@ struct npc_interface {
void (*addsrcfile) (const char *name);
void (*delsrcfile) (const char *name);
void (*parsename) (struct npc_data *nd, const char *name, const char *start, const char *buffer, const char *filepath);
+ int (*parseview) (const char *w4, const char *start, const char *buffer, const char *filepath);
+ bool (*viewisid) (const char *viewid);
struct npc_data* (*add_warp) (char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y);
const char* (*parse_warp) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath);
const char* (*parse_shop) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath);