From 128dd35bf704e74e3d31584cdc5352a884491462 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 9 Apr 2021 23:44:40 -0300 Subject: Renegerate map files, fixing bugs --- conf/map/maps.conf | 2 + db/map_index.txt | 194 +++++++++++++++++++++++----------------------- npc/005-3/_warps.txt | 1 - npc/011-1/_import.txt | 9 +++ npc/011-1/_mobs.txt | 14 ++++ npc/011-1/_savepoints.txt | 2 - npc/011-1/_warps.txt | 6 ++ npc/013-3/_import.txt | 9 +++ npc/013-3/_mobs.txt | 28 +++++++ npc/013-3/_savepoints.txt | 2 - npc/013-3/_warps.txt | 26 +++++++ npc/043-4/_warps.txt | 1 - npc/_import.txt | 2 + 13 files changed, 194 insertions(+), 102 deletions(-) delete mode 100644 npc/011-1/_savepoints.txt delete mode 100644 npc/013-3/_savepoints.txt diff --git a/conf/map/maps.conf b/conf/map/maps.conf index c451ad1f..9091d6db 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -33,6 +33,7 @@ map_list: ( "009-8", "010-1", "010-2", + "011-1", "011-3", "011-4", "011-6", @@ -41,6 +42,7 @@ map_list: ( "012-4", "013-1", "013-2", + "013-3", "014-1", "014-3", "015-1", diff --git a/db/map_index.txt b/db/map_index.txt index e30569f5..36fd86bc 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -30,99 +30,101 @@ 009-8 30 010-1 31 010-2 32 -011-3 33 -011-4 34 -011-6 35 -012-1 36 -012-3 37 -012-4 38 -013-1 39 -013-2 40 -014-1 41 -014-3 42 -015-1 43 -015-3 44 -016-1 45 -016-2 46 -017-1 47 -017-2 48 -017-3 49 -017-4 50 -017-9 51 -018-1 52 -018-2 53 -018-3 54 -019-1 55 -019-3 56 -019-4 57 -020-1 58 -020-2 59 -020-3 60 -021-3 61 -023-1 62 -023-2 63 -023-3 64 -025-1 65 -025-3 66 -025-4 67 -026-1 68 -026-2 69 -027-1 70 -027-2 71 -027-3 72 -027-4 73 -027-5 74 -027-6 75 -027-7 76 -027-8 77 -028-1 78 -028-3 79 -029-1 80 -029-2 81 -029-3 82 -029-4 83 -030-1 84 -030-2 85 -030-3 86 -030-4 87 -031-1 88 -031-2 89 -031-3 90 -031-4 91 -032-3 92 -033-1 93 -034-1 94 -034-2 95 -035-2 96 -036-2 97 -041-1 98 -042-1 99 -043-1 100 -043-3 101 -043-4 102 -045-1 103 -046-1 104 -046-3 105 -047-1 106 -047-3 107 -048-2 108 -051-1 109 -051-3 110 -052-1 111 -052-2 112 -055-1 113 -055-3 114 -056-2 115 -057-1 116 -069-2 117 -070-1 118 -070-3 119 -099-1 120 -099-2 121 -099-3 122 -099-4 123 -099-5 124 -099-6 125 -099-7 126 -099-8 127 -botcheck 128 +011-1 33 +011-3 34 +011-4 35 +011-6 36 +012-1 37 +012-3 38 +012-4 39 +013-1 40 +013-2 41 +013-3 42 +014-1 43 +014-3 44 +015-1 45 +015-3 46 +016-1 47 +016-2 48 +017-1 49 +017-2 50 +017-3 51 +017-4 52 +017-9 53 +018-1 54 +018-2 55 +018-3 56 +019-1 57 +019-3 58 +019-4 59 +020-1 60 +020-2 61 +020-3 62 +021-3 63 +023-1 64 +023-2 65 +023-3 66 +025-1 67 +025-3 68 +025-4 69 +026-1 70 +026-2 71 +027-1 72 +027-2 73 +027-3 74 +027-4 75 +027-5 76 +027-6 77 +027-7 78 +027-8 79 +028-1 80 +028-3 81 +029-1 82 +029-2 83 +029-3 84 +029-4 85 +030-1 86 +030-2 87 +030-3 88 +030-4 89 +031-1 90 +031-2 91 +031-3 92 +031-4 93 +032-3 94 +033-1 95 +034-1 96 +034-2 97 +035-2 98 +036-2 99 +041-1 100 +042-1 101 +043-1 102 +043-3 103 +043-4 104 +045-1 105 +046-1 106 +046-3 107 +047-1 108 +047-3 109 +048-2 110 +051-1 111 +051-3 112 +052-1 113 +052-2 114 +055-1 115 +055-3 116 +056-2 117 +057-1 118 +069-2 119 +070-1 120 +070-3 121 +099-1 122 +099-2 123 +099-3 124 +099-4 125 +099-5 126 +099-6 127 +099-7 128 +099-8 129 +botcheck 130 diff --git a/npc/005-3/_warps.txt b/npc/005-3/_warps.txt index 609d525d..eccfbefb 100644 --- a/npc/005-3/_warps.txt +++ b/npc/005-3/_warps.txt @@ -8,6 +8,5 @@ 005-3,78,90,0 warp #005-3_78_90 0,0,043-3,116,37 005-3,33,84,0 warp #005-3_33_84 0,0,043-3,31,35 005-3,107,102,0 warp #005-3_107_102 0,0,006-1,64,78 -005-3,27,41,0 warp #005-3_27_41 0,0,043-5,126,27 005-3,101,30,0 warp #005-3_101_30 0,0,005-3,101,35 005-3,110,79,0 warp #005-3_110_79 0,0,005-3,110,75 diff --git a/npc/011-1/_import.txt b/npc/011-1/_import.txt index e69de29b..c24607c5 100644 --- a/npc/011-1/_import.txt +++ b/npc/011-1/_import.txt @@ -0,0 +1,9 @@ +// Map 011-1: Woodland +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/011-1/_mobs.txt", +"npc/011-1/_warps.txt", +"npc/011-1/alchemist.txt", +"npc/011-1/auldsbel.txt", +"npc/011-1/mapflags.txt", +"npc/011-1/oscar.txt", +"npc/011-1/shops.txt", diff --git a/npc/011-1/_mobs.txt b/npc/011-1/_mobs.txt index b579ef20..6d259d6e 100644 --- a/npc/011-1/_mobs.txt +++ b/npc/011-1/_mobs.txt @@ -1,2 +1,16 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 011-1: Woodland mobs +011-1,0,0,0,0 monster The EvilMushroom 1013,30,0,0 +011-1,0,0,0,0 monster The PinkFlower 1014,20,0,0 +011-1,0,0,0,0 monster The SpikyMushroom 1019,5,0,0 +011-1,0,0,0,0 monster The Snail 1041,1,0,0 +011-1,0,0,0,0 monster The Mouboo 1028,5,0,10 +011-1,0,0,0,0 monster The MauvePlant 1029,3,270000,180000 +011-1,0,0,0,0 monster The AlizarinPlant 1032,1,2700000,1800000 +011-1,0,0,0,0 monster The Silkworm 1035,2,60000,30000 +011-1,0,0,0,0 monster The CloverPatch 1037,2,0,1000 +011-1,0,0,0,0 monster The Squirrel 1038,25,30,20 +011-1,0,0,0,0 monster The Butterfly 1055,10,30,20 +011-1,0,0,0,0 monster The Mouboo 1028,5,0,10 +011-1,1,1,0,0 monster The ManaBug 1131,18,0,0 +011-1,92,44,17,14 monster The Maggot 1002,10,0,0 diff --git a/npc/011-1/_savepoints.txt b/npc/011-1/_savepoints.txt deleted file mode 100644 index e3acbb40..00000000 --- a/npc/011-1/_savepoints.txt +++ /dev/null @@ -1,2 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 011-1: Woodland saves diff --git a/npc/011-1/_warps.txt b/npc/011-1/_warps.txt index a27aa2ef..263d9e21 100644 --- a/npc/011-1/_warps.txt +++ b/npc/011-1/_warps.txt @@ -1,2 +1,8 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 011-1: Woodland warps +011-1,58,92,0 warp #011-1_58_92 0,0,011-3,31,45 +011-1,30,61,0 warp #011-1_30_61 0,2,014-1,108,91 +011-1,49,104,0 warp #011-1_49_104 1,0,010-1,48,25 +011-1,124,62,0 warp #011-1_124_62 0,3,008-1,25,61 +011-1,73,9,0 warp #011-1_73_9 1,0,012-1,132,175 +011-1,38,36,0 warp #011-1_38_36 0,0,011-6,49,100 diff --git a/npc/013-3/_import.txt b/npc/013-3/_import.txt index e69de29b..7f84dcbc 100644 --- a/npc/013-3/_import.txt +++ b/npc/013-3/_import.txt @@ -0,0 +1,9 @@ +// Map 013-3: Woodland Hills Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/013-3/_mobs.txt", +"npc/013-3/_warps.txt", +"npc/013-3/barrier.txt", +"npc/013-3/mapflags.txt", +"npc/013-3/mask_chest.txt", +"npc/013-3/misc.txt", +"npc/013-3/sword_chest.txt", diff --git a/npc/013-3/_mobs.txt b/npc/013-3/_mobs.txt index 0ed786f4..9079fa6e 100644 --- a/npc/013-3/_mobs.txt +++ b/npc/013-3/_mobs.txt @@ -1,2 +1,30 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 013-3: Woodland Hills Cave mobs +013-3,28,89,8,26 monster The CaveSnake 1021,10,120000,60000 +013-3,61,22,1,1 monster The FireSkull 1023,1,120000,60000 +013-3,81,22,1,1 monster The PoisonSkull 1024,1,120000,60000 +013-3,109,31,3,11 monster The BlackScorpionMob 1009,20,50000,25000 +013-3,119,84,13,19 monster The Spider 1012,20,120000,40000 +013-3,176,23,2,3 monster The Spider 1012,10,100000,40000 +013-3,82,75,1,1 monster The FireSkull 1023,1,180000,60000 +013-3,142,37,1,1 monster The PoisonSkull 1024,1,180000,60000 +013-3,79,134,10,8 monster The BlackScorpionMob 1009,5,80000,40000 +013-3,71,169,19,8 monster The BlackScorpionMob 1009,5,80000,40000 +013-3,64,85,4,10 monster The BlackScorpionMob 1009,10,80000,40000 +013-3,81,92,1,10 monster The BlackScorpionMob 1009,10,80000,40000 +013-3,163,84,16,18 monster The Snake 1010,30,120000,50000 +013-3,162,85,16,18 monster The Spider 1012,30,120000,50000 +013-3,172,77,9,12 monster The BlackScorpionMob 1009,15,120000,50000 +013-3,145,36,10,7 monster The RedSlime 1008,25,80000,40000 +013-3,167,37,11,5 monster The Snake 1010,20,120000,40000 +013-3,165,25,8,5 monster The BlackScorpionMob 1009,15,120000,40000 +013-3,71,39,1,1 monster The Snake 1010,2,40000,20000 +013-3,159,102,1,2 monster The YellowSlime 1007,2,80000,40000 +013-3,67,22,1,1 monster The Maggot 1002,2,40000,20000 +013-3,75,22,1,1 monster The Maggot 1002,2,40000,20000 +013-3,76,39,3,2 monster The BlackScorpionMob 1009,8,40000,20000 +013-3,65,39,3,2 monster The RedSlime 1008,8,40000,20000 +013-3,62,33,1,0 monster The PoisonSkull 1024,1,120000,60000 +013-3,80,33,1,0 monster The FireSkull 1023,1,120000,60000 +013-3,75,46,1,0 monster The PoisonSkull 1024,1,120000,60000 +013-3,67,46,1,0 monster The FireSkull 1023,1,120000,60000 diff --git a/npc/013-3/_savepoints.txt b/npc/013-3/_savepoints.txt deleted file mode 100644 index 4948515a..00000000 --- a/npc/013-3/_savepoints.txt +++ /dev/null @@ -1,2 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 013-3: Woodland Hills Cave saves diff --git a/npc/013-3/_warps.txt b/npc/013-3/_warps.txt index 8bf23569..7d484e57 100644 --- a/npc/013-3/_warps.txt +++ b/npc/013-3/_warps.txt @@ -1,2 +1,28 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 013-3: Woodland Hills Cave warps +013-3,34,63,0 warp #013-3_34_63 0,0,013-1,125,103 +013-3,36,96,0 warp #013-3_36_96 0,0,013-3,79,126 +013-3,79,125,0 warp #013-3_79_125 0,0,013-3,35,96 +013-3,22,115,0 warp #013-3_22_115 0,0,018-1,115,41 +013-3,139,45,0 warp #013-3_139_45 0,0,018-1,127,37 +013-3,61,179,0 warp #013-3_61_179 0,0,018-1,134,46 +013-3,69,143,0 warp #013-3_69_143 0,0,018-3,50,89 +013-3,81,103,0 warp #013-3_81_103 0,0,018-1,147,41 +013-3,177,91,0 warp #013-3_177_91 0,0,018-1,177,21 +013-3,178,44,0 warp #013-3_178_44 0,0,018-3,97,70 +013-3,169,45,0 warp #013-3_169_45 0,0,018-3,27,55 +013-3,152,28,0 warp #013-3_152_28 0,0,018-3,134,62 +013-3,123,104,0 warp #013-3_123_104 0,0,018-3,172,22 +013-3,147,104,0 warp #013-3_147_104 0,0,018-3,177,22 +013-3,158,66,0 warp #013-3_158_66 0,0,018-3,27,90 +013-3,75,51,0 warp #013-3_75_51 0,0,013-3,109,65 +013-3,109,64,0 warp #013-3_109_64 0,0,013-3,75,50 +013-3,67,51,0 warp #013-3_67_51 0,0,018-3,90,51 +013-3,71,20,0 warp #013-3_71_20 0,0,013-3,28,39 +013-3,28,41,0 warp #013-3_28_41 0,0,013-3,71,21 +013-3,71,42,0 warp #013-3_71_42 0,0,013-3,109,21 +013-3,109,20,0 warp #013-3_109_20 0,0,013-3,71,41 +013-3,111,42,0 warp #013-3_111_42 0,0,018-3,71,123 +013-3,62,100,0 warp #013-3_62_100 0,0,018-3,174,86 +013-3,68,97,0 warp #013-3_68_97 0,0,018-3,102,70 +013-3,160,103,0 warp #013-3_160_103 0,0,009-3,117,20 diff --git a/npc/043-4/_warps.txt b/npc/043-4/_warps.txt index f33660af..8fbc71b0 100644 --- a/npc/043-4/_warps.txt +++ b/npc/043-4/_warps.txt @@ -3,4 +3,3 @@ 043-4,47,68,0 warp #043-4_47_68 0,0,043-3,77,31 043-4,153,27,0 warp #043-4_153_27 0,0,043-4,193,32 043-4,193,33,0 warp #043-4_193_33 0,0,043-4,153,28 -043-4,194,24,0 warp #043-4_194_24 0,0,043-5,30,107 diff --git a/npc/_import.txt b/npc/_import.txt index 5c4cc0f6..49026b44 100755 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -32,6 +32,7 @@ @include "npc/009-8/_import.txt" @include "npc/010-1/_import.txt" @include "npc/010-2/_import.txt" +@include "npc/011-1/_import.txt" @include "npc/011-3/_import.txt" @include "npc/011-4/_import.txt" @include "npc/011-6/_import.txt" @@ -40,6 +41,7 @@ @include "npc/012-4/_import.txt" @include "npc/013-1/_import.txt" @include "npc/013-2/_import.txt" +@include "npc/013-3/_import.txt" @include "npc/014-1/_import.txt" @include "npc/014-3/_import.txt" @include "npc/015-1/_import.txt" -- cgit v1.2.3-60-g2f50