diff options
| -rw-r--r-- | conf/map/maps.conf | 22 | ||||
| -rw-r--r-- | db/map_index.txt | 28 | ||||
| -rw-r--r-- | maps/re/017-2-1.mcache (renamed from maps/re/jacks-basement.mcache) | bin | 525 -> 525 bytes | |||
| -rw-r--r-- | maps/re/017-2.mcache (renamed from maps/re/jacks-indoor.mcache) | bin | 96 -> 96 bytes | |||
| -rw-r--r-- | maps/re/018-1-1.mcache (renamed from maps/re/029-2.mcache) | bin | 352 -> 352 bytes | |||
| -rw-r--r-- | maps/re/018-1.mcache (renamed from maps/re/029-1.mcache) | bin | 365 -> 365 bytes | |||
| -rw-r--r-- | maps/re/018-2-1.mcache (renamed from maps/re/hh-castle.mcache) | bin | 75 -> 75 bytes | |||
| -rw-r--r-- | maps/re/018-2.mcache (renamed from maps/re/hh-outside.mcache) | bin | 755 -> 755 bytes | |||
| -rw-r--r-- | maps/re/018-3-1.mcache (renamed from maps/re/skull-cave.mcache) | bin | 240 -> 240 bytes | |||
| -rw-r--r-- | maps/re/018-3.mcache (renamed from maps/re/somber-cave.mcache) | bin | 806 -> 806 bytes | |||
| -rw-r--r-- | maps/re/018-4-1.mcache (renamed from maps/re/si-cave.mcache) | bin | 718 -> 718 bytes | |||
| -rw-r--r-- | maps/re/018-4-2.mcache (renamed from maps/re/si-house.mcache) | bin | 94 -> 94 bytes | |||
| -rw-r--r-- | maps/re/018-4.mcache (renamed from maps/re/si-outside.mcache) | bin | 968 -> 968 bytes | |||
| -rw-r--r-- | npc/017-2-1/_import.txt (renamed from npc/skull-cave/_import.txt) | 2 | ||||
| -rw-r--r-- | npc/017-2/_import.txt (renamed from npc/jacks-basement/_import.txt) | 3 | ||||
| -rw-r--r-- | npc/017-2/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/018-1-1/_import.txt | 4 | ||||
| -rw-r--r-- | npc/018-1-1/_mobs.txt | 6 | ||||
| -rw-r--r-- | npc/018-1-1/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/018-1/_import.txt (renamed from npc/hh-castle/_import.txt) | 5 | ||||
| -rw-r--r-- | npc/018-1/_mobs.txt | 8 | ||||
| -rw-r--r-- | npc/018-1/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/018-2-1/_import.txt (renamed from npc/jacks-indoor/_import.txt) | 4 | ||||
| -rw-r--r-- | npc/018-2-1/_warps.txt | 4 | ||||
| -rw-r--r-- | npc/018-2/_import.txt | 4 | ||||
| -rw-r--r-- | npc/018-2/_mobs.txt | 7 | ||||
| -rw-r--r-- | npc/018-2/_warps.txt | 4 | ||||
| -rw-r--r-- | npc/018-3-1/_import.txt (renamed from npc/si-house/_import.txt) | 4 | ||||
| -rw-r--r-- | npc/018-3-1/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/018-3/_import.txt | 4 | ||||
| -rw-r--r-- | npc/018-3/_mobs.txt | 16 | ||||
| -rw-r--r-- | npc/018-3/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/018-4-1/_import.txt (renamed from npc/si-cave/_import.txt) | 6 | ||||
| -rw-r--r-- | npc/018-4-1/_mobs.txt | 7 | ||||
| -rw-r--r-- | npc/018-4-1/_warps.txt (renamed from npc/si-cave/_warps.txt) | 6 | ||||
| -rw-r--r-- | npc/018-4-2/_import.txt | 3 | ||||
| -rw-r--r-- | npc/018-4-2/_warps.txt (renamed from npc/si-house/_warps.txt) | 6 | ||||
| -rw-r--r-- | npc/018-4/_import.txt | 4 | ||||
| -rw-r--r-- | npc/018-4/_mobs.txt | 9 | ||||
| -rw-r--r-- | npc/018-4/_warps.txt | 5 | ||||
| -rw-r--r-- | npc/_import.txt | 22 | ||||
| -rw-r--r-- | npc/hh-castle/_warps.txt | 4 | ||||
| -rw-r--r-- | npc/hh-outside/_import.txt | 4 | ||||
| -rw-r--r-- | npc/hh-outside/_mobs.txt | 7 | ||||
| -rw-r--r-- | npc/hh-outside/_warps.txt | 4 | ||||
| -rw-r--r-- | npc/jacks-indoor/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/si-cave/_mobs.txt | 7 | ||||
| -rw-r--r-- | npc/si-outside/_import.txt | 4 | ||||
| -rw-r--r-- | npc/si-outside/_mobs.txt | 9 | ||||
| -rw-r--r-- | npc/si-outside/_warps.txt | 5 | ||||
| -rw-r--r-- | npc/somber-cave/_import.txt | 4 | ||||
| -rw-r--r-- | npc/somber-cave/_mobs.txt | 16 | ||||
| -rw-r--r-- | npc/somber-cave/_warps.txt | 3 |
53 files changed, 155 insertions, 123 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 00dd7eb91..1f6d396c8 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -77,20 +77,20 @@ map_list: ( "016-6", "016-7", "017-1", - "029-1", - "029-2", + "017-2-1", + "017-2", + "018-1-1", + "018-1", + "018-2-1", + "018-2", + "018-3-1", + "018-3", + "018-4-1", + "018-4-2", + "018-4", "boss", "botcheck", - "hh-castle", - "hh-outside", - "jacks-basement", - "jacks-indoor", "sec_pri", - "si-cave", - "si-house", - "si-outside", - "skull-cave", - "somber-cave", "soren-2", "soren", "test", diff --git a/db/map_index.txt b/db/map_index.txt index 5c6d09129..22a82167d 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -74,20 +74,20 @@ 016-6 74 016-7 75 017-1 76 -029-1 77 -029-2 78 -boss 79 -botcheck 80 -hh-castle 81 -hh-outside 82 -jacks-basement 83 -jacks-indoor 84 -sec_pri 85 -si-cave 86 -si-house 87 -si-outside 88 -skull-cave 89 -somber-cave 90 +017-2-1 77 +017-2 78 +018-1-1 79 +018-1 80 +018-2-1 81 +018-2 82 +018-3-1 83 +018-3 84 +018-4-1 85 +018-4-2 86 +018-4 87 +boss 88 +botcheck 89 +sec_pri 90 soren-2 91 soren 92 test 93 diff --git a/maps/re/jacks-basement.mcache b/maps/re/017-2-1.mcache Binary files differindex 17216061a..17216061a 100644 --- a/maps/re/jacks-basement.mcache +++ b/maps/re/017-2-1.mcache diff --git a/maps/re/jacks-indoor.mcache b/maps/re/017-2.mcache Binary files differindex c07eb65e4..c07eb65e4 100644 --- a/maps/re/jacks-indoor.mcache +++ b/maps/re/017-2.mcache diff --git a/maps/re/029-2.mcache b/maps/re/018-1-1.mcache Binary files differindex 13d1cd74c..13d1cd74c 100644 --- a/maps/re/029-2.mcache +++ b/maps/re/018-1-1.mcache diff --git a/maps/re/029-1.mcache b/maps/re/018-1.mcache Binary files differindex bbc99e118..bbc99e118 100644 --- a/maps/re/029-1.mcache +++ b/maps/re/018-1.mcache diff --git a/maps/re/hh-castle.mcache b/maps/re/018-2-1.mcache Binary files differindex 1e4c6e9bf..1e4c6e9bf 100644 --- a/maps/re/hh-castle.mcache +++ b/maps/re/018-2-1.mcache diff --git a/maps/re/hh-outside.mcache b/maps/re/018-2.mcache Binary files differindex 2d34071c7..2d34071c7 100644 --- a/maps/re/hh-outside.mcache +++ b/maps/re/018-2.mcache diff --git a/maps/re/skull-cave.mcache b/maps/re/018-3-1.mcache Binary files differindex 27c420ccb..27c420ccb 100644 --- a/maps/re/skull-cave.mcache +++ b/maps/re/018-3-1.mcache diff --git a/maps/re/somber-cave.mcache b/maps/re/018-3.mcache Binary files differindex d17edc645..d17edc645 100644 --- a/maps/re/somber-cave.mcache +++ b/maps/re/018-3.mcache diff --git a/maps/re/si-cave.mcache b/maps/re/018-4-1.mcache Binary files differindex 9616044e0..9616044e0 100644 --- a/maps/re/si-cave.mcache +++ b/maps/re/018-4-1.mcache diff --git a/maps/re/si-house.mcache b/maps/re/018-4-2.mcache Binary files differindex 4dfc7d331..4dfc7d331 100644 --- a/maps/re/si-house.mcache +++ b/maps/re/018-4-2.mcache diff --git a/maps/re/si-outside.mcache b/maps/re/018-4.mcache Binary files differindex d13742f1d..d13742f1d 100644 --- a/maps/re/si-outside.mcache +++ b/maps/re/018-4.mcache diff --git a/npc/skull-cave/_import.txt b/npc/017-2-1/_import.txt index 184682937..0a8172af5 100644 --- a/npc/skull-cave/_import.txt +++ b/npc/017-2-1/_import.txt @@ -1,2 +1,2 @@ -// Map skull-cave: Skull Cave +// Map 017-2-1: Jack's Basement // This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/jacks-basement/_import.txt b/npc/017-2/_import.txt index fb05e8704..9c2f5c724 100644 --- a/npc/jacks-basement/_import.txt +++ b/npc/017-2/_import.txt @@ -1,2 +1,3 @@ -// Map jacks-basement: Jack's Basement +// Map 017-2: Jack's House // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/017-2/_warps.txt", diff --git a/npc/017-2/_warps.txt b/npc/017-2/_warps.txt new file mode 100644 index 000000000..97c07e729 --- /dev/null +++ b/npc/017-2/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 017-2: Jack's House warps +017-2,31,32,0 warp #017-2_31_32 0,0,017-1,0,0 diff --git a/npc/018-1-1/_import.txt b/npc/018-1-1/_import.txt new file mode 100644 index 000000000..6b5a866b5 --- /dev/null +++ b/npc/018-1-1/_import.txt @@ -0,0 +1,4 @@ +// Map 018-1-1: Easter Island Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-1-1/_mobs.txt", +"npc/018-1-1/_warps.txt", diff --git a/npc/018-1-1/_mobs.txt b/npc/018-1-1/_mobs.txt new file mode 100644 index 000000000..f4832e4e2 --- /dev/null +++ b/npc/018-1-1/_mobs.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-1-1: Easter Island Cave mobs +018-1-1,51,49,11,7 monster Silkworm 1034,10,30000,3000 +018-1-1,43,35,0,0 monster Evil Mushroom 1042,3,40000,5000 +018-1-1,27,31,0,0 monster Evil Mushroom 1042,3,40000,5000 +018-1-1,50,49,30,30 monster Bat 1039,10,60000,10000 diff --git a/npc/018-1-1/_warps.txt b/npc/018-1-1/_warps.txt new file mode 100644 index 000000000..af442022e --- /dev/null +++ b/npc/018-1-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-1-1: Easter Island Cave warps +018-1-1,33,78,0 warp #018-1-1_33_78 0,0,018-1,54,38 diff --git a/npc/hh-castle/_import.txt b/npc/018-1/_import.txt index 990a6cb3e..ad7c79468 100644 --- a/npc/hh-castle/_import.txt +++ b/npc/018-1/_import.txt @@ -1,3 +1,4 @@ -// Map hh-castle: Heroes' Hold - Castle +// Map 018-1: Sincerity // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/hh-castle/_warps.txt", +"npc/018-1/_mobs.txt", +"npc/018-1/_warps.txt", diff --git a/npc/018-1/_mobs.txt b/npc/018-1/_mobs.txt new file mode 100644 index 000000000..b3c21ab9f --- /dev/null +++ b/npc/018-1/_mobs.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-1: Sincerity mobs +018-1,69,65,6,6 monster Evil Mushroom 1042,4,20000,60000 +018-1,32,33,6,6 monster Squirrel 1032,3,30000,60000 +018-1,46,48,2,0 monster Clover Patch 1028,1,10000,120000 +018-1,37,60,11,10 monster Poison Spiky Mushroom 1043,5,10000,30000 +018-1,54,36,8,9 monster Bat 1039,4,25000,30000 +018-1,59,51,6,4 monster Log Head 1066,2,25000,30000 diff --git a/npc/018-1/_warps.txt b/npc/018-1/_warps.txt new file mode 100644 index 000000000..7ab989c07 --- /dev/null +++ b/npc/018-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-1: Sincerity warps +018-1,54,37,0 warp #018-1_54_37 0,0,018-1-1,33,77 diff --git a/npc/jacks-indoor/_import.txt b/npc/018-2-1/_import.txt index 034399e37..13f8970a0 100644 --- a/npc/jacks-indoor/_import.txt +++ b/npc/018-2-1/_import.txt @@ -1,3 +1,3 @@ -// Map jacks-indoor: Jack's House +// Map 018-2-1: Heroes' Hold - Castle // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/jacks-indoor/_warps.txt", +"npc/018-2-1/_warps.txt", diff --git a/npc/018-2-1/_warps.txt b/npc/018-2-1/_warps.txt new file mode 100644 index 000000000..dfce15daf --- /dev/null +++ b/npc/018-2-1/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-2-1: Heroes' Hold - Castle warps +018-2-1,26,33,0 warp #018-2-1_26_33 2,0,hh-outside,72,65 +018-2-1,26,33,0 warp #018-2-1_26_33 2,0,018-2,0,0 diff --git a/npc/018-2/_import.txt b/npc/018-2/_import.txt new file mode 100644 index 000000000..adb5e8745 --- /dev/null +++ b/npc/018-2/_import.txt @@ -0,0 +1,4 @@ +// Map 018-2: Heroes' Hold - Outside +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-2/_mobs.txt", +"npc/018-2/_warps.txt", diff --git a/npc/018-2/_mobs.txt b/npc/018-2/_mobs.txt new file mode 100644 index 000000000..18cbd2ada --- /dev/null +++ b/npc/018-2/_mobs.txt @@ -0,0 +1,7 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-2: Heroes' Hold - Outside mobs +018-2,92,39,29,10 monster Spawn Area 1 1002,2,120000,40000 +018-2,40,35,20,6 monster Spawn Area 2 1002,2,120000,40000 +018-2,20,45,0,0 monster Spawn Area 3 1002,2,120000,40000 +018-2,108,64,12,11 monster Spawn Area 4 1002,1,120000,40000 +018-2,92,90,36,12 monster Spawn Area 5 1002,2,120000,40000 diff --git a/npc/018-2/_warps.txt b/npc/018-2/_warps.txt new file mode 100644 index 000000000..b264d1e6a --- /dev/null +++ b/npc/018-2/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-2: Heroes' Hold - Outside warps +018-2,63,106,0 warp #018-2_63_106 0,0,000-1,22,22 +018-2,72,63,0 warp #018-2_72_63 3,0,018-2-1,26,32 diff --git a/npc/si-house/_import.txt b/npc/018-3-1/_import.txt index c8441503f..0df895be4 100644 --- a/npc/si-house/_import.txt +++ b/npc/018-3-1/_import.txt @@ -1,3 +1,3 @@ -// Map si-house: Secret_Island_Indoor +// Map 018-3-1: Skull Cave // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/si-house/_warps.txt", +"npc/018-3-1/_warps.txt", diff --git a/npc/018-3-1/_warps.txt b/npc/018-3-1/_warps.txt new file mode 100644 index 000000000..6cb1e0efd --- /dev/null +++ b/npc/018-3-1/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-3-1: Skull Cave warps +018-3-1,71,78,0 warp #018-3-1_71_78 1,0,018-3,0,0 diff --git a/npc/018-3/_import.txt b/npc/018-3/_import.txt new file mode 100644 index 000000000..97be42bc6 --- /dev/null +++ b/npc/018-3/_import.txt @@ -0,0 +1,4 @@ +// Map 018-3: Somber Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-3/_mobs.txt", +"npc/018-3/_warps.txt", diff --git a/npc/018-3/_mobs.txt b/npc/018-3/_mobs.txt new file mode 100644 index 000000000..8915592de --- /dev/null +++ b/npc/018-3/_mobs.txt @@ -0,0 +1,16 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-3: Somber Cave mobs +018-3,81,91,1,1 monster Dark Lizard 1051,2,0,20000 +018-3,37,61,1,1 monster Dark Lizard 1051,2,0,20000 +018-3,45,114,1,1 monster Dark Lizard 1051,2,0,20000 +018-3,0,0,0,0 monster Lava Slime 1097,8,10000,0 +018-3,0,0,0,0 monster Fire Goblin 1067,30,20,0 +018-3,75,53,1,1 monster Black Scorpion 1074,1,0,10000 +018-3,115,116,2,2 monster Black Scorpion 1074,1,0,10000 +018-3,0,0,0,0 monster Evil Mushroom 1042,10,20,0 +018-3,39,57,21,38 monster Lava Slime 1097,12,10000,0 +018-3,96,46,34,27 monster Lava Slime 1097,10,10000,0 +018-3,88,84,26,10 monster Lava Slime 1097,5,10000,0 +018-3,123,100,7,26 monster Lava Slime 1097,4,10000,0 +018-3,66,111,48,15 monster Lava Slime 1097,11,10000,0 +018-3,74,72,56,53 monster Night Scorpion 1077,9,15000,0 diff --git a/npc/018-3/_warps.txt b/npc/018-3/_warps.txt new file mode 100644 index 000000000..248a3e687 --- /dev/null +++ b/npc/018-3/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-3: Somber Cave warps +018-3,114,23,0 warp #018-3_114_23 0,0,017-1,1,1 diff --git a/npc/si-cave/_import.txt b/npc/018-4-1/_import.txt index 241809635..5c588d258 100644 --- a/npc/si-cave/_import.txt +++ b/npc/018-4-1/_import.txt @@ -1,4 +1,4 @@ -// Map si-cave: sicave +// Map 018-4-1: sicave // This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/si-cave/_mobs.txt", -"npc/si-cave/_warps.txt", +"npc/018-4-1/_mobs.txt", +"npc/018-4-1/_warps.txt", diff --git a/npc/018-4-1/_mobs.txt b/npc/018-4-1/_mobs.txt new file mode 100644 index 000000000..4d37288f2 --- /dev/null +++ b/npc/018-4-1/_mobs.txt @@ -0,0 +1,7 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4-1: Secret Island Cave mobs +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4-1: sicave mobs +018-4-1,95,66,66,35 monster Cave Snake 1035,15,9000,3000 +018-4-1,95,84,66,18 monster Golden Scorpion 1078,7,10000,5000 +018-4-1,102,48,40,17 monster Giant Mutated Bat 1044,2,100000,50000 diff --git a/npc/si-cave/_warps.txt b/npc/018-4-1/_warps.txt index 916c408c4..335f148c4 100644 --- a/npc/si-cave/_warps.txt +++ b/npc/018-4-1/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map si-cave: Secret Island Cave warps +// Map 018-4-1: Secret Island Cave warps // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map si-cave: sicave warps -si-cave,102,86,0 warp #si-cave_102_86 0,0,si-outside,94,90 +// Map 018-4-1: sicave warps +018-4-1,102,86,0 warp #018-4-1_102_86 0,0,018-4,94,90 diff --git a/npc/018-4-2/_import.txt b/npc/018-4-2/_import.txt new file mode 100644 index 000000000..fedb96431 --- /dev/null +++ b/npc/018-4-2/_import.txt @@ -0,0 +1,3 @@ +// Map 018-4-2: Secret_Island_Indoor +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-4-2/_warps.txt", diff --git a/npc/si-house/_warps.txt b/npc/018-4-2/_warps.txt index a068fb265..02e21aacd 100644 --- a/npc/si-house/_warps.txt +++ b/npc/018-4-2/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map si-house: Secret Island House warps +// Map 018-4-2: Secret Island House warps // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map si-house: Secret_Island_Indoor warps -si-house,33,36,0 warp #si-house_33_36 0,0,si-outside,73,26 +// Map 018-4-2: Secret_Island_Indoor warps +018-4-2,33,36,0 warp #018-4-2_33_36 0,0,018-4,73,26 diff --git a/npc/018-4/_import.txt b/npc/018-4/_import.txt new file mode 100644 index 000000000..17bc5383e --- /dev/null +++ b/npc/018-4/_import.txt @@ -0,0 +1,4 @@ +// Map 018-4: Secret Island +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/018-4/_mobs.txt", +"npc/018-4/_warps.txt", diff --git a/npc/018-4/_mobs.txt b/npc/018-4/_mobs.txt new file mode 100644 index 000000000..101c5bba8 --- /dev/null +++ b/npc/018-4/_mobs.txt @@ -0,0 +1,9 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4: Secret Island mobs +018-4,120,68,46,21 monster Golden Scorpion 1078,7,10000,5000 +018-4,98,47,46,32 monster Night Scorpion 1077,5,20000,10000 +018-4,98,47,46,32 monster BlackSlime 1002,10,15000,10000 +018-4,91,60,76,47 monster Red Slime 1092,12,12000,4000 +018-4,91,60,76,47 monster Yellow Slime 1091,15,30000,30000 +018-4,91,56,76,43 monster Clover Patch 1028,2,75000,35000 +018-4,91,60,76,47 monster Mouboo 1023,3,12000,4000 diff --git a/npc/018-4/_warps.txt b/npc/018-4/_warps.txt new file mode 100644 index 000000000..b97533d59 --- /dev/null +++ b/npc/018-4/_warps.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 018-4: Secret Island warps +018-4,94,89,0 warp #018-4_94_89 0,0,si-cave,102,84 +018-4,164,105,0 warp #018-4_164_105 0,0,017-1,0,0 +018-4,73,24,0 warp #018-4_73_24 0,0,018-4-2,33,34 diff --git a/npc/_import.txt b/npc/_import.txt index 3bc5db5a5..acb231c6a 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -76,20 +76,20 @@ @include "npc/016-6/_import.txt" @include "npc/016-7/_import.txt" @include "npc/017-1/_import.txt" -@include "npc/029-1/_import.txt" -@include "npc/029-2/_import.txt" +@include "npc/017-2-1/_import.txt" +@include "npc/017-2/_import.txt" +@include "npc/018-1-1/_import.txt" +@include "npc/018-1/_import.txt" +@include "npc/018-2-1/_import.txt" +@include "npc/018-2/_import.txt" +@include "npc/018-3-1/_import.txt" +@include "npc/018-3/_import.txt" +@include "npc/018-4-1/_import.txt" +@include "npc/018-4-2/_import.txt" +@include "npc/018-4/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" -@include "npc/hh-castle/_import.txt" -@include "npc/hh-outside/_import.txt" -@include "npc/jacks-basement/_import.txt" -@include "npc/jacks-indoor/_import.txt" @include "npc/sec_pri/_import.txt" -@include "npc/si-cave/_import.txt" -@include "npc/si-house/_import.txt" -@include "npc/si-outside/_import.txt" -@include "npc/skull-cave/_import.txt" -@include "npc/somber-cave/_import.txt" @include "npc/soren-2/_import.txt" @include "npc/soren/_import.txt" @include "npc/test/_import.txt" diff --git a/npc/hh-castle/_warps.txt b/npc/hh-castle/_warps.txt deleted file mode 100644 index 452139599..000000000 --- a/npc/hh-castle/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map hh-castle: Heroes' Hold - Castle warps -hh-castle,26,33,0 warp #hh-castle_26_33 2,0,hh-outside,72,65 -hh-castle,26,33,0 warp #hh-castle_26_33 2,0,hh-maincave,0,0 diff --git a/npc/hh-outside/_import.txt b/npc/hh-outside/_import.txt deleted file mode 100644 index eef69a13f..000000000 --- a/npc/hh-outside/_import.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Map hh-outside: Heroes' Hold - Outside -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/hh-outside/_mobs.txt", -"npc/hh-outside/_warps.txt", diff --git a/npc/hh-outside/_mobs.txt b/npc/hh-outside/_mobs.txt deleted file mode 100644 index 55af54ae0..000000000 --- a/npc/hh-outside/_mobs.txt +++ /dev/null @@ -1,7 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map hh-outside: Heroes' Hold - Outside mobs -hh-outside,92,39,29,10 monster Spawn Area 1 1002,2,120000,40000 -hh-outside,40,35,20,6 monster Spawn Area 2 1002,2,120000,40000 -hh-outside,20,45,0,0 monster Spawn Area 3 1002,2,120000,40000 -hh-outside,108,64,12,11 monster Spawn Area 4 1002,1,120000,40000 -hh-outside,92,90,36,12 monster Spawn Area 5 1002,2,120000,40000 diff --git a/npc/hh-outside/_warps.txt b/npc/hh-outside/_warps.txt deleted file mode 100644 index c734c1046..000000000 --- a/npc/hh-outside/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map hh-outside: Heroes' Hold - Outside warps -hh-outside,63,106,0 warp #hh-outside_63_106 0,0,026-1,63,17 -hh-outside,72,63,0 warp #hh-outside_72_63 3,0,hh-castle,26,32 diff --git a/npc/jacks-indoor/_warps.txt b/npc/jacks-indoor/_warps.txt deleted file mode 100644 index 5ee64a7e6..000000000 --- a/npc/jacks-indoor/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map jacks-indoor: Jack's House warps -jacks-indoor,31,32,0 warp #jacks-indoor_31_32 0,0,009-1,42,45 diff --git a/npc/si-cave/_mobs.txt b/npc/si-cave/_mobs.txt deleted file mode 100644 index fb4a6accf..000000000 --- a/npc/si-cave/_mobs.txt +++ /dev/null @@ -1,7 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map si-cave: Secret Island Cave mobs -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map si-cave: sicave mobs -si-cave,95,66,66,35 monster Cave Snake 1035,15,9000,3000 -si-cave,95,84,66,18 monster Golden Scorpion 1078,7,10000,5000 -si-cave,102,48,40,17 monster Giant Mutated Bat 1044,2,100000,50000 diff --git a/npc/si-outside/_import.txt b/npc/si-outside/_import.txt deleted file mode 100644 index d3dd72c13..000000000 --- a/npc/si-outside/_import.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Map si-outside: Secret Island -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/si-outside/_mobs.txt", -"npc/si-outside/_warps.txt", diff --git a/npc/si-outside/_mobs.txt b/npc/si-outside/_mobs.txt deleted file mode 100644 index a37debb8d..000000000 --- a/npc/si-outside/_mobs.txt +++ /dev/null @@ -1,9 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map si-outside: Secret Island mobs -si-outside,120,68,46,21 monster Golden Scorpion 1078,7,10000,5000 -si-outside,98,47,46,32 monster Night Scorpion 1077,5,20000,10000 -si-outside,98,47,46,32 monster BlackSlime 1119,10,15000,10000 -si-outside,91,60,76,47 monster Red Slime 1092,12,12000,4000 -si-outside,91,60,76,47 monster Yellow Slime 1091,15,30000,30000 -si-outside,91,56,76,43 monster Clover Patch 1028,2,75000,35000 -si-outside,91,60,76,47 monster Mouboo 1023,3,12000,4000 diff --git a/npc/si-outside/_warps.txt b/npc/si-outside/_warps.txt deleted file mode 100644 index 3fd5e21cd..000000000 --- a/npc/si-outside/_warps.txt +++ /dev/null @@ -1,5 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map si-outside: Secret Island warps -si-outside,94,89,0 warp #si-outside_94_89 0,0,si-cave,102,84 -si-outside,164,105,0 warp #si-outside_164_105 0,0,018-1,166,49 -si-outside,73,24,0 warp #si-outside_73_24 0,0,si-house,33,34 diff --git a/npc/somber-cave/_import.txt b/npc/somber-cave/_import.txt deleted file mode 100644 index d6e039942..000000000 --- a/npc/somber-cave/_import.txt +++ /dev/null @@ -1,4 +0,0 @@ -// Map somber-cave: Somber Cave -// This file is generated automatically. All manually added changes will be removed when running the Converter. -"npc/somber-cave/_mobs.txt", -"npc/somber-cave/_warps.txt", diff --git a/npc/somber-cave/_mobs.txt b/npc/somber-cave/_mobs.txt deleted file mode 100644 index cd742609d..000000000 --- a/npc/somber-cave/_mobs.txt +++ /dev/null @@ -1,16 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map somber-cave: Somber Cave mobs -somber-cave,81,91,1,1 monster Dark Lizard 1051,2,0,20000 -somber-cave,37,61,1,1 monster Dark Lizard 1051,2,0,20000 -somber-cave,45,114,1,1 monster Dark Lizard 1051,2,0,20000 -somber-cave,0,0,0,0 monster Lava Slime 1097,8,10000,0 -somber-cave,0,0,0,0 monster Fire Goblin 1067,30,20,0 -somber-cave,75,53,1,1 monster Black Scorpion 1074,1,0,10000 -somber-cave,115,116,2,2 monster Black Scorpion 1074,1,0,10000 -somber-cave,0,0,0,0 monster Evil Mushroom 1042,10,20,0 -somber-cave,39,57,21,38 monster Lava Slime 1097,12,10000,0 -somber-cave,96,46,34,27 monster Lava Slime 1097,10,10000,0 -somber-cave,88,84,26,10 monster Lava Slime 1097,5,10000,0 -somber-cave,123,100,7,26 monster Lava Slime 1097,4,10000,0 -somber-cave,66,111,48,15 monster Lava Slime 1097,11,10000,0 -somber-cave,74,72,56,53 monster Night Scorpion 1077,9,15000,0 diff --git a/npc/somber-cave/_warps.txt b/npc/somber-cave/_warps.txt deleted file mode 100644 index 3595731a5..000000000 --- a/npc/somber-cave/_warps.txt +++ /dev/null @@ -1,3 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map somber-cave: Somber Cave warps -somber-cave,114,23,0 warp #somber-cave_114_23 0,0,009-1,1,1 |