diff options
author | Jesusaves <cpntb1@ymail.com> | 2020-06-25 20:30:18 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2020-06-25 20:30:18 -0300 |
commit | 6805f9ed8efa8df9563a63a2d1f74d1f2248fb19 (patch) | |
tree | 643e62f8fc93f536d8da70faa8d5d087811e7761 | |
parent | 500bffd2f4f1ced59638754f57c208b644552eb5 (diff) | |
download | serverdata-6805f9ed8efa8df9563a63a2d1f74d1f2248fb19.tar.gz serverdata-6805f9ed8efa8df9563a63a2d1f74d1f2248fb19.tar.bz2 serverdata-6805f9ed8efa8df9563a63a2d1f74d1f2248fb19.tar.xz serverdata-6805f9ed8efa8df9563a63a2d1f74d1f2248fb19.zip |
Regenerate Maps
-rw-r--r-- | conf/map/maps.conf | 4 | ||||
-rw-r--r-- | db/map_index.txt | 206 | ||||
-rw-r--r-- | maps/re/018-2-6.mcache | bin | 0 -> 1565 bytes | |||
-rw-r--r-- | maps/re/018-2-7.mcache | bin | 0 -> 1536 bytes | |||
-rw-r--r-- | maps/re/018-2-8.mcache | bin | 0 -> 1576 bytes | |||
-rw-r--r-- | maps/re/025-3.mcache | bin | 0 -> 409 bytes | |||
-rw-r--r-- | npc/018-2-6/_import.txt | 2 | ||||
-rw-r--r-- | npc/018-2-7/_import.txt | 2 | ||||
-rw-r--r-- | npc/018-2-8/_import.txt | 2 | ||||
-rw-r--r-- | npc/025-1/_mobs.txt | 8 | ||||
-rw-r--r-- | npc/025-3/_import.txt | 3 | ||||
-rw-r--r-- | npc/025-3/_mobs.txt | 4 | ||||
-rw-r--r-- | npc/_import.txt | 4 | ||||
-rw-r--r-- | npc/functions/hub.txt | 4 |
14 files changed, 133 insertions, 106 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 52425a659..fc9242778 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -128,6 +128,9 @@ map_list: ( "018-2-3", "018-2-4", "018-2-5", + "018-2-6", + "018-2-7", + "018-2-8", "018-2", "018-3", "018-4-1", @@ -189,6 +192,7 @@ map_list: ( "025-1", "025-2-1", "025-2", + "025-3", "027-1", "027-2", "027-3", diff --git a/db/map_index.txt b/db/map_index.txt index 920441d8a..145f99355 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -125,104 +125,108 @@ 018-2-3 125 018-2-4 126 018-2-5 127 -018-2 128 -018-3 129 -018-4-1 130 -018-4-2 131 -018-4 132 -018-5-0 133 -018-5-1 134 -018-5-2 135 -018-5-3 136 -018-5-4 137 -018-5-boss 138 -018-5 139 -018-6-0 140 -018-6-1 141 -018-6-2 142 -018-6-3 143 -019-1-1 144 -019-1 145 -019-2 146 -019-3 147 -019-4-1 148 -019-4 149 -020-1 150 -020-2 151 -020-3 152 -020-4 153 -020-5 154 -020-6 155 -020-7-1 156 -020-7-2 157 -020-7 158 -021-0 159 -021-1 160 -021-2 161 -021-3 162 -021-4 163 -022-1 164 -023-1 165 -023-2 166 -023-3-1 167 -023-3-2 168 -023-3 169 -024-1 170 -024-10 171 -024-11 172 -024-12 173 -024-13 174 -024-14 175 -024-15 176 -024-16 177 -024-2 178 -024-3 179 -024-4 180 -024-5 181 -024-6 182 -024-7 183 -024-8 184 -024-9 185 -025-1 186 -025-2-1 187 -025-2 188 -027-1 189 -027-2 190 -027-3 191 -027-4 192 -042-0 193 -042-1 194 -042-10 195 -042-11 196 -042-2 197 -042-3 198 -042-4 199 -042-5 200 -042-6 201 -042-7 202 -042-8 203 -042-9 204 -boss 205 -botcheck 206 -guilds 207 -maze0 208 -maze1 209 -maze10 210 -maze11 211 -maze12 212 -maze13 213 -maze14 214 -maze15 215 -maze2 216 -maze3 217 -maze4 218 -maze5 219 -maze6 220 -maze7 221 -maze8 222 -maze9 223 -sec_pri 224 -soren-2 225 -soren 226 -test 227 -testbg 228 +018-2-6 128 +018-2-7 129 +018-2-8 130 +018-2 131 +018-3 132 +018-4-1 133 +018-4-2 134 +018-4 135 +018-5-0 136 +018-5-1 137 +018-5-2 138 +018-5-3 139 +018-5-4 140 +018-5-boss 141 +018-5 142 +018-6-0 143 +018-6-1 144 +018-6-2 145 +018-6-3 146 +019-1-1 147 +019-1 148 +019-2 149 +019-3 150 +019-4-1 151 +019-4 152 +020-1 153 +020-2 154 +020-3 155 +020-4 156 +020-5 157 +020-6 158 +020-7-1 159 +020-7-2 160 +020-7 161 +021-0 162 +021-1 163 +021-2 164 +021-3 165 +021-4 166 +022-1 167 +023-1 168 +023-2 169 +023-3-1 170 +023-3-2 171 +023-3 172 +024-1 173 +024-10 174 +024-11 175 +024-12 176 +024-13 177 +024-14 178 +024-15 179 +024-16 180 +024-2 181 +024-3 182 +024-4 183 +024-5 184 +024-6 185 +024-7 186 +024-8 187 +024-9 188 +025-1 189 +025-2-1 190 +025-2 191 +025-3 192 +027-1 193 +027-2 194 +027-3 195 +027-4 196 +042-0 197 +042-1 198 +042-10 199 +042-11 200 +042-2 201 +042-3 202 +042-4 203 +042-5 204 +042-6 205 +042-7 206 +042-8 207 +042-9 208 +boss 209 +botcheck 210 +guilds 211 +maze0 212 +maze1 213 +maze10 214 +maze11 215 +maze12 216 +maze13 217 +maze14 218 +maze15 219 +maze2 220 +maze3 221 +maze4 222 +maze5 223 +maze6 224 +maze7 225 +maze8 226 +maze9 227 +sec_pri 228 +soren-2 229 +soren 230 +test 231 +testbg 232 diff --git a/maps/re/018-2-6.mcache b/maps/re/018-2-6.mcache Binary files differnew file mode 100644 index 000000000..100e1cef7 --- /dev/null +++ b/maps/re/018-2-6.mcache diff --git a/maps/re/018-2-7.mcache b/maps/re/018-2-7.mcache Binary files differnew file mode 100644 index 000000000..941f61e06 --- /dev/null +++ b/maps/re/018-2-7.mcache diff --git a/maps/re/018-2-8.mcache b/maps/re/018-2-8.mcache Binary files differnew file mode 100644 index 000000000..bea7cf7d8 --- /dev/null +++ b/maps/re/018-2-8.mcache diff --git a/maps/re/025-3.mcache b/maps/re/025-3.mcache Binary files differnew file mode 100644 index 000000000..4c1a1ef8d --- /dev/null +++ b/maps/re/025-3.mcache diff --git a/npc/018-2-6/_import.txt b/npc/018-2-6/_import.txt new file mode 100644 index 000000000..9f15ca154 --- /dev/null +++ b/npc/018-2-6/_import.txt @@ -0,0 +1,2 @@ +// Map 018-2-6: Heroes Hold SS - B1F +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/018-2-7/_import.txt b/npc/018-2-7/_import.txt new file mode 100644 index 000000000..d74e1d6b3 --- /dev/null +++ b/npc/018-2-7/_import.txt @@ -0,0 +1,2 @@ +// Map 018-2-7: Heroes Hold SS - B2F +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/018-2-8/_import.txt b/npc/018-2-8/_import.txt new file mode 100644 index 000000000..efb1a0c77 --- /dev/null +++ b/npc/018-2-8/_import.txt @@ -0,0 +1,2 @@ +// Map 018-2-8: Heroes Hold SS - B3F +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/025-1/_mobs.txt b/npc/025-1/_mobs.txt index a82116a67..5de3a355e 100644 --- a/npc/025-1/_mobs.txt +++ b/npc/025-1/_mobs.txt @@ -1,12 +1,12 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 025-1: Fortress Town - Holy Land mobs -025-1,39,96,15,6 monster Croc 1006,6,60000,30000 -025-1,35,41,10,15 monster Croc 1006,6,60000,30000 +025-1,39,96,15,6 monster Moubi 1038,6,60000,30000 +025-1,35,41,10,15 monster Moubi 1038,6,60000,30000 025-1,78,33,12,11 monster Croc 1006,6,60000,30000 -025-1,120,30,12,8 monster Croc 1006,6,60000,30000 +025-1,120,30,12,8 monster Moubi 1038,6,60000,30000 025-1,136,30,1,8 monster Croc 1006,6,60000,30000 025-1,142,77,7,11 monster Croc 1006,6,60000,30000 -025-1,161,86,11,15 monster Croc 1006,6,60000,30000 +025-1,161,86,11,15 monster Moubi 1038,6,60000,30000 025-1,79,97,12,6 monster Croc 1006,6,60000,30000 025-1,42,115,15,4 monster Croc 1006,6,60000,30000 025-1,45,116,20,3 monster Croc 1006,6,60000,30000 diff --git a/npc/025-3/_import.txt b/npc/025-3/_import.txt new file mode 100644 index 000000000..b52258e8f --- /dev/null +++ b/npc/025-3/_import.txt @@ -0,0 +1,3 @@ +// Map 025-3: The Impregnable Fortress (Outside) +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/025-3/_mobs.txt", diff --git a/npc/025-3/_mobs.txt b/npc/025-3/_mobs.txt new file mode 100644 index 000000000..b86216363 --- /dev/null +++ b/npc/025-3/_mobs.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 025-3: The Impregnable Fortress (Outside) mobs +025-3,99,157,75,17 monster Moubi 1038,16,60000,30000 +025-3,105,117,10,21 monster Angry Bat 1194,24,30000,30000 diff --git a/npc/_import.txt b/npc/_import.txt index 2ed9bb173..70e3f40b4 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -127,6 +127,9 @@ @include "npc/018-2-3/_import.txt" @include "npc/018-2-4/_import.txt" @include "npc/018-2-5/_import.txt" +@include "npc/018-2-6/_import.txt" +@include "npc/018-2-7/_import.txt" +@include "npc/018-2-8/_import.txt" @include "npc/018-2/_import.txt" @include "npc/018-3/_import.txt" @include "npc/018-4-1/_import.txt" @@ -188,6 +191,7 @@ @include "npc/025-1/_import.txt" @include "npc/025-2-1/_import.txt" @include "npc/025-2/_import.txt" +@include "npc/025-3/_import.txt" @include "npc/027-1/_import.txt" @include "npc/027-2/_import.txt" @include "npc/027-3/_import.txt" diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt index d3d2765cf..16f8344ab 100644 --- a/npc/functions/hub.txt +++ b/npc/functions/hub.txt @@ -350,6 +350,8 @@ function script HUB_SkillInvoke { // FIXME: Windwalker (1MSP?), Last Standing Man (2 MSP?) // Ressurection skills (also heals fully) + // [MAPZONE] Need special care because scripts + // [WIP] Maybe a custom recovery and a flag @canRevive ? case TMW2_REVIVE: SK_revive(@skillTarget); break; @@ -446,7 +448,7 @@ function script HUB_SkillInvoke { // Physical Class - mostly builtin // TODO: Archery effect-absorb skill - // TODO: Something powerful for swords? + // TODO: Something powerful for swords? Like a skill combo? // Brawling Class case TMW2_BRAWLING: |