Regenerate map information. This ensures server keeps building.

13 files changed, 136 insertions, 206 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 1776c8f..59e8293 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -18,6 +18,7 @@ map_list: (
     "001-8",
     "001-9",
     "006-1",
+    "006-10",
     "006-4-1",
     "006-4",
     "006-5",
@@ -32,6 +33,7 @@ map_list: (
     "018-2-7",
     "018-2-8",
     "018-2",
+    "026-2",
     "030-01",
     "030-02",
     "030-03",
diff --git a/db/map_index.txt b/db/map_index.txt
index d5eeed4..7368906 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -15,114 +15,116 @@
 001-8 15
 001-9 16
 006-1 17
-006-4-1 18
-006-4 19
-006-5 20
-006-7 21
-006-8 22
-006-9 23
-011-1 24
-017-2-2 25
-018-2-1 26
-018-2-5 27
-018-2-6 28
-018-2-7 29
-018-2-8 30
-018-2 31
-030-01 32
-030-02 33
-030-03 34
-030-04 35
-030-05 36
-030-06 37
-030-07 38
-030-08 39
-030-09 40
-030-10 41
-030-11 42
-030-12 43
-030-13 44
-030-14 45
-030-15 46
-030-16 47
-030-17 48
-030-18 49
-030-19 50
-030-20 51
-030-21 52
-030-22 53
-030-23 54
-030-24 55
-030-25 56
-030-26 57
-030-27 58
-030-28 59
-030-29 60
-030-30 61
-030-31 62
-030-32 63
-030-33 64
-030-34 65
-030-35 66
-030-36 67
-030-37 68
-030-38 69
-030-39 70
-030-40 71
-030-41 72
-030-42 73
-030-43 74
-030-44 75
-030-45 76
-030-46 77
-030-47 78
-030-48 79
-030-49 80
-030-50 81
-030-51 82
-030-52 83
-030-53 84
-030-54 85
-030-55 86
-030-56 87
-030-57 88
-030-58 89
-030-59 90
-030-60 91
-030-61 92
-030-62 93
-030-63 94
-030-64 95
-030-65 96
-030-66 97
-030-67 98
-030-68 99
-030-69 100
-030-70 101
-030-71 102
-030-72 103
-030-73 104
-030-74 105
-030-75 106
-031-0 107
-031-1 108
-031-2 109
-031-3 110
-031-4 111
-031-5 112
-031-6 113
-031-7 114
-031-8 115
-031-9 116
-033-1 117
-033-2 118
-033-3 119
-033-4 120
-033-5 121
-boss 122
-botcheck 123
-fermi 124
-guilds 125
-sec_pri 126
-test 127
-testbg 128
+006-10 18
+006-4-1 19
+006-4 20
+006-5 21
+006-7 22
+006-8 23
+006-9 24
+011-1 25
+017-2-2 26
+018-2-1 27
+018-2-5 28
+018-2-6 29
+018-2-7 30
+018-2-8 31
+018-2 32
+026-2 33
+030-01 34
+030-02 35
+030-03 36
+030-04 37
+030-05 38
+030-06 39
+030-07 40
+030-08 41
+030-09 42
+030-10 43
+030-11 44
+030-12 45
+030-13 46
+030-14 47
+030-15 48
+030-16 49
+030-17 50
+030-18 51
+030-19 52
+030-20 53
+030-21 54
+030-22 55
+030-23 56
+030-24 57
+030-25 58
+030-26 59
+030-27 60
+030-28 61
+030-29 62
+030-30 63
+030-31 64
+030-32 65
+030-33 66
+030-34 67
+030-35 68
+030-36 69
+030-37 70
+030-38 71
+030-39 72
+030-40 73
+030-41 74
+030-42 75
+030-43 76
+030-44 77
+030-45 78
+030-46 79
+030-47 80
+030-48 81
+030-49 82
+030-50 83
+030-51 84
+030-52 85
+030-53 86
+030-54 87
+030-55 88
+030-56 89
+030-57 90
+030-58 91
+030-59 92
+030-60 93
+030-61 94
+030-62 95
+030-63 96
+030-64 97
+030-65 98
+030-66 99
+030-67 100
+030-68 101
+030-69 102
+030-70 103
+030-71 104
+030-72 105
+030-73 106
+030-74 107
+030-75 108
+031-0 109
+031-1 110
+031-2 111
+031-3 112
+031-4 113
+031-5 114
+031-6 115
+031-7 116
+031-8 117
+031-9 118
+033-1 119
+033-2 120
+033-3 121
+033-4 122
+033-5 123
+boss 124
+botcheck 125
+fermi 126
+guilds 127
+sec_pri 128
+test 129
+testbg 130
diff --git a/maps/re/006-10.mcache b/maps/re/006-10.mcache
new file mode 100644
index 0000000..c9cddce
--- /dev/null
+++ b/maps/re/006-10.mcache
diff --git a/maps/re/026-2.mcache b/maps/re/026-2.mcache
new file mode 100644
index 0000000..589618c
--- /dev/null
+++ b/maps/re/026-2.mcache
diff --git a/npc/006-10/_config.txt b/npc/006-10/_config.txt
deleted file mode 100644
index bdc6b78..0000000
--- a/npc/006-10/_config.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 006-10: Fefe's Crypt conf
-
-006-10,42,29,0	script	#006-10_42_29	NPC_CHEST,{
-	TreasureBox();
-	specialeffect(.dir == 0 ? 24 : 25, AREA, getnpcid()); // closed ? opening : closing
-	close;
-OnInit:
-	.distance=2;
-	end;
-}
-
-006-10,44,29,0	script	#006-10_44_29	NPC_CHEST,{
-	TreasureBox();
-	specialeffect(.dir == 0 ? 24 : 25, AREA, getnpcid()); // closed ? opening : closing
-	close;
-OnInit:
-	.distance=2;
-	end;
-}
diff --git a/npc/006-10/_import.txt b/npc/006-10/_import.txt
index 72ca523..4c0c28f 100644
--- a/npc/006-10/_import.txt
+++ b/npc/006-10/_import.txt
@@ -1,6 +1,5 @@
 // Map 006-10: Fefe's Crypt
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/006-10/_config.txt",
 "npc/006-10/_mobs.txt",
 "npc/006-10/_warps.txt",
 "npc/006-10/logic.txt",
diff --git a/npc/006-10/_mobs.txt b/npc/006-10/_mobs.txt
index 734e9c1..16b27b7 100644
--- a/npc/006-10/_mobs.txt
+++ b/npc/006-10/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 006-10: Fefe's Crypt mobs
-006-10,44,34,15,15	monster	Vampire Bat	1063,12,300000,30000
+006-10,54,44,24,24	monster	Vampire Bat	1063,18,300000,30000
diff --git a/npc/006-10/_warps.txt b/npc/006-10/_warps.txt
index b39cc23..7cc0625 100644
--- a/npc/006-10/_warps.txt
+++ b/npc/006-10/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 006-10: Fefe's Crypt warps
-006-10,43,49,0	warp	#006-10_43_49	1,0,006-6,46,27
+006-10,51,65,0	warp	#006-10_51_65	0,0,026-2,29,27
+006-10,52,65,0	warp	#006-10_52_65	0,0,026-2,86,27
diff --git a/npc/006-10/logic.txt b/npc/006-10/logic.txt
index 931a387..601563d 100644
--- a/npc/006-10/logic.txt
+++ b/npc/006-10/logic.txt
@@ -2,10 +2,12 @@
 // Author:
 //  Jesusalva
 // Description:
-//  Crazyfefe's Shrine (lore bits)
+//  Crazyfefe's Shrine
 
 006-10	mapflag	zone	MMO
 
+// We need to refactor this warp system, replace NPC_HIDDEN, and include the boss
+
 006-10,46,45,0	script	#00610WA	NPC_HIDDEN,0,3,{
     end;
 OnTouch:
@@ -125,72 +127,4 @@ OnTouch:
 OnTouch:
     slide 37, 25; end;
 }
-// --------------------------------------------------
-006-10,43,28,0	script	Crypt#Fefe	NPC_NO_SPRITE,{
-    mesn l("Crypt");
-    mesc l("Herein lies Fefe, for his great bravure and heroic deeds, savior of our realm, valiantly defeated in combat against the Monster King, may the mana shine upon him forever.");
-    next;
-    mesn l("Crypt");
-    mesc l("Herein also lies Raid Yahoo, enemy of manakind and nemesis of Saul, the one hated by many and loved by few, greedy mana stone collector, but who still opposed to the Monster King and lost her life for it.");
-    next;
-    mesn l("Crypt");
-    mesc l("May their memory be remembered, but may their struggle be forgotten, their bodies never profaned, and in the æthyr, may they find eternal rest and comfort for their souls.");
-    close;
-
-OnInit:
-    .distance=2;
-    end;
-}
-
-
-006-10,33,44,0	script	Diary#Fefe	NPC_NO_SPRITE,{
-    setpcblock(PCBLOCK_HARD, true);
-    mesc l("STORY MODE ENABLED. Monsters won't attack you, so you can read without worries."), 1;
-    mesc l("Here lies a diary, presumably from Fefe.");
-    next;
-    clear;
-    mesn b(l("Tulimshar, Tonori - 2nd March 300 AT"));
-    mesc l("Tomorrow is the day, when we shall march against Raid, in order to free our people from the oppression of her mages.");
-    dnext;
-    mesc l("Saul will lead the frontal assault, Mr. Saves shall provide distraction, and I'll infiltrate within the Mage Tower.");
-    dnext;
-    mesc l("I can't sleep, so I'm writing this entry. It'll take a considerable amount of time to decrypt the shield frequency Raid is using, and when Saul's army is marching towards their deaths, time is of essence. Every second I waste, is a comrade who will die.");
-    dnext;
-    mesc l("I'm a pro, this will be GG EZ. But Raid is not a foe to be underestimated, and I have no hopes for reinforcements. I refuse to leave last words, I shall either triumph, or be forgotten in shame.");
-    next;
-    mes "";
-    mesn b(l("Wizards Tower, Tonori - 6th March 300 AT"));
-    mesc l("...I knew bandits were not be trusted, but Saul insisted in doing so. I hate him so much right now. Even if he is my brother.");
-    dnext;
-    mesc l("Raid and me have been in hot pursuit for a while, but I fear it is already too late. Yesterday there was another earthquake, and we're receiving summons to return to Tulimshar at once. Apparently, it is under attack.");
-    dnext;
-    mesc l("Saul will deal with it. His mess, he will clean up. Raid and me will keep the pursuit. And this time, we shall triumph.");
-    next;
-    mes "";
-    mesn b(l("Wizards Tower, Tonori - 8th April 300 AT"));
-    mesc l("The Monster King once again eluded us. How long has it been? His minions are laying waste to all towns, Saul has been killed, Raid has been wounded.");
-    dnext;
-    mesc l("I'm fine, but I can't keep carrying dead weights with me. Candor is a special place, I shall make a base there... Because I know the Monster King will eventually head there.");
-    dnext;
-    mesc l("This time, I'll be prepared. His reign of terror has its days counted.");
-    next;
-    mes "";
-    mesn b(l("Saxso's Basement, Candor - 27th July 300 AT"));
-    mesc l("This is my chance - the biggest Mana Quake ever, it feels like a whole world crushing in ours. I can feel the drain from Candor's Mana Reserves all the way up here.");
-    dnext;
-    mesc l("Now to head inside the caves, until the last floor, and have my showdown and revenge against the Monster King. I do not plan in failing.");
-    dnext;
-    mesc l("But if I do, I'll not return. Neither me, nor Raid. Which is why I'm taking precautions: This diary. In the event of my death, please bury my body and contact Halinarzo.");
-    dnext;
-    mesc l("If I can't beat him, no one else can, and if our species are to survive, we'll need to return to the Edge. Even if it means... Fulfilling the prophecy. %s. Whatever the cost.", b("Per Asper Ad Salvos"));
-    next;
-    00610_Init_BlackBox();
-    setpcblock(PCBLOCK_HARD, false);
-    closeclientdialog;
-    close;
-
-OnInit:
-    .distance=2;
-    end;
-}
 
diff --git a/npc/026-2/_import.txt b/npc/026-2/_import.txt
index 9240be1..7434c71 100644
--- a/npc/026-2/_import.txt
+++ b/npc/026-2/_import.txt
@@ -1,3 +1,4 @@
-// Map 026-2: The Impregnable Fortress (B2F)
+// Map 026-2: Count's Fortress
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/026-2/_mobs.txt",
 "npc/026-2/_warps.txt",
diff --git a/npc/026-2/_mobs.txt b/npc/026-2/_mobs.txt
new file mode 100644
index 0000000..a5b827f
--- /dev/null
+++ b/npc/026-2/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 026-2: Count's Fortress mobs
+026-2,61,35,39,17	monster	Piou Knight	1434,8,300000,30000
+026-2,62,81,39,17	monster	Grenadier	1444,18,300000,30000
+026-2,70,57,39,17	monster	Swashbuckler	1443,18,300000,30000
+026-2,57,59,39,27	monster	Thug	1442,18,300000,30000
+026-2,61,57,20,45	monster	Revolver Shooter	1208,18,300000,30000
diff --git a/npc/026-2/_warps.txt b/npc/026-2/_warps.txt
index a80657f..98b9d22 100644
--- a/npc/026-2/_warps.txt
+++ b/npc/026-2/_warps.txt
@@ -1,3 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 026-2: The Impregnable Fortress (B2F) warps
-026-2,32,98,0	warp	#026-2_32_98	0,0,026-1,60,27
+// Map 026-2: Count's Fortress warps
+026-2,32,98,0	warp	#026-2_32_98	0,0,001-3,118,114
+026-2,86,26,0	warp	#026-2_86_26	0,0,006-10,52,64
+026-2,29,26,0	warp	#026-2_29_26	0,0,006-10,51,64
diff --git a/npc/_import.txt b/npc/_import.txt
index 64d0f76..dd407e6 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -17,6 +17,7 @@
 @include "npc/001-8/_import.txt"
 @include "npc/001-9/_import.txt"
 @include "npc/006-1/_import.txt"
+@include "npc/006-10/_import.txt"
 @include "npc/006-4-1/_import.txt"
 @include "npc/006-4/_import.txt"
 @include "npc/006-5/_import.txt"
@@ -31,6 +32,7 @@
 @include "npc/018-2-7/_import.txt"
 @include "npc/018-2-8/_import.txt"
 @include "npc/018-2/_import.txt"
+@include "npc/026-2/_import.txt"
 @include "npc/030-01/_import.txt"
 @include "npc/030-02/_import.txt"
 @include "npc/030-03/_import.txt"