summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
authorAtlantisRO <atlas@atlantis-ro.net>2017-03-13 01:42:36 -0700
committerAtlantisRO <atlas@atlantis-ro.net>2017-03-13 01:53:32 -0700
commitf75bfaedaa2d72a195d2b0c39b717ead1ea289ba (patch)
tree33d44c87ee6b2cc966387a02f2147bf7a811411d /npc/re
parentd0568eefba012ec1339f474154a5f239d08f4b41 (diff)
downloadhercules-f75bfaedaa2d72a195d2b0c39b717ead1ea289ba.tar.gz
hercules-f75bfaedaa2d72a195d2b0c39b717ead1ea289ba.tar.bz2
hercules-f75bfaedaa2d72a195d2b0c39b717ead1ea289ba.tar.xz
hercules-f75bfaedaa2d72a195d2b0c39b717ead1ea289ba.zip
Fixes #1626. Adds missed mapflags on instances.
- Mapflags are moved into map_zone_db, this will make easier and more intuitive in the future to add mapflags to new instances and avoid miss any mapflag. - Zone mapflags for renewal instances are moved into renewal folder. Signed-off-by: Ragno <ragno@atlantis-ro.net>
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/instances/BakonawaLake.txt2
-rw-r--r--npc/re/instances/BangungotHospital.txt2
-rw-r--r--npc/re/instances/BuwayaCave.txt2
-rw-r--r--npc/re/instances/HazyForest.txt2
-rw-r--r--npc/re/instances/MalangdoCulvert.txt3
-rw-r--r--npc/re/instances/OldGlastHeim.txt2
-rw-r--r--npc/re/instances/WolfchevLaboratory.txt2
-rw-r--r--npc/re/instances/ghost_palace.txt1
-rw-r--r--npc/re/instances/octopus_cave.txt2
-rw-r--r--npc/re/instances/saras_memory.txt1
-rw-r--r--npc/re/mapflag/zone.txt35
11 files changed, 35 insertions, 19 deletions
diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt
index 5e2ae7f33..2868cc589 100644
--- a/npc/re/instances/BakonawaLake.txt
+++ b/npc/re/instances/BakonawaLake.txt
@@ -33,8 +33,6 @@
//= 1.1
//=========================================================================
-1@ma_b mapflag src4instance
-
ma_scene01,174,179,4 script Taho 4_M_DEWZATIMAN,{
disable_items;
if (checkweight(Knife,1) == 0) {
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index 1504f892f..3962ee4fa 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -33,8 +33,6 @@
//= 1.1
//=========================================================================
-1@ma_h mapflag src4instance
-
//== Instance Creation =====================================
ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{
if (BaseLevel < 100) end;
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
index 242d0a8e4..859d6bd85 100644
--- a/npc/re/instances/BuwayaCave.txt
+++ b/npc/re/instances/BuwayaCave.txt
@@ -33,8 +33,6 @@
//= 1.0
//=========================================================================
-1@ma_c mapflag src4instance
-
ma_fild02,312,317,5 script Guard#buwaya_cave 4_MAL_SOLDIER,{
if (BaseLevel < 130) {
mes "[Guard]";
diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt
index 7f85fee50..c649171f8 100644
--- a/npc/re/instances/HazyForest.txt
+++ b/npc/re/instances/HazyForest.txt
@@ -33,8 +33,6 @@
//= 1.1
//=========================================================================
-1@mist mapflag src4instance
-
//== Instance Creation =====================================
bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index 164caf548..1bd76aedb 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -35,9 +35,6 @@
//= 1.1
//=========================================================================
-1@pump mapflag src4instance
-2@pump mapflag src4instance
-
//== Quest NPCs ============================================
mal_in01,172,28,2 script Albo#mal 4_CAT_SAILOR5,{
if (checkweight(Knife,1) == 0) {
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index bf099cd2d..9f3f29fdf 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -36,8 +36,6 @@
//================= Current Version =======================================
//= 1.2
//=========================================================================
-1@gl_k mapflag src4instance
-2@gl_k mapflag src4instance
glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{
if (BaseLevel < 130) { // iRO text
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index e88ec4332..51e2f8a06 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -33,8 +33,6 @@
//= 1.0.2
//=========================================================================
-1@lhz mapflag src4instance
-
//== Giacomo Girolam =======================================
lighthalzen,303,303,6 script Giacomo Girolamo#kiup2 4_M_KHMAN,3,3,{
if ((MaxWeight - Weight) < 1000 || !checkweight(Knife, 1)) {
diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt
index b1a8f3c10..6e77db2f8 100644
--- a/npc/re/instances/ghost_palace.txt
+++ b/npc/re/instances/ghost_palace.txt
@@ -30,7 +30,6 @@
//================= Current Version =======================================
//= 1.1
//=========================================================================
-1@spa mapflag src4instance
dali02,44,129,5 script Unpleasent Royal Guard 4_M_SAKRAYROYAL,{
if (BaseLevel < 120) {
diff --git a/npc/re/instances/octopus_cave.txt b/npc/re/instances/octopus_cave.txt
index b09d243ab..b134742c9 100644
--- a/npc/re/instances/octopus_cave.txt
+++ b/npc/re/instances/octopus_cave.txt
@@ -33,8 +33,6 @@
//= 1.1
//=========================================================================
-1@cash mapflag src4instance
-
//== Instance Creation =====================================
mal_dun01,151,235,5 script Starfish 4_ASTER,{
diff --git a/npc/re/instances/saras_memory.txt b/npc/re/instances/saras_memory.txt
index 2b3b4f2c0..38b598d5b 100644
--- a/npc/re/instances/saras_memory.txt
+++ b/npc/re/instances/saras_memory.txt
@@ -37,7 +37,6 @@
//================= Current Version =======================================
//= 1.1
//=========================================================================
-1@sara mapflag src4instance
dali,130,107,5 script Leon the Adventurer#Sara 4_M_DST_GRAND,{ // instance CD check only at the Dimensional Device
mes("[Leon the Adventurer]");
diff --git a/npc/re/mapflag/zone.txt b/npc/re/mapflag/zone.txt
index a6cfd95f1..24ffce665 100644
--- a/npc/re/mapflag/zone.txt
+++ b/npc/re/mapflag/zone.txt
@@ -32,6 +32,41 @@
//= Flags maps as part of zones defined in map_zone_db.txt
//=========================================================================
+// Misty Forest Labyrinth ===========
+1@mist mapflag zone Memorial Dungeon
+
+// Octopus Cave ===========
+1@cash mapflag zone Memorial Dungeon
+
+// Drain ===========
+1@pump mapflag zone Memorial Dungeon
+2@pump mapflag zone Memorial Dungeon
+
+// Somatology Laboratory ===========
+1@lhz mapflag zone Memorial Dungeon
+
+// Bangungot Hospital F2 ===========
+1@ma_h mapflag zone Memorial Dungeon
+
+// Buwaya Cave ===========
+1@ma_c mapflag zone Memorial Dungeon
+
+// Bakonawa Hideout ===========
+1@ma_b mapflag zone Memorial Dungeon
+
+// Inside Eclage ===========
+1@ecl mapflag zone Memorial Dungeon
+
+// Old Glast Heim ===========
+1@gl_k mapflag zone Memorial Dungeon
+2@gl_k mapflag zone Memorial Dungeon
+
+// Ghost Palace ===========
+1@spa mapflag zone Memorial Dungeon
+
+// Sara's Memory Instance ===========
+1@sara mapflag zone Memorial Dungeon
+
// WoE:TE
te_prt_gld mapflag zone WoE TE
te_prtcas01 mapflag zone WoE TE