Regenerate Maps

8 files changed, 24 insertions, 5 deletions

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: