Move Malindou from 003-3 to 033-4

6 files changed, 115 insertions, 117 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 49d5ae6..1776c8f 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -17,7 +17,6 @@ map_list: (
     "001-4",
     "001-8",
     "001-9",
-    "003-3",
     "006-1",
     "006-4-1",
     "006-4",
diff --git a/db/map_index.txt b/db/map_index.txt
index bded2e8..d5eeed4 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -14,116 +14,115 @@
 001-4 14
 001-8 15
 001-9 16
-003-3 17
-006-1 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
-030-01 33
-030-02 34
-030-03 35
-030-04 36
-030-05 37
-030-06 38
-030-07 39
-030-08 40
-030-09 41
-030-10 42
-030-11 43
-030-12 44
-030-13 45
-030-14 46
-030-15 47
-030-16 48
-030-17 49
-030-18 50
-030-19 51
-030-20 52
-030-21 53
-030-22 54
-030-23 55
-030-24 56
-030-25 57
-030-26 58
-030-27 59
-030-28 60
-030-29 61
-030-30 62
-030-31 63
-030-32 64
-030-33 65
-030-34 66
-030-35 67
-030-36 68
-030-37 69
-030-38 70
-030-39 71
-030-40 72
-030-41 73
-030-42 74
-030-43 75
-030-44 76
-030-45 77
-030-46 78
-030-47 79
-030-48 80
-030-49 81
-030-50 82
-030-51 83
-030-52 84
-030-53 85
-030-54 86
-030-55 87
-030-56 88
-030-57 89
-030-58 90
-030-59 91
-030-60 92
-030-61 93
-030-62 94
-030-63 95
-030-64 96
-030-65 97
-030-66 98
-030-67 99
-030-68 100
-030-69 101
-030-70 102
-030-71 103
-030-72 104
-030-73 105
-030-74 106
-030-75 107
-031-0 108
-031-1 109
-031-2 110
-031-3 111
-031-4 112
-031-5 113
-031-6 114
-031-7 115
-031-8 116
-031-9 117
-033-1 118
-033-2 119
-033-3 120
-033-4 121
-033-5 122
-boss 123
-botcheck 124
-fermi 125
-guilds 126
-sec_pri 127
-test 128
-testbg 129
+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
diff --git a/maps/re/003-3.mcache b/maps/re/003-3.mcache
deleted file mode 100644
index 73aae46..0000000
--- a/maps/re/003-3.mcache
+++ /dev/null
diff --git a/npc/033-4/_import.txt b/npc/033-4/_import.txt
index 9642c94..31fe402 100644
--- a/npc/033-4/_import.txt
+++ b/npc/033-4/_import.txt
@@ -1,3 +1,4 @@
 // Map 033-4: Porthos' Bank
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/033-4/_warps.txt",
+"npc/033-4/malindou.txt",
diff --git a/npc/003-3/malindou.txt b/npc/033-4/malindou.txt
index 060eaf2..0606d7d 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/033-4/malindou.txt
@@ -6,8 +6,8 @@
 //    Tulim banker, and also handles PCLogin events: CheckClientVersion, and bank
 //    Take care of server updates, but instances are defined on their ships.
 
-003-3,36,34,0	script	Malindou	NPC_LLOYD,{
-    Banker(.name$, "Tulimshar", 9000);
+033-4,35,31,0	script	Malindou	NPC_LLOYD,{
+    Banker(.name$, "Porthos", 50);
     close;
 
 OnInit:
diff --git a/npc/_import.txt b/npc/_import.txt
index a1bfbd9..64d0f76 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -16,7 +16,6 @@
 @include "npc/001-4/_import.txt"
 @include "npc/001-8/_import.txt"
 @include "npc/001-9/_import.txt"
-@include "npc/003-3/_import.txt"
 @include "npc/006-1/_import.txt"
 @include "npc/006-4-1/_import.txt"
 @include "npc/006-4/_import.txt"