diff options
-rw-r--r-- | conf/map/maps.conf | 1 | ||||
-rw-r--r-- | db/map_index.txt | 1 | ||||
-rw-r--r-- | maps/pre-re/099-1.mcache | bin | 590 -> 668 bytes | |||
-rw-r--r-- | maps/pre-re/099-2.mcache | bin | 442 -> 478 bytes | |||
-rw-r--r-- | maps/pre-re/099-6.mcache | bin | 438 -> 470 bytes | |||
-rw-r--r-- | maps/pre-re/099-7.mcache | bin | 1260 -> 1332 bytes | |||
-rw-r--r-- | maps/pre-re/sec_pri.mcache | bin | 0 -> 115 bytes | |||
-rw-r--r-- | npc/099-1/_warps.txt | 130 | ||||
-rw-r--r-- | npc/099-2/_warps.txt | 40 | ||||
-rw-r--r-- | npc/099-6/_warps.txt | 40 | ||||
-rw-r--r-- | npc/_anchors.txt | 2 | ||||
-rw-r--r-- | npc/_import.txt | 1 | ||||
-rw-r--r-- | npc/sec_pri/_import.txt | 2 |
13 files changed, 111 insertions, 106 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 8e521f45..68d2bd20 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -132,4 +132,5 @@ map_list: ( "099-8", "botcheck", "fermi", + "sec_pri", ) diff --git a/db/map_index.txt b/db/map_index.txt index d4beb2f3..354f427b 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -129,3 +129,4 @@ 099-8 129 botcheck 130 fermi 131 +sec_pri 132 diff --git a/maps/pre-re/099-1.mcache b/maps/pre-re/099-1.mcache Binary files differindex 1b9921c9..20d03357 100644 --- a/maps/pre-re/099-1.mcache +++ b/maps/pre-re/099-1.mcache diff --git a/maps/pre-re/099-2.mcache b/maps/pre-re/099-2.mcache Binary files differindex 3887f059..ac59ae30 100644 --- a/maps/pre-re/099-2.mcache +++ b/maps/pre-re/099-2.mcache diff --git a/maps/pre-re/099-6.mcache b/maps/pre-re/099-6.mcache Binary files differindex 2a26dece..c1406542 100644 --- a/maps/pre-re/099-6.mcache +++ b/maps/pre-re/099-6.mcache diff --git a/maps/pre-re/099-7.mcache b/maps/pre-re/099-7.mcache Binary files differindex 82b865c3..c3cb828c 100644 --- a/maps/pre-re/099-7.mcache +++ b/maps/pre-re/099-7.mcache diff --git a/maps/pre-re/sec_pri.mcache b/maps/pre-re/sec_pri.mcache Binary files differnew file mode 100644 index 00000000..b6f9e7d8 --- /dev/null +++ b/maps/pre-re/sec_pri.mcache diff --git a/npc/099-1/_warps.txt b/npc/099-1/_warps.txt index 936cd0c1..1416158a 100644 --- a/npc/099-1/_warps.txt +++ b/npc/099-1/_warps.txt @@ -1,67 +1,67 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 099-1: Keshlam's Adventurer's Guild warps -099-1,29,15,0 warp #099-1_29_15 0,0,099-2,25,22 -099-1,77,15,0 warp #099-1_77_15 0,0,099-2,59,21 -099-1,105,7,0 warp #099-1_105_7 0,0,099-2,90,21 -099-1,91,135,0 warp #099-1_91_135 0,0,099-2,121,21 -099-1,20,114,0 warp #099-1_20_114 0,0,099-2,25,49 -099-1,97,84,0 warp #099-1_97_84 0,0,099-2,59,49 -099-1,119,116,0 warp #099-1_119_116 0,0,099-3,72,26 -099-1,112,125,0 warp #099-1_112_125 0,0,099-2,91,49 -099-1,64,113,0 warp #099-1_64_113 0,0,099-2,121,48 -099-1,64,71,0 warp #099-1_64_71 0,0,099-2,25,75 -099-1,42,50,0 warp #099-1_42_50 0,0,099-2,59,75 -099-1,92,43,0 warp #099-1_92_43 0,0,099-2,91,75 -099-1,15,76,0 warp #099-1_15_76 0,0,099-2,121,75 -099-1,42,124,0 warp #099-1_42_124 0,0,099-2,25,101 -099-1,113,60,0 warp #099-1_113_60 0,0,099-2,60,101 -099-1,131,80,0 warp #099-1_131_80 0,0,099-2,91,101 -099-1,72,57,0 warp #099-1_72_57 0,0,099-2,121,101 -099-1,47,91,0 warp #099-1_47_91 0,0,099-2,26,132 -099-1,102,23,0 warp #099-1_102_23 0,0,099-2,60,132 -099-1,120,43,0 warp #099-1_120_43 0,0,099-2,92,132 -099-1,97,104,0 warp #099-1_97_104 0,0,099-2,121,132 -099-1,48,15,0 warp #099-1_48_15 0,0,099-3,29,63 -099-1,76,24,0 warp #099-1_76_24 0,0,099-3,35,63 -099-1,128,16,0 warp #099-1_128_16 0,0,099-3,41,63 -099-1,110,46,0 warp #099-1_110_46 0,0,099-3,47,63 -099-1,120,77,0 warp #099-1_120_77 0,0,099-3,53,63 -099-1,113,96,0 warp #099-1_113_96 0,0,099-3,59,63 -099-1,125,96,0 warp #099-1_125_96 0,0,099-3,79,63 -099-1,60,91,0 warp #099-1_60_91 0,0,099-3,85,63 -099-1,20,53,0 warp #099-1_20_53 0,0,099-3,91,63 -099-1,14,56,0 warp #099-1_14_56 0,0,099-3,97,63 -099-1,22,69,0 warp #099-1_22_69 0,0,099-3,103,63 -099-1,19,92,0 warp #099-1_19_92 0,0,099-3,109,63 -099-1,57,50,0 warp #099-1_57_50 0,0,099-3,115,63 -099-1,128,43,0 warp #099-1_128_43 0,0,099-1,35,30 -099-1,21,15,0 warp #099-1_21_15 0,0,099-6,121,132 -099-1,39,15,0 warp #099-1_39_15 0,0,099-1,35,30 -099-1,58,15,0 warp #099-1_58_15 0,0,099-6,92,132 -099-1,67,15,0 warp #099-1_67_15 0,0,099-1,35,30 -099-1,85,15,0 warp #099-1_85_15 0,0,099-6,59,21 -099-1,97,7,0 warp #099-1_97_7 0,0,099-1,35,30 -099-1,97,30,0 warp #099-1_97_30 0,0,099-6,26,132 -099-1,104,30,0 warp #099-1_104_30 0,0,099-6,90,21 -099-1,108,23,0 warp #099-1_108_23 0,0,099-6,121,101 -099-1,99,43,0 warp #099-1_99_43 0,0,099-1,35,30 -099-1,82,43,0 warp #099-1_82_43 0,0,099-6,91,101 -099-1,82,24,0 warp #099-1_82_24 0,0,099-1,35,30 -099-1,69,24,0 warp #099-1_69_24 0,0,099-6,60,132 -099-1,95,60,0 warp #099-1_95_60 0,0,099-6,60,101 -099-1,78,57,0 warp #099-1_78_57 0,0,099-6,25,22 -099-1,66,57,0 warp #099-1_66_57 0,0,099-6,25,101 -099-1,105,60,0 warp #099-1_105_60 0,0,099-1,35,30 -099-1,50,50,0 warp #099-1_50_50 0,0,099-1,35,30 -099-1,34,50,0 warp #099-1_34_50 0,0,099-6,121,75 -099-1,27,50,0 warp #099-1_27_50 0,0,099-6,91,75 -099-1,25,79,0 warp #099-1_25_79 0,0,099-6,59,75 -099-1,40,103,0 warp #099-1_40_103 0,0,099-6,25,75 -099-1,29,114,0 warp #099-1_29_114 0,0,099-1,35,30 -099-1,29,135,0 warp #099-1_29_135 0,0,099-6,121,48 -099-1,58,128,0 warp #099-1_58_128 0,0,099-6,91,49 -099-1,84,116,0 warp #099-1_84_116 0,0,099-6,59,49 -099-1,125,125,0 warp #099-1_125_125 0,0,099-1,35,30 -099-1,83,104,0 warp #099-1_83_104 0,0,099-6,25,49 -099-1,88,87,0 warp #099-1_88_87 0,0,099-1,35,30 -099-1,79,71,0 warp #099-1_79_71 0,0,099-6,121,21 +099-1,49,30,0 warp #099-1_49_30 0,0,099-2,45,27 +099-1,97,30,0 warp #099-1_97_30 0,0,099-2,79,36 +099-1,125,22,0 warp #099-1_125_22 0,0,099-2,110,36 +099-1,111,150,0 warp #099-1_111_150 0,0,099-2,141,36 +099-1,40,129,0 warp #099-1_40_129 0,0,099-2,45,64 +099-1,117,99,0 warp #099-1_117_99 0,0,099-2,79,64 +099-1,139,131,0 warp #099-1_139_131 0,0,099-3,92,41 +099-1,132,140,0 warp #099-1_132_140 0,0,099-2,111,64 +099-1,84,128,0 warp #099-1_84_128 0,0,099-2,141,64 +099-1,84,86,0 warp #099-1_84_86 0,0,099-2,45,90 +099-1,62,65,0 warp #099-1_62_65 0,0,099-2,79,90 +099-1,112,58,0 warp #099-1_112_58 0,0,099-2,111,90 +099-1,35,91,0 warp #099-1_35_91 0,0,099-2,141,90 +099-1,62,139,0 warp #099-1_62_139 0,0,099-2,45,116 +099-1,133,75,0 warp #099-1_133_75 0,0,099-2,80,116 +099-1,151,95,0 warp #099-1_151_95 0,0,099-2,111,116 +099-1,92,72,0 warp #099-1_92_72 0,0,099-2,141,116 +099-1,67,106,0 warp #099-1_67_106 0,0,099-2,46,147 +099-1,122,38,0 warp #099-1_122_38 0,0,099-2,80,147 +099-1,140,58,0 warp #099-1_140_58 0,0,099-2,112,147 +099-1,117,119,0 warp #099-1_117_119 0,0,099-2,141,147 +099-1,68,30,0 warp #099-1_68_30 0,0,099-3,49,78 +099-1,96,39,0 warp #099-1_96_39 0,0,099-3,55,78 +099-1,148,31,0 warp #099-1_148_31 0,0,099-3,61,78 +099-1,130,61,0 warp #099-1_130_61 0,0,099-3,67,78 +099-1,140,92,0 warp #099-1_140_92 0,0,099-3,73,78 +099-1,133,111,0 warp #099-1_133_111 0,0,099-3,79,78 +099-1,145,111,0 warp #099-1_145_111 0,0,099-3,99,78 +099-1,80,106,0 warp #099-1_80_106 0,0,099-3,105,78 +099-1,40,68,0 warp #099-1_40_68 0,0,099-3,111,78 +099-1,34,71,0 warp #099-1_34_71 0,0,099-3,117,78 +099-1,42,84,0 warp #099-1_42_84 0,0,099-3,123,78 +099-1,39,107,0 warp #099-1_39_107 0,0,099-3,129,78 +099-1,77,65,0 warp #099-1_77_65 0,0,099-3,135,78 +099-1,148,58,0 warp #099-1_148_58 0,0,099-1,55,45 +099-1,41,30,0 warp #099-1_41_30 0,0,099-6,141,147 +099-1,59,30,0 warp #099-1_59_30 0,0,099-1,55,45 +099-1,78,30,0 warp #099-1_78_30 0,0,099-6,112,147 +099-1,87,30,0 warp #099-1_87_30 0,0,099-1,55,45 +099-1,105,30,0 warp #099-1_105_30 0,0,099-6,79,36 +099-1,117,22,0 warp #099-1_117_22 0,0,099-1,55,45 +099-1,117,45,0 warp #099-1_117_45 0,0,099-6,46,147 +099-1,124,45,0 warp #099-1_124_45 0,0,099-6,110,36 +099-1,128,38,0 warp #099-1_128_38 0,0,099-6,141,116 +099-1,119,58,0 warp #099-1_119_58 0,0,099-1,55,45 +099-1,102,58,0 warp #099-1_102_58 0,0,099-6,111,116 +099-1,102,39,0 warp #099-1_102_39 0,0,099-1,55,45 +099-1,89,39,0 warp #099-1_89_39 0,0,099-6,80,147 +099-1,115,75,0 warp #099-1_115_75 0,0,099-6,80,116 +099-1,98,72,0 warp #099-1_98_72 0,0,099-6,45,37 +099-1,86,72,0 warp #099-1_86_72 0,0,099-6,45,116 +099-1,125,75,0 warp #099-1_125_75 0,0,099-1,55,45 +099-1,70,65,0 warp #099-1_70_65 0,0,099-1,55,45 +099-1,54,65,0 warp #099-1_54_65 0,0,099-6,141,90 +099-1,47,65,0 warp #099-1_47_65 0,0,099-6,111,90 +099-1,45,94,0 warp #099-1_45_94 0,0,099-6,79,90 +099-1,60,118,0 warp #099-1_60_118 0,0,099-6,45,90 +099-1,49,129,0 warp #099-1_49_129 0,0,099-1,55,45 +099-1,49,150,0 warp #099-1_49_150 0,0,099-6,141,63 +099-1,78,143,0 warp #099-1_78_143 0,0,099-6,111,64 +099-1,104,131,0 warp #099-1_104_131 0,0,099-6,79,64 +099-1,145,140,0 warp #099-1_145_140 0,0,099-1,55,45 +099-1,103,119,0 warp #099-1_103_119 0,0,099-6,45,64 +099-1,108,102,0 warp #099-1_108_102 0,0,099-1,55,45 +099-1,99,86,0 warp #099-1_99_86 0,0,099-6,141,36 diff --git a/npc/099-2/_warps.txt b/npc/099-2/_warps.txt index b1b33cbd..d6630c33 100644 --- a/npc/099-2/_warps.txt +++ b/npc/099-2/_warps.txt @@ -1,22 +1,22 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 099-2: Keshlam's Adventurer's Guild Quarters warps -099-2,25,23,0 warp #099-2_25_23 0,0,099-1,29,17 -099-2,59,22,0 warp #099-2_59_22 0,0,099-1,77,17 -099-2,90,22,0 warp #099-2_90_22 0,0,099-1,105,9 -099-2,121,22,0 warp #099-2_121_22 0,0,099-1,91,137 -099-2,25,50,0 warp #099-2_25_50 0,0,099-1,20,116 -099-2,59,50,0 warp #099-2_59_50 0,0,099-1,97,86 -099-2,91,50,0 warp #099-2_91_50 0,0,099-1,112,127 -099-2,121,49,0 warp #099-2_121_49 0,0,099-1,64,115 -099-2,25,76,0 warp #099-2_25_76 0,0,099-1,64,73 -099-2,59,76,0 warp #099-2_59_76 0,0,099-1,42,52 -099-2,91,76,0 warp #099-2_91_76 0,0,099-1,92,45 -099-2,121,76,0 warp #099-2_121_76 0,0,099-1,15,78 -099-2,25,102,0 warp #099-2_25_102 0,0,099-1,49,130 -099-2,60,102,0 warp #099-2_60_102 0,0,099-1,113,62 -099-2,91,102,0 warp #099-2_91_102 0,0,099-1,131,79 -099-2,121,102,0 warp #099-2_121_102 0,0,099-1,72,59 -099-2,26,133,0 warp #099-2_26_133 0,0,099-1,47,93 -099-2,60,133,0 warp #099-2_60_133 0,0,099-1,102,25 -099-2,92,133,0 warp #099-2_92_133 0,0,099-1,120,45 -099-2,121,133,0 warp #099-2_121_133 0,0,099-1,97,106 +099-2,45,38,0 warp #099-2_45_38 0,0,099-1,49,32 +099-2,79,37,0 warp #099-2_79_37 0,0,099-1,97,32 +099-2,110,37,0 warp #099-2_110_37 0,0,099-1,125,24 +099-2,141,37,0 warp #099-2_141_37 0,0,099-1,111,152 +099-2,45,65,0 warp #099-2_45_65 0,0,099-1,40,131 +099-2,79,65,0 warp #099-2_79_65 0,0,099-1,117,101 +099-2,111,65,0 warp #099-2_111_65 0,0,099-1,132,142 +099-2,141,64,0 warp #099-2_141_64 0,0,099-1,84,130 +099-2,45,91,0 warp #099-2_45_91 0,0,099-1,84,88 +099-2,79,91,0 warp #099-2_79_91 0,0,099-1,62,67 +099-2,111,91,0 warp #099-2_111_91 0,0,099-1,112,60 +099-2,141,91,0 warp #099-2_141_91 0,0,099-1,35,93 +099-2,45,117,0 warp #099-2_45_117 0,0,099-1,69,145 +099-2,80,117,0 warp #099-2_80_117 0,0,099-1,133,77 +099-2,111,117,0 warp #099-2_111_117 0,0,099-1,151,94 +099-2,141,117,0 warp #099-2_141_117 0,0,099-1,92,74 +099-2,46,148,0 warp #099-2_46_148 0,0,099-1,67,108 +099-2,80,148,0 warp #099-2_80_148 0,0,099-1,122,40 +099-2,112,148,0 warp #099-2_112_148 0,0,099-1,140,60 +099-2,141,148,0 warp #099-2_141_148 0,0,099-1,117,121 diff --git a/npc/099-6/_warps.txt b/npc/099-6/_warps.txt index a000d250..066fcd62 100644 --- a/npc/099-6/_warps.txt +++ b/npc/099-6/_warps.txt @@ -1,22 +1,22 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 099-6: Keshlam's Adventurer's Guild Quarters warps -099-6,25,23,0 warp #099-6_25_23 0,0,099-1,29,17 -099-6,59,22,0 warp #099-6_59_22 0,0,099-1,77,17 -099-6,90,22,0 warp #099-6_90_22 0,0,099-1,105,9 -099-6,121,22,0 warp #099-6_121_22 0,0,099-1,91,137 -099-6,25,50,0 warp #099-6_25_50 0,0,099-1,20,116 -099-6,59,50,0 warp #099-6_59_50 0,0,099-1,97,86 -099-6,91,50,0 warp #099-6_91_50 0,0,099-1,112,127 -099-6,121,49,0 warp #099-6_121_49 0,0,099-1,64,115 -099-6,25,76,0 warp #099-6_25_76 0,0,099-1,64,73 -099-6,59,76,0 warp #099-6_59_76 0,0,099-1,42,52 -099-6,91,76,0 warp #099-6_91_76 0,0,099-1,92,45 -099-6,121,76,0 warp #099-6_121_76 0,0,099-1,34,52 -099-6,25,102,0 warp #099-6_25_102 0,0,099-1,49,130 -099-6,60,102,0 warp #099-6_60_102 0,0,099-1,113,62 -099-6,91,102,0 warp #099-6_91_102 0,0,099-1,131,79 -099-6,121,102,0 warp #099-6_121_102 0,0,099-1,72,59 -099-6,26,133,0 warp #099-6_26_133 0,0,099-1,47,93 -099-6,60,133,0 warp #099-6_60_133 0,0,099-1,102,25 -099-6,92,133,0 warp #099-6_92_133 0,0,099-1,120,45 -099-6,121,133,0 warp #099-6_121_133 0,0,099-1,97,106 +099-6,45,38,0 warp #099-6_45_38 0,0,099-1,49,32 +099-6,79,37,0 warp #099-6_79_37 0,0,099-1,97,32 +099-6,110,37,0 warp #099-6_110_37 0,0,099-1,125,24 +099-6,141,37,0 warp #099-6_141_37 0,0,099-1,111,152 +099-6,45,65,0 warp #099-6_45_65 0,0,099-1,40,131 +099-6,79,65,0 warp #099-6_79_65 0,0,099-1,117,101 +099-6,111,65,0 warp #099-6_111_65 0,0,099-1,132,142 +099-6,141,64,0 warp #099-6_141_64 0,0,099-1,84,130 +099-6,45,91,0 warp #099-6_45_91 0,0,099-1,84,88 +099-6,79,91,0 warp #099-6_79_91 0,0,099-1,62,67 +099-6,111,91,0 warp #099-6_111_91 0,0,099-1,112,60 +099-6,141,91,0 warp #099-6_141_91 0,0,099-1,54,67 +099-6,45,117,0 warp #099-6_45_117 0,0,099-1,69,145 +099-6,80,117,0 warp #099-6_80_117 0,0,099-1,133,77 +099-6,111,117,0 warp #099-6_111_117 0,0,099-1,151,94 +099-6,141,117,0 warp #099-6_141_117 0,0,099-1,92,74 +099-6,46,148,0 warp #099-6_46_148 0,0,099-1,67,108 +099-6,80,148,0 warp #099-6_80_148 0,0,099-1,122,40 +099-6,112,148,0 warp #099-6_112_148 0,0,099-1,140,60 +099-6,141,148,0 warp #099-6_141_148 0,0,099-1,117,121 diff --git a/npc/_anchors.txt b/npc/_anchors.txt index 3663f167..c28e2ce2 100644 --- a/npc/_anchors.txt +++ b/npc/_anchors.txt @@ -5,7 +5,7 @@ OnInit: .ht = htnew(); htput(.ht, "^FERMI|VOTE", "fermi 29 20"); htput(.ht, "^HURN", "009-1 53 38"); - htput(.ht, "^KESH", "099-7 77 49"); + htput(.ht, "^KESH", "099-7 97 65"); htput(.ht, "^NIVAL", "020-1 84 74"); htput(.ht, "^TULI", "001-1 84 100"); } diff --git a/npc/_import.txt b/npc/_import.txt index 174e498d..b8dcd152 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -131,4 +131,5 @@ @include "npc/099-8/_import.txt" @include "npc/botcheck/_import.txt" @include "npc/fermi/_import.txt" +@include "npc/sec_pri/_import.txt" "npc/_anchors.txt", diff --git a/npc/sec_pri/_import.txt b/npc/sec_pri/_import.txt new file mode 100644 index 00000000..eb01ab3b --- /dev/null +++ b/npc/sec_pri/_import.txt @@ -0,0 +1,2 @@ +// Map sec_pri: Jail +// This file is generated automatically. All manually added changes will be removed when running the Converter. |