Remove unused maps, music updates

8 files changed, 46 insertions, 55 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 66ee8a605..ccb70a877 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -15,9 +15,6 @@ map_list: (
     "003-1-3",
     "003-1",
     "003-13",
-    "003-2-0",
-    "003-2-1",
-    "003-2-2",
     "003-2",
     "003-3",
     "003-4",
@@ -54,7 +51,6 @@ map_list: (
     "009-1",
     "009-2",
     "009-5",
-    "010-1",
     "boss",
     "botcheck",
     "sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index 36a9c7031..1a3b4c323 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -12,50 +12,46 @@
 003-1-3 12
 003-1 13
 003-13 14
-003-2-0 15
-003-2-1 16
-003-2-2 17
-003-2 18
-003-3 19
-003-4 20
-003-5 21
-003-6 22
-003-7 23
-003-8 24
-004-1 25
-004-2 26
-005-1 27
-005-2 28
-005-3 29
-005-4 30
-005-5 31
-005-6 32
-005-7 33
-007-1 34
-008-1 35
-008-2-0 36
-008-2-1 37
-008-2-10 38
-008-2-11 39
-008-2-12 40
-008-2-13 41
-008-2-14 42
-008-2-2 43
-008-2-3 44
-008-2-4 45
-008-2-5 46
-008-2-6 47
-008-2-7 48
-008-2-8 49
-008-2-9 50
-009-1 51
-009-2 52
-009-5 53
-010-1 54
-boss 55
-botcheck 56
-sec_pri 57
-soren-2 58
-soren 59
-test 60
-testbg 61
+003-2 15
+003-3 16
+003-4 17
+003-5 18
+003-6 19
+003-7 20
+003-8 21
+004-1 22
+004-2 23
+005-1 24
+005-2 25
+005-3 26
+005-4 27
+005-5 28
+005-6 29
+005-7 30
+007-1 31
+008-1 32
+008-2-0 33
+008-2-1 34
+008-2-10 35
+008-2-11 36
+008-2-12 37
+008-2-13 38
+008-2-14 39
+008-2-2 40
+008-2-3 41
+008-2-4 42
+008-2-5 43
+008-2-6 44
+008-2-7 45
+008-2-8 46
+008-2-9 47
+009-1 48
+009-2 49
+009-5 50
+boss 51
+botcheck 52
+sec_pri 53
+soren-2 54
+soren 55
+test 56
+testbg 57
diff --git a/maps/re/003-2-0.mcache b/maps/re/003-2-0.mcache
deleted file mode 100644
index 8828ec06d..000000000
--- a/maps/re/003-2-0.mcache
+++ /dev/null
diff --git a/maps/re/003-2-1.mcache b/maps/re/003-2-1.mcache
deleted file mode 100644
index 152d2bb69..000000000
--- a/maps/re/003-2-1.mcache
+++ /dev/null
diff --git a/maps/re/003-2-2.mcache b/maps/re/003-2-2.mcache
deleted file mode 100644
index a0b53ed18..000000000
--- a/maps/re/003-2-2.mcache
+++ /dev/null
diff --git a/maps/re/010-1.mcache b/maps/re/010-1.mcache
deleted file mode 100644
index 0530e14bd..000000000
--- a/maps/re/010-1.mcache
+++ /dev/null
diff --git a/npc/_import.txt b/npc/_import.txt
index 27389b3c2..ee8ff40d2 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -14,9 +14,6 @@
 @include "npc/003-1-3/_import.txt"
 @include "npc/003-1/_import.txt"
 @include "npc/003-13/_import.txt"
-@include "npc/003-2-0/_import.txt"
-@include "npc/003-2-1/_import.txt"
-@include "npc/003-2-2/_import.txt"
 @include "npc/003-2/_import.txt"
 @include "npc/003-3/_import.txt"
 @include "npc/003-4/_import.txt"
@@ -53,7 +50,6 @@
 @include "npc/009-1/_import.txt"
 @include "npc/009-2/_import.txt"
 @include "npc/009-5/_import.txt"
-@include "npc/010-1/_import.txt"
 @include "npc/boss/_import.txt"
 @include "npc/botcheck/_import.txt"
 @include "npc/sec_pri/_import.txt"
diff --git a/npc/commands/music.txt b/npc/commands/music.txt
index 2aa30d06b..144dc059a 100644
--- a/npc/commands/music.txt
+++ b/npc/commands/music.txt
@@ -48,4 +48,7 @@ OnInit:
     htput(.hash, "mythica",    "mythica.mp3");
     htput(.hash, "3b5",        "3b5.ogg");
     htput(.hash, "misuse",     "misuse.ogg");
+    htput(.hash, "prelude",    "water_prelude.ogg");
+    htput(.hash, "sunrise",    "tws_birds_in_the_sunrise.ogg");
+    htput(.hash, "peace",      "peace.ogg");
 }