diff --git a/npc/re/mapflag/nobranch.txt b/npc/re/mapflag/nobranch.txt index 5d8611b213..e5f4264c96 100644 --- a/npc/re/mapflag/nobranch.txt +++ b/npc/re/mapflag/nobranch.txt @@ -222,3 +222,81 @@ lasa_dun_q mapflag nobranch // Soul Reaper Job Change 1@soul mapflag nobranch + +// ep17.1 +1@cor mapflag nobranch +1@os_a mapflag nobranch +1@os_b mapflag nobranch +1@rgsr mapflag nobranch +pub_cat mapflag nobranch +rgsr_in mapflag nobranch + +// ep17.2 +1@bamn mapflag nobranch +1@bamq mapflag nobranch +1@ghg mapflag nobranch +1@herbs mapflag nobranch +1@lost mapflag nobranch +ba_in01 mapflag nobranch +1@odin mapflag nobranch + +// 4th jobs change +1@4win mapflag nobranch +1@4mag mapflag nobranch +1@4mst mapflag nobranch +1@4sac mapflag nobranch +1@4tro mapflag nobranch +1@4inq mapflag nobranch +1@4cdn mapflag nobranch +1@4igd mapflag nobranch +1@4drk mapflag nobranch +job4_bio mapflag nobranch +job4_mag mapflag nobranch +job4_tro mapflag nobranch + +// Gefen Night Arena +1@ge_sn mapflag nobranch + +// Traces of heroes +1@mjo1 mapflag nobranch +1@mjo2 mapflag nobranch +1@spa2 mapflag nobranch + +// Instance Thanatos Tower +1@thts mapflag nobranch +2@thts mapflag nobranch +3@thts mapflag nobranch +4@thts mapflag nobranch +5@thts mapflag nobranch +6@thts mapflag nobranch +7@thts mapflag nobranch +8@thts mapflag nobranch + +// Glastheim Challenge Mode +1@gl_he mapflag nobranch +1@gl_he2 mapflag nobranch + +// EDDA +1@gl_prq mapflag nobranch +1@gol1 mapflag nobranch +1@gol2 mapflag nobranch + +// 2018 Halloween +1@halo mapflag nobranch + +// Constellation Tower +1@ch_t mapflag nobranch +2@ch_t mapflag nobranch +3@ch_t mapflag nobranch + +// Episode 18: Direction of Prayer +1@adv mapflag nobranch +1@advs mapflag nobranch +1@nyr mapflag nobranch +1@oz mapflag nobranch +1@tcamp mapflag nobranch +2@nyr mapflag nobranch +que_thr mapflag nobranch + +// Sunken tower +1@ch_u mapflag nobranch diff --git a/npc/re/mapflag/nomemo.txt b/npc/re/mapflag/nomemo.txt index 17ba2e9fbd..d86d46a57e 100644 --- a/npc/re/mapflag/nomemo.txt +++ b/npc/re/mapflag/nomemo.txt @@ -268,3 +268,111 @@ com_d02_i mapflag nomemo // Star Emperor Job Change star_frst mapflag nomemo star_in mapflag nomemo + +// ep17.1 +1@cor mapflag nomemo +1@os_a mapflag nomemo +1@os_b mapflag nomemo +1@rgsr mapflag nomemo +mag_dun03 mapflag nomemo +pub_cat mapflag nomemo +rgsr_in mapflag nomemo + +// ep17.2 +1@bamn mapflag nomemo +1@bamq mapflag nomemo +1@ghg mapflag nomemo +1@herbs mapflag nomemo +1@lost mapflag nomemo +ba_in01 mapflag nomemo +1@odin mapflag nomemo + +// Illusion of Labyrinth +prt_mz03_i mapflag nomemo + +// Illusion of Underwater +iz_d04_i mapflag nomemo +iz_d05_i mapflag nomemo + +// 4th jobs change +1@4win mapflag nomemo +1@4mag mapflag nomemo +1@4mst mapflag nomemo +1@4sac mapflag nomemo +1@4tro mapflag nomemo +1@4inq mapflag nomemo +1@4cdn mapflag nomemo +1@4igd mapflag nomemo +1@4drk mapflag nomemo +job4_bio mapflag nomemo +job4_mag mapflag nomemo +job4_tro mapflag nomemo + +// Gefen Night Arena +1@ge_sn mapflag nomemo + +// Traces of heroes +1@mjo1 mapflag nomemo +1@mjo2 mapflag nomemo +1@spa2 mapflag nomemo + +// Instance Thanatos Tower +1@thts mapflag nomemo +2@thts mapflag nomemo +3@thts mapflag nomemo +4@thts mapflag nomemo +5@thts mapflag nomemo +6@thts mapflag nomemo +7@thts mapflag nomemo +8@thts mapflag nomemo + +// Glastheim Challenge Mode +1@gl_he mapflag nomemo +1@gl_he2 mapflag nomemo + +// EDDA +1@gl_prq mapflag nomemo +1@gol1 mapflag nomemo +1@gol2 mapflag nomemo + +// 2018 Halloween +1@halo mapflag nomemo + +// Constellation Tower +1@ch_t mapflag nomemo +2@ch_t mapflag nomemo +3@ch_t mapflag nomemo + +// Level 200 Expansion +ein_dun03 mapflag nomemo + +// Grade Enhancer +grademk mapflag nomemo + +// Level 250 Expansion +nif_dun01 mapflag nomemo +nif_dun02 mapflag nomemo + +// // Monster Invasion event +e_hugel mapflag nomemo + +// Training Ground outside Prontera +tra_fild mapflag nomemo + +// Episode 18: Direction of Prayer +1@adv mapflag nomemo +1@advs mapflag nomemo +1@nyr mapflag nomemo +1@oz mapflag nomemo +1@tcamp mapflag nomemo +2@nyr mapflag nomemo +oz_dun01 mapflag nomemo +oz_dun02 mapflag nomemo +que_thr mapflag nomemo +wolfvill mapflag nomemo + +// Sunken tower +1@ch_u mapflag nomemo + +// Illusion of Twins +ant_d02_i mapflag nomemo diff --git a/npc/re/mapflag/nopenalty.txt b/npc/re/mapflag/nopenalty.txt index 03d03c5e4f..2b6649de42 100644 --- a/npc/re/mapflag/nopenalty.txt +++ b/npc/re/mapflag/nopenalty.txt @@ -97,3 +97,5 @@ rockmi2 mapflag nopenalty lasagna mapflag nopenalty lasa_in01 mapflag nopenalty conch_in mapflag nopenalty + +wolfvill mapflag nopenalty diff --git a/npc/re/mapflag/nopvp.txt b/npc/re/mapflag/nopvp.txt index b58f0447df..3d89db4f50 100644 --- a/npc/re/mapflag/nopvp.txt +++ b/npc/re/mapflag/nopvp.txt @@ -107,3 +107,4 @@ ecl_in04 mapflag pvp off ecl_hub01 mapflag pvp off que_avan01 mapflag pvp off dali mapflag pvp off +wolfvill mapflag pvp off diff --git a/npc/re/mapflag/nosave.txt b/npc/re/mapflag/nosave.txt index 42bf65c7c2..ecfd1c0a9a 100644 --- a/npc/re/mapflag/nosave.txt +++ b/npc/re/mapflag/nosave.txt @@ -175,3 +175,74 @@ rockmi2 mapflag nosave SavePoint // Soul Reaper Job Change 1@soul mapflag nosave SavePoint + +// ep17.1 +1@cor mapflag nosave SavePoint +1@os_a mapflag nosave SavePoint +1@os_b mapflag nosave SavePoint +1@rgsr mapflag nosave SavePoint + +// ep17.2 +1@bamn mapflag nosave SavePoint +1@bamq mapflag nosave SavePoint +1@ghg mapflag nosave SavePoint +1@herbs mapflag nosave SavePoint +1@lost mapflag nosave SavePoint +1@odin mapflag nosave SavePoint + +// 4th jobs change +1@4win mapflag nosave SavePoint +1@4mag mapflag nosave SavePoint +1@4mst mapflag nosave SavePoint +1@4sac mapflag nosave SavePoint +1@4tro mapflag nosave SavePoint +1@4inq mapflag nosave SavePoint +1@4cdn mapflag nosave SavePoint +1@4igd mapflag nosave SavePoint +1@4drk mapflag nosave SavePoint + +// Gefen Night Arena +1@ge_sn mapflag nosave SavePoint + +// Traces of heroes +1@mjo1 mapflag nosave SavePoint +1@mjo2 mapflag nosave SavePoint +1@spa2 mapflag nosave SavePoint + +// Instance Thanatos Tower +1@thts mapflag nosave SavePoint +2@thts mapflag nosave SavePoint +3@thts mapflag nosave SavePoint +4@thts mapflag nosave SavePoint +5@thts mapflag nosave SavePoint +6@thts mapflag nosave SavePoint +7@thts mapflag nosave SavePoint +8@thts mapflag nosave SavePoint + +// Glastheim Challenge Mode +1@gl_he mapflag nosave SavePoint +1@gl_he2 mapflag nosave SavePoint + +// EDDA +1@gl_prq mapflag nosave SavePoint +1@gol1 mapflag nosave SavePoint +1@gol2 mapflag nosave SavePoint + +// 2018 Halloween +1@halo mapflag nosave SavePoint + +// Constellation Tower +1@ch_t mapflag nosave SavePoint +2@ch_t mapflag nosave SavePoint +3@ch_t mapflag nosave SavePoint + +// Episode 18: Direction of Prayer +1@adv mapflag nosave SavePoint +1@advs mapflag nosave SavePoint +1@nyr mapflag nosave SavePoint +1@oz mapflag nosave SavePoint +1@tcamp mapflag nosave SavePoint +2@nyr mapflag nosave SavePoint + +// Sunken tower +1@ch_u mapflag nosave SavePoint diff --git a/npc/re/mapflag/noteleport.txt b/npc/re/mapflag/noteleport.txt index d92e1e07e7..a0d7a9ecae 100644 --- a/npc/re/mapflag/noteleport.txt +++ b/npc/re/mapflag/noteleport.txt @@ -217,21 +217,156 @@ conch_in mapflag noteleport // Chicken Mode Nightmare Glastheim 1@gl_k2 mapflag noteleport 2@gl_k2 mapflag noteleport +1@gl_k2 mapflag monster_noteleport +2@gl_k2 mapflag monster_noteleport // Chicken Mode Horror Toy Factory 1@xm_d2 mapflag noteleport +1@xm_d2 mapflag monster_noteleport // Suspicious shipwreck 1@tre mapflag noteleport +1@tre mapflag monster_noteleport // Poring Town 1@begi mapflag noteleport +1@begi mapflag monster_noteleport // Volcanic island Korodo 1@crd mapflag noteleport +1@crd mapflag monster_noteleport // Noodles Festival July 1@drdo mapflag noteleport +1@drdo mapflag monster_noteleport // Soul Reaper Job Change 1@soul mapflag noteleport +1@soul mapflag monster_noteleport + +// ep17.1 +1@cor mapflag noteleport +1@os_a mapflag noteleport +1@os_b mapflag noteleport +1@rgsr mapflag noteleport +pub_cat mapflag noteleport +rgsr_in mapflag noteleport +1@cor mapflag monster_noteleport +1@os_a mapflag monster_noteleport +1@os_b mapflag monster_noteleport +1@rgsr mapflag monster_noteleport + +// ep17.2 +1@bamn mapflag noteleport +1@bamq mapflag noteleport +1@ghg mapflag noteleport +1@herbs mapflag noteleport +1@lost mapflag noteleport +ba_in01 mapflag noteleport +1@odin mapflag noteleport +1@bamn mapflag monster_noteleport +1@bamq mapflag monster_noteleport +1@ghg mapflag monster_noteleport +1@herbs mapflag monster_noteleport +1@lost mapflag monster_noteleport +1@odin mapflag monster_noteleport + +// 4th jobs change +1@4win mapflag noteleport +1@4mag mapflag noteleport +1@4mst mapflag noteleport +1@4sac mapflag noteleport +1@4tro mapflag noteleport +1@4inq mapflag noteleport +1@4cdn mapflag noteleport +1@4igd mapflag noteleport +1@4drk mapflag noteleport +job4_bio mapflag noteleport +job4_mag mapflag noteleport +job4_tro mapflag noteleport +1@4win mapflag monster_noteleport +1@4mag mapflag monster_noteleport +1@4mst mapflag monster_noteleport +1@4sac mapflag monster_noteleport +1@4tro mapflag monster_noteleport +1@4inq mapflag monster_noteleport +1@4cdn mapflag monster_noteleport +1@4igd mapflag monster_noteleport +1@4drk mapflag monster_noteleport + +// Gefen Night Arena +1@ge_sn mapflag noteleport +1@ge_sn mapflag monster_noteleport + +// Traces of heroes +1@mjo1 mapflag noteleport +1@mjo2 mapflag noteleport +1@spa2 mapflag noteleport +1@mjo1 mapflag monster_noteleport +1@mjo2 mapflag monster_noteleport +1@spa2 mapflag monster_noteleport + +// Instance Thanatos Tower +1@thts mapflag noteleport +2@thts mapflag noteleport +3@thts mapflag noteleport +4@thts mapflag noteleport +5@thts mapflag noteleport +6@thts mapflag noteleport +7@thts mapflag noteleport +8@thts mapflag noteleport +1@thts mapflag monster_noteleport +2@thts mapflag monster_noteleport +3@thts mapflag monster_noteleport +4@thts mapflag monster_noteleport +5@thts mapflag monster_noteleport +6@thts mapflag monster_noteleport +7@thts mapflag monster_noteleport +8@thts mapflag monster_noteleport + +// Glastheim Challenge Mode +1@gl_he mapflag noteleport +1@gl_he2 mapflag noteleport +1@gl_he mapflag monster_noteleport +1@gl_he2 mapflag monster_noteleport + +// EDDA +1@gl_prq mapflag noteleport +1@gol1 mapflag noteleport +1@gol2 mapflag noteleport +1@gl_prq mapflag monster_noteleport +1@gol1 mapflag monster_noteleport +1@gol2 mapflag monster_noteleport + +// 2018 Halloween +1@halo mapflag noteleport +1@halo mapflag monster_noteleport + +// Constellation Tower +1@ch_t mapflag noteleport +2@ch_t mapflag noteleport +3@ch_t mapflag noteleport +1@ch_t mapflag monster_noteleport +2@ch_t mapflag monster_noteleport +3@ch_t mapflag monster_noteleport + +// Episode 18: Direction of Prayer +1@adv mapflag noteleport +1@advs mapflag noteleport +1@nyr mapflag noteleport +1@oz mapflag noteleport +1@tcamp mapflag noteleport +2@nyr mapflag noteleport +que_thr mapflag noteleport +1@adv mapflag monster_noteleport +1@advs mapflag monster_noteleport +1@nyr mapflag monster_noteleport +1@oz mapflag monster_noteleport +1@tcamp mapflag monster_noteleport +2@nyr mapflag monster_noteleport + +// Sunken tower +1@ch_u mapflag noteleport +1@ch_u mapflag noteleport +1@ch_u mapflag monster_noteleport +1@ch_u mapflag monster_noteleport diff --git a/npc/re/mapflag/nowarpto.txt b/npc/re/mapflag/nowarpto.txt index d39e6ad93c..ae4ca3d780 100644 --- a/npc/re/mapflag/nowarpto.txt +++ b/npc/re/mapflag/nowarpto.txt @@ -197,3 +197,111 @@ com_d02_i mapflag nowarpto // Star Emperor Job Change star_frst mapflag nowarpto star_in mapflag nowarpto + +// ep17.1 +1@cor mapflag nowarpto +1@os_a mapflag nowarpto +1@os_b mapflag nowarpto +1@rgsr mapflag nowarpto +mag_dun03 mapflag nowarpto +pub_cat mapflag nowarpto +rgsr_in mapflag nowarpto + +// ep17.2 +1@bamn mapflag nowarpto +1@bamq mapflag nowarpto +1@ghg mapflag nowarpto +1@herbs mapflag nowarpto +1@lost mapflag nowarpto +ba_in01 mapflag nowarpto +1@odin mapflag nowarpto + +// Illusion of Labyrinth +prt_mz03_i mapflag nowarpto + +// Illusion of Underwater +iz_d04_i mapflag nowarpto +iz_d05_i mapflag nowarpto + +// 4th jobs change +1@4win mapflag nowarpto +1@4mag mapflag nowarpto +1@4mst mapflag nowarpto +1@4sac mapflag nowarpto +1@4tro mapflag nowarpto +1@4inq mapflag nowarpto +1@4cdn mapflag nowarpto +1@4igd mapflag nowarpto +1@4drk mapflag nowarpto +job4_bio mapflag nowarpto +job4_mag mapflag nowarpto +job4_tro mapflag nowarpto + +// Gefen Night Arena +1@ge_sn mapflag nowarpto + +// Traces of heroes +1@mjo1 mapflag nowarpto +1@mjo2 mapflag nowarpto +1@spa2 mapflag nowarpto + +// Instance Thanatos Tower +1@thts mapflag nowarpto +2@thts mapflag nowarpto +3@thts mapflag nowarpto +4@thts mapflag nowarpto +5@thts mapflag nowarpto +6@thts mapflag nowarpto +7@thts mapflag nowarpto +8@thts mapflag nowarpto + +// Glastheim Challenge Mode +1@gl_he mapflag nowarpto +1@gl_he2 mapflag nowarpto + +// EDDA +1@gl_prq mapflag nowarpto +1@gol1 mapflag nowarpto +1@gol2 mapflag nowarpto + +// 2018 Halloween +1@halo mapflag nowarpto + +// Constellation Tower +1@ch_t mapflag nowarpto +2@ch_t mapflag nowarpto +3@ch_t mapflag nowarpto + +// Level 200 Expansion +ein_dun03 mapflag nowarpto + +// Grade Enhancer +grademk mapflag nowarpto + +// Level 250 Expansion +nif_dun01 mapflag nowarpto +nif_dun02 mapflag nowarpto + +// // Monster Invasion event +e_hugel mapflag nowarpto + +// Training Ground outside Prontera +tra_fild mapflag nowarpto + +// Episode 18: Direction of Prayer +1@adv mapflag nowarpto +1@advs mapflag nowarpto +1@nyr mapflag nowarpto +1@oz mapflag nowarpto +1@tcamp mapflag nowarpto +2@nyr mapflag nowarpto +oz_dun01 mapflag nowarpto +oz_dun02 mapflag nowarpto +que_thr mapflag nowarpto +wolfvill mapflag nowarpto + +// Sunken tower +1@ch_u mapflag nowarpto + +// Illusion of Twins +ant_d02_i mapflag nowarpto diff --git a/npc/re/mapflag/partylock.txt b/npc/re/mapflag/partylock.txt index 1f2dc76a50..0710c2f99e 100644 --- a/npc/re/mapflag/partylock.txt +++ b/npc/re/mapflag/partylock.txt @@ -113,3 +113,74 @@ // Soul Reaper Job Change 1@soul mapflag partylock + +// ep17.1 +1@cor mapflag partylock +1@os_a mapflag partylock +1@os_b mapflag partylock +1@rgsr mapflag partylock + +// ep17.2 +1@bamn mapflag partylock +1@bamq mapflag partylock +1@ghg mapflag partylock +1@herbs mapflag partylock +1@lost mapflag partylock +1@odin mapflag partylock + +// 4th jobs change +1@4win mapflag partylock +1@4mag mapflag partylock +1@4mst mapflag partylock +1@4sac mapflag partylock +1@4tro mapflag partylock +1@4inq mapflag partylock +1@4cdn mapflag partylock +1@4igd mapflag partylock +1@4drk mapflag partylock + +// Gefen Night Arena +1@ge_sn mapflag partylock + +// Traces of heroes +1@mjo1 mapflag partylock +1@mjo2 mapflag partylock +1@spa2 mapflag partylock + +// Instance Thanatos Tower +1@thts mapflag partylock +2@thts mapflag partylock +3@thts mapflag partylock +4@thts mapflag partylock +5@thts mapflag partylock +6@thts mapflag partylock +7@thts mapflag partylock +8@thts mapflag partylock + +// Glastheim Challenge Mode +1@gl_he mapflag partylock +1@gl_he2 mapflag partylock + +// EDDA +1@gl_prq mapflag partylock +1@gol1 mapflag partylock +1@gol2 mapflag partylock + +// 2018 Halloween +1@halo mapflag partylock + +// Constellation Tower +1@ch_t mapflag partylock +2@ch_t mapflag partylock +3@ch_t mapflag partylock + +// Episode 18: Direction of Prayer +1@adv mapflag partylock +1@advs mapflag partylock +1@nyr mapflag partylock +1@oz mapflag partylock +1@tcamp mapflag partylock +2@nyr mapflag partylock + +// Sunken tower +1@ch_u mapflag partylock diff --git a/npc/re/mapflag/reset.txt b/npc/re/mapflag/reset.txt index 6b6ce125cd..8e0f5d9ea3 100644 --- a/npc/re/mapflag/reset.txt +++ b/npc/re/mapflag/reset.txt @@ -25,3 +25,4 @@ izlude_d mapflag reset malangdo mapflag reset malaya mapflag reset mora mapflag reset +wolfvill mapflag reset diff --git a/npc/re/mapflag/restricted.txt b/npc/re/mapflag/restricted.txt index ad8506fb45..651e3a4cd2 100644 --- a/npc/re/mapflag/restricted.txt +++ b/npc/re/mapflag/restricted.txt @@ -103,6 +103,77 @@ lhz_d_n2 mapflag restricted 6 // Soul Reaper Job Change 1@soul mapflag restricted 6 +// ep17.1 +1@cor mapflag restricted 6 +1@os_a mapflag restricted 6 +1@os_b mapflag restricted 6 +1@rgsr mapflag restricted 6 + +// ep17.2 +1@bamn mapflag restricted 6 +1@bamq mapflag restricted 6 +1@ghg mapflag restricted 6 +1@herbs mapflag restricted 6 +1@lost mapflag restricted 6 +1@odin mapflag restricted 6 + +// 4th jobs change +1@4win mapflag restricted 6 +1@4mag mapflag restricted 6 +1@4mst mapflag restricted 6 +1@4sac mapflag restricted 6 +1@4tro mapflag restricted 6 +1@4inq mapflag restricted 6 +1@4cdn mapflag restricted 6 +1@4igd mapflag restricted 6 +1@4drk mapflag restricted 6 + +// Gefen Night Arena +1@ge_sn mapflag restricted 6 + +// Traces of heroes +1@mjo1 mapflag restricted 6 +1@mjo2 mapflag restricted 6 +1@spa2 mapflag restricted 6 + +// Instance Thanatos Tower +1@thts mapflag restricted 6 +2@thts mapflag restricted 6 +3@thts mapflag restricted 6 +4@thts mapflag restricted 6 +5@thts mapflag restricted 6 +6@thts mapflag restricted 6 +7@thts mapflag restricted 6 +8@thts mapflag restricted 6 + +// Glastheim Challenge Mode +1@gl_he mapflag restricted 6 +1@gl_he2 mapflag restricted 6 + +// EDDA +1@gl_prq mapflag restricted 6 +1@gol1 mapflag restricted 6 +1@gol2 mapflag restricted 6 + +// 2018 Halloween +1@halo mapflag restricted 6 + +// Constellation Tower +1@ch_t mapflag restricted 6 +2@ch_t mapflag restricted 6 +3@ch_t mapflag restricted 6 + +// Episode 18: Direction of Prayer +1@adv mapflag restricted 6 +1@advs mapflag restricted 6 +1@nyr mapflag restricted 6 +1@oz mapflag restricted 6 +1@tcamp mapflag restricted 6 +2@nyr mapflag restricted 6 + +// Sunken tower +1@ch_u mapflag restricted 6 + // Towns ========================= brasilis mapflag restricted 7 dewata mapflag restricted 7 @@ -116,6 +187,7 @@ malangdo mapflag restricted 7 malaya mapflag restricted 7 mora mapflag restricted 7 lasagna mapflag restricted 7 +wolfvill mapflag restricted 7 // Restricted maps for WOE:TE Items == teg_dun01 mapflag restricted 8 diff --git a/npc/re/mapflag/town.txt b/npc/re/mapflag/town.txt index 3262f2f242..fdab9889e9 100644 --- a/npc/re/mapflag/town.txt +++ b/npc/re/mapflag/town.txt @@ -25,3 +25,4 @@ malangdo mapflag town malaya mapflag town mora mapflag town lasagna mapflag town +wolfvill mapflag town