diff options
-rw-r--r-- | conf/map/maps.conf | 2 | ||||
-rw-r--r-- | db/map_index.txt | 8 | ||||
-rw-r--r-- | maps/re/011.mcache (renamed from maps/re/009-5.mcache) | bin | 3021 -> 3021 bytes | |||
-rw-r--r-- | npc/009-1/_warps.txt | 2 | ||||
-rw-r--r-- | npc/009-5/_import.txt | 5 | ||||
-rw-r--r-- | npc/009-5/_mobs.txt | 6 | ||||
-rw-r--r-- | npc/011/_import.txt | 5 | ||||
-rw-r--r-- | npc/011/_mobs.txt | 6 | ||||
-rw-r--r-- | npc/011/_warps.txt (renamed from npc/009-5/_warps.txt) | 4 | ||||
-rw-r--r-- | npc/011/manastone.txt (renamed from npc/009-5/manastone.txt) | 2 | ||||
-rw-r--r-- | npc/_import.txt | 2 |
11 files changed, 21 insertions, 21 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 7f9c91dbd..6d9502457 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -37,10 +37,10 @@ map_list: ( "005-7", "007-1", "009-1", - "009-5", "010-1-1", "010-1", "010-2", + "011", "boss", "botcheck", "sec_pri", diff --git a/db/map_index.txt b/db/map_index.txt index 1ac063510..26fd220e4 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -34,10 +34,10 @@ 005-7 34 007-1 35 009-1 36 -009-5 37 -010-1-1 38 -010-1 39 -010-2 40 +010-1-1 37 +010-1 38 +010-2 39 +011 40 boss 41 botcheck 42 sec_pri 43 diff --git a/maps/re/009-5.mcache b/maps/re/011.mcache Binary files differindex c47677811..c47677811 100644 --- a/maps/re/009-5.mcache +++ b/maps/re/011.mcache diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt index e5ad7d3fc..975964cd1 100644 --- a/npc/009-1/_warps.txt +++ b/npc/009-1/_warps.txt @@ -1,4 +1,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 009-1: Halinarzo warps 009-1,56,107,0 warp #009-1_56_107 2,0,010-2,171,20 -009-1,119,40,0 warp #009-1_119_40 0,0,009-5,177,177 +009-1,119,40,0 warp #009-1_119_40 0,0,11,177,177 diff --git a/npc/009-5/_import.txt b/npc/009-5/_import.txt deleted file mode 100644 index a589c9d37..000000000 --- a/npc/009-5/_import.txt +++ /dev/null @@ -1,5 +0,0 @@ -// Map 009-5: Depleted Mana Stones Mine -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/009-5/_mobs.txt", -"npc/009-5/_warps.txt", -"npc/009-5/manastone.txt", diff --git a/npc/009-5/_mobs.txt b/npc/009-5/_mobs.txt deleted file mode 100644 index 419f24ba6..000000000 --- a/npc/009-5/_mobs.txt +++ /dev/null @@ -1,6 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 009-5: Depleted Mana Stones Mine mobs -009-5,99,100,79,79 monster Mana Ghost 1068,40,20000,20000 -009-5,98,101,79,79 monster Fire Goblin 1067,100,60000,60000 -009-5,100,99,79,79 monster Lava Slime 1097,75,60000,60000 -009-5,101,98,79,79 monster Red Slime 1092,120,60000,60000 diff --git a/npc/011/_import.txt b/npc/011/_import.txt new file mode 100644 index 000000000..fa75f66af --- /dev/null +++ b/npc/011/_import.txt @@ -0,0 +1,5 @@ +// Map 011: Depleted Mana Stones Mine +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/011/_mobs.txt", +"npc/011/_warps.txt", +"npc/011/manastone.txt", diff --git a/npc/011/_mobs.txt b/npc/011/_mobs.txt new file mode 100644 index 000000000..cdfb14c71 --- /dev/null +++ b/npc/011/_mobs.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 011: Depleted Mana Stones Mine mobs +011,99,100,79,79 monster Mana Ghost 1068,40,20000,20000 +011,98,101,79,79 monster Fire Goblin 1067,100,60000,60000 +011,100,99,79,79 monster Lava Slime 1097,75,60000,60000 +011,101,98,79,79 monster Red Slime 1092,120,60000,60000 diff --git a/npc/009-5/_warps.txt b/npc/011/_warps.txt index ee7e233b9..72d6d408c 100644 --- a/npc/009-5/_warps.txt +++ b/npc/011/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 009-5: Depleted Mana Stones Mine warps -009-5,177,178,0 warp #009-5_177_178 0,0,009-1,119,41 +// Map 011: Depleted Mana Stones Mine warps +011,177,178,0 warp #011_177_178 0,0,009-1,119,41 diff --git a/npc/009-5/manastone.txt b/npc/011/manastone.txt index f6af84765..cf2ccbe8a 100644 --- a/npc/009-5/manastone.txt +++ b/npc/011/manastone.txt @@ -5,7 +5,7 @@ // The last Mana Stone in the whole world, which is not owned by the Magic Council // or the Monster King. -009-5,0,0,0 script Mana Stone NPC_MANA_STONE,{ +011,0,0,0 script Mana Stone NPC_MANA_STONE,{ if (BaseLevel < 40) goto L_NotWorthy; mesn; diff --git a/npc/_import.txt b/npc/_import.txt index 878ab5f04..55cb20f9a 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -36,10 +36,10 @@ @include "npc/005-7/_import.txt" @include "npc/007-1/_import.txt" @include "npc/009-1/_import.txt" -@include "npc/009-5/_import.txt" @include "npc/010-1-1/_import.txt" @include "npc/010-1/_import.txt" @include "npc/010-2/_import.txt" +@include "npc/011/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" @include "npc/sec_pri/_import.txt" |