diff --git a/conf/maps_athena.conf b/conf/maps_athena.conf index 7c7cabde1b..28956b0b7d 100644 --- a/conf/maps_athena.conf +++ b/conf/maps_athena.conf @@ -1174,6 +1174,7 @@ map: 1@glast // Biochemical Laboratory Nightmare map: lhz_dun_n +map: lhz_d_n2 // Copy of Old Glast Heim memorial map map: 1@gl_kh diff --git a/db/map_index.txt b/db/map_index.txt index 11873c0f24..ba16291e0f 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -942,6 +942,7 @@ job_gun 1@air2 1@glast lhz_dun_n +lhz_d_n2 1@gl_kh 2@gl_kh 1@lab diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat index 49fe7f2f24..b21783226d 100644 Binary files a/db/re/map_cache.dat and b/db/re/map_cache.dat differ diff --git a/npc/re/mapflag/nobranch.txt b/npc/re/mapflag/nobranch.txt index 5d755d75ed..9a280c6ca0 100644 --- a/npc/re/mapflag/nobranch.txt +++ b/npc/re/mapflag/nobranch.txt @@ -141,6 +141,11 @@ dali02 mapflag nobranch 1@lab mapflag nobranch 1@uns mapflag nobranch 1@mcd mapflag nobranch +un_myst mapflag nobranch + +// Nightmare Biolab +lhz_dun_n mapflag nobranch +lhz_d_n2 mapflag nobranch // WOE:TE Maps =================== te_alde_gld mapflag nobranch @@ -155,3 +160,36 @@ te_aldecas2 mapflag nobranch te_aldecas3 mapflag nobranch te_aldecas4 mapflag nobranch te_aldecas5 mapflag nobranch + +// Novice training +int_land mapflag nobranch +int_land01 mapflag nobranch +int_land02 mapflag nobranch +int_land03 mapflag nobranch +int_land04 mapflag nobranch + +// Ep 16 +prt_lib mapflag nobranch +prt_lib_q mapflag nobranch +prt_cas mapflag nobranch +prt_cas_q mapflag nobranch +prt_pri00 mapflag nobranch +rebel_in mapflag nobranch +que_swat mapflag nobranch +1@mir mapflag nobranch +2@mir mapflag nobranch +1@sthb mapflag nobranch +1@sthc mapflag nobranch +1@sthd mapflag nobranch +1@slw mapflag nobranch +1@swat mapflag nobranch + +// Rockridge +har_in01 mapflag nobranch +rockmi2 mapflag nobranch + +// Lasagna +lasagna mapflag nobranch +lasa_in01 mapflag nobranch +conch_in mapflag nobranch +lasa_dun_q mapflag nobranch diff --git a/npc/re/mapflag/noicewall.txt b/npc/re/mapflag/noicewall.txt index 9c1db92fea..534eb37b52 100644 --- a/npc/re/mapflag/noicewall.txt +++ b/npc/re/mapflag/noicewall.txt @@ -88,3 +88,12 @@ te_aldecas2 mapflag noicewall te_aldecas3 mapflag noicewall te_aldecas4 mapflag noicewall te_aldecas5 mapflag noicewall + +// Ep 16 +1@mir mapflag noicewall +2@mir mapflag noicewall +1@sthb mapflag noicewall +1@sthc mapflag noicewall +1@sthd mapflag noicewall +1@slw mapflag noicewall +1@swat mapflag noicewall diff --git a/npc/re/mapflag/nomemo.txt b/npc/re/mapflag/nomemo.txt index 7d593a7ec1..d06ffbe884 100644 --- a/npc/re/mapflag/nomemo.txt +++ b/npc/re/mapflag/nomemo.txt @@ -144,6 +144,7 @@ dali02 mapflag nomemo 1@air2 mapflag nomemo // Decisive Battle - Part 1 ====== +moro_cav mapflag nomemo 1@dth1 mapflag nomemo 1@dth2 mapflag nomemo 1@dth3 mapflag nomemo @@ -159,6 +160,10 @@ dali02 mapflag nomemo 1@mcd mapflag nomemo un_myst mapflag nomemo +// Nightmare Biolab +lhz_dun_n mapflag nomemo +lhz_d_n2 mapflag nomemo + // WOE:TE Maps =================== te_prtcas01 mapflag nomemo te_prtcas02 mapflag nomemo @@ -172,3 +177,42 @@ te_aldecas4 mapflag nomemo te_aldecas5 mapflag nomemo teg_dun01 mapflag nomemo teg_dun02 mapflag nomemo + +// Novice training +int_land mapflag nomemo +int_land01 mapflag nomemo +int_land02 mapflag nomemo +int_land03 mapflag nomemo +int_land04 mapflag nomemo + +// Ep 16 +prt_cas mapflag nomemo +prt_cas_q mapflag nomemo +prt_pri00 mapflag nomemo +prt_lib mapflag nomemo +prt_lib_q mapflag nomemo +prt_q mapflag nomemo +prt_prison mapflag nomemo +rebel_in mapflag nomemo +slabw01 mapflag nomemo +que_swat mapflag nomemo +1@mir mapflag nomemo +2@mir mapflag nomemo +1@sthb mapflag nomemo +1@sthc mapflag nomemo +1@sthd mapflag nomemo +1@slw mapflag nomemo +1@swat mapflag nomemo + +// Rockridge +har_in01 mapflag nomemo +rockmi1 mapflag nomemo +rockmi2 mapflag nomemo + +// Lasagna +lasa_in01 mapflag nomemo +conch_in mapflag nomemo +lasa_dun01 mapflag nomemo +lasa_dun02 mapflag nomemo +lasa_dun03 mapflag nomemo +lasa_dun_q mapflag nomemo diff --git a/npc/re/mapflag/nopenalty.txt b/npc/re/mapflag/nopenalty.txt index e9426458df..8925f5147c 100644 --- a/npc/re/mapflag/nopenalty.txt +++ b/npc/re/mapflag/nopenalty.txt @@ -71,3 +71,25 @@ job3_gen01 mapflag nopenalty job3_sha01 mapflag nopenalty job_ko mapflag nopenalty job_gun mapflag nopenalty + +// Nightmare Biolab +lhz_dun_n mapflag nopenalty +lhz_d_n2 mapflag nopenalty + +// Ep 16 +prt_cas mapflag nopenalty +prt_cas_q mapflag nopenalty +prt_pri00 mapflag nopenalty +prt_lib mapflag nopenalty +prt_lib_q mapflag nopenalty +que_swat mapflag nopenalty + +// Rockridge +har_in01 mapflag nopenalty +rebel_in mapflag nopenalty +rockmi2 mapflag nopenalty + +// Lasagna +lasagna mapflag nopenalty +lasa_in01 mapflag nopenalty +conch_in mapflag nopenalty diff --git a/npc/re/mapflag/nosave.txt b/npc/re/mapflag/nosave.txt index 019ae3e433..db4ab02fdb 100644 --- a/npc/re/mapflag/nosave.txt +++ b/npc/re/mapflag/nosave.txt @@ -137,3 +137,16 @@ que_avan01 mapflag nosave SavePoint 1@uns mapflag nosave SavePoint un_myst mapflag nosave SavePoint 1@mcd mapflag nosave SavePoint + +// Ep 16 +que_swat mapflag nosave SavePoint +1@mir mapflag nosave SavePoint +2@mir mapflag nosave SavePoint +1@sthb mapflag nosave SavePoint +1@sthc mapflag nosave SavePoint +1@sthd mapflag nosave SavePoint +1@slw mapflag nosave SavePoint +1@swat mapflag nosave SavePoint + +// Rockridge +rockmi2 mapflag nosave SavePoint diff --git a/npc/re/mapflag/noteleport.txt b/npc/re/mapflag/noteleport.txt index b98da6bf35..305d609586 100644 --- a/npc/re/mapflag/noteleport.txt +++ b/npc/re/mapflag/noteleport.txt @@ -148,6 +148,10 @@ un_bk_q mapflag monster_noteleport verus04 mapflag monster_noteleport 1@mcd mapflag monster_noteleport +// Nightmare Biolab +lhz_dun_n mapflag noteleport +lhz_d_n2 mapflag noteleport + // WOE:TE Maps =================== te_prtcas01 mapflag noteleport te_prtcas02 mapflag noteleport @@ -169,3 +173,35 @@ te_aldecas2 mapflag monster_noteleport te_aldecas3 mapflag monster_noteleport te_aldecas4 mapflag monster_noteleport te_aldecas5 mapflag monster_noteleport + +// Ep 16 +prt_cas mapflag noteleport +prt_cas_q mapflag noteleport +prt_pri00 mapflag noteleport +prt_lib mapflag noteleport +prt_lib_q mapflag noteleport +que_swat mapflag noteleport +rebel_in mapflag noteleport +rebel_in mapflag monster_noteleport +1@mir mapflag noteleport +2@mir mapflag noteleport +1@sthb mapflag noteleport +1@sthc mapflag noteleport +1@sthd mapflag noteleport +1@slw mapflag noteleport +1@swat mapflag noteleport +1@mir mapflag monster_noteleport +2@mir mapflag monster_noteleport +1@sthb mapflag monster_noteleport +1@sthc mapflag monster_noteleport +1@sthd mapflag monster_noteleport +1@slw mapflag monster_noteleport +1@swat mapflag monster_noteleport + +// Rockridge +har_in01 mapflag noteleport +rockmi2 mapflag noteleport + +// Lasagna +lasa_in01 mapflag noteleport +conch_in mapflag noteleport diff --git a/npc/re/mapflag/nowarp.txt b/npc/re/mapflag/nowarp.txt index 7d9a256198..e52cf2fdd6 100644 --- a/npc/re/mapflag/nowarp.txt +++ b/npc/re/mapflag/nowarp.txt @@ -30,3 +30,14 @@ un_bk_q mapflag nowarp un_myst mapflag nowarp job_gun mapflag nowarp + +// Nightmare Biolab +lhz_dun_n mapflag nowarp +lhz_d_n2 mapflag nowarp + +// Ep 16 +que_swat mapflag nowarp + +// Rockridge +un_myst mapflag nowarp +rockmi2 mapflag nowarp diff --git a/npc/re/mapflag/nowarpto.txt b/npc/re/mapflag/nowarpto.txt index a1719d824f..b0e457d091 100644 --- a/npc/re/mapflag/nowarpto.txt +++ b/npc/re/mapflag/nowarpto.txt @@ -113,3 +113,28 @@ te_aldecas5 mapflag nowarpto // Rebellion Job Change Map job_gun mapflag nowarpto + +// Ep 16 +prt_cas mapflag nowarpto +prt_cas_q mapflag nowarpto +prt_pri00 mapflag nowarpto +prt_lib mapflag nowarpto +prt_lib_q mapflag nowarpto +rebel_in mapflag nowarpto +que_swat mapflag nowarpto +1@mir mapflag nowarpto +2@mir mapflag nowarpto +1@sthb mapflag nowarpto +1@sthc mapflag nowarpto +1@sthd mapflag nowarpto +1@slw mapflag nowarpto +1@swat mapflag nowarpto + +// Rockridge +har_in01 mapflag nowarpto +rockmi2 mapflag nowarpto + +// Lasagna +lasa_in01 mapflag nowarpto +conch_in mapflag nowarpto +lasa_dun_q mapflag nowarpto diff --git a/npc/re/mapflag/partylock.txt b/npc/re/mapflag/partylock.txt index 27cbfe790f..0d0fc878d7 100644 --- a/npc/re/mapflag/partylock.txt +++ b/npc/re/mapflag/partylock.txt @@ -82,3 +82,12 @@ 1@lab mapflag partylock 1@uns mapflag partylock 1@mcd mapflag partylock + +// Ep 16 +1@mir mapflag partylock +2@mir mapflag partylock +1@sthb mapflag partylock +1@sthc mapflag partylock +1@sthd mapflag partylock +1@slw mapflag partylock +1@swat mapflag partylock diff --git a/npc/re/mapflag/restricted.txt b/npc/re/mapflag/restricted.txt index 227e5b5483..d2eaafd669 100644 --- a/npc/re/mapflag/restricted.txt +++ b/npc/re/mapflag/restricted.txt @@ -65,6 +65,15 @@ 1@uns mapflag restricted 6 1@mcd mapflag restricted 6 +// Ep 16 +1@mir mapflag restricted 6 +2@mir mapflag restricted 6 +1@sthb mapflag restricted 6 +1@sthc mapflag restricted 6 +1@sthd mapflag restricted 6 +1@slw mapflag restricted 6 +1@swat mapflag restricted 6 + // Towns ========================= brasilis mapflag restricted 7 dewata mapflag restricted 7 @@ -77,6 +86,7 @@ izlude_d mapflag restricted 7 malangdo mapflag restricted 7 malaya mapflag restricted 7 mora mapflag restricted 7 +lasagna 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 a779d2be31..3262f2f242 100644 --- a/npc/re/mapflag/town.txt +++ b/npc/re/mapflag/town.txt @@ -24,3 +24,4 @@ izlude_d mapflag town malangdo mapflag town malaya mapflag town mora mapflag town +lasagna mapflag town