8 files changed, 211 insertions, 192 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 2fd93dd95..37a78b443 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -8,6 +8,7 @@ map_list: (
     "001-10-1",
     "001-10",
     "001-11",
+    "001-12",
     "001-2",
     "001-3-1",
     "001-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index e573c84d6..7f40c507c 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -5,194 +5,195 @@
 001-10-1 5
 001-10 6
 001-11 7
-001-2 8
-001-3-1 9
-001-3 10
-001-4 11
-001-5 12
-001-6 13
-001-7 14
-001-8 15
-001-9 16
-002-1 17
-002-2 18
-002-3 19
-002-4 20
-002-5 21
-003-0-1 22
-003-0-2 23
-003-0 24
-003-1-1 25
-003-1-2 26
-003-1-3 27
-003-1 28
-003-10 29
-003-13 30
-003-2-1 31
-003-2 32
-003-3 33
-003-4-1 34
-003-4 35
-003-5 36
-003-6 37
-003-7 38
-003-8 39
-004-1 40
-004-2-1 41
-004-2 42
-005-1-1 43
-005-1 44
-005-2-1 45
-005-2 46
-005-3 47
-005-4 48
-005-5 49
-005-6 50
-005-7 51
-006-1 52
-007-1 53
-008-0 54
-008-1 55
-008-2 56
-009-1 57
-009-2 58
-009-3 59
-009-4 60
-009-5 61
-009-6 62
-009-7 63
-010-1-1 64
-010-1 65
-010-2 66
-011-1 67
-011-2 68
-011-3 69
-012-1 70
-012-2 71
-012-3 72
-012-4 73
-012-5 74
-012-6 75
-012-7 76
-012-8 77
-013-1 78
-014-1 79
-014-2-1 80
-014-2 81
-014-3 82
-014-4 83
-014-5-1 84
-014-5 85
-015-1 86
-015-2 87
-015-3 88
-015-4 89
-015-5 90
-015-6 91
-015-7 92
-015-8-1 93
-015-8 94
-016-1 95
-016-6 96
-016-7 97
-017-1 98
-017-10 99
-017-2-1 100
-017-2-2 101
-017-2 102
-017-3 103
-017-4 104
-017-5 105
-017-6 106
-017-7 107
-017-8 108
-018-1-1 109
-018-1 110
-018-2-1 111
-018-2-2 112
-018-2-3 113
-018-2-4 114
-018-2-5 115
-018-2 116
-018-3 117
-018-4-1 118
-018-4-2 119
-018-4 120
-018-5-0 121
-018-5-1 122
-018-5-2 123
-018-5-3 124
-018-5-4 125
-018-5-boss 126
-018-5 127
-018-6-0 128
-018-6-1 129
-018-6-2 130
-018-6-3 131
-019-1-1 132
-019-1 133
-019-2 134
-019-3 135
-019-4-1 136
-019-4 137
-020-1 138
-020-2 139
-020-3 140
-020-4 141
-020-5 142
-020-6 143
-020-7-1 144
-020-7-2 145
-020-7 146
-021-1 147
-021-2 148
-021-3 149
-021-4 150
-022-1 151
-023-1 152
-023-2 153
-023-3-1 154
-023-3-2 155
-023-3 156
-024-1 157
-024-10 158
-024-11 159
-024-12 160
-024-13 161
-024-14 162
-024-15 163
-024-16 164
-024-2 165
-024-3 166
-024-4 167
-024-5 168
-024-6 169
-024-7 170
-024-8 171
-024-9 172
-025-2-1 173
-025-2 174
-boss 175
-botcheck 176
-guilds 177
-maze0 178
-maze1 179
-maze10 180
-maze11 181
-maze12 182
-maze13 183
-maze14 184
-maze15 185
-maze2 186
-maze3 187
-maze4 188
-maze5 189
-maze6 190
-maze7 191
-maze8 192
-maze9 193
-sec_pri 194
-soren-2 195
-soren 196
-test 197
-testbg 198
+001-12 8
+001-2 9
+001-3-1 10
+001-3 11
+001-4 12
+001-5 13
+001-6 14
+001-7 15
+001-8 16
+001-9 17
+002-1 18
+002-2 19
+002-3 20
+002-4 21
+002-5 22
+003-0-1 23
+003-0-2 24
+003-0 25
+003-1-1 26
+003-1-2 27
+003-1-3 28
+003-1 29
+003-10 30
+003-13 31
+003-2-1 32
+003-2 33
+003-3 34
+003-4-1 35
+003-4 36
+003-5 37
+003-6 38
+003-7 39
+003-8 40
+004-1 41
+004-2-1 42
+004-2 43
+005-1-1 44
+005-1 45
+005-2-1 46
+005-2 47
+005-3 48
+005-4 49
+005-5 50
+005-6 51
+005-7 52
+006-1 53
+007-1 54
+008-0 55
+008-1 56
+008-2 57
+009-1 58
+009-2 59
+009-3 60
+009-4 61
+009-5 62
+009-6 63
+009-7 64
+010-1-1 65
+010-1 66
+010-2 67
+011-1 68
+011-2 69
+011-3 70
+012-1 71
+012-2 72
+012-3 73
+012-4 74
+012-5 75
+012-6 76
+012-7 77
+012-8 78
+013-1 79
+014-1 80
+014-2-1 81
+014-2 82
+014-3 83
+014-4 84
+014-5-1 85
+014-5 86
+015-1 87
+015-2 88
+015-3 89
+015-4 90
+015-5 91
+015-6 92
+015-7 93
+015-8-1 94
+015-8 95
+016-1 96
+016-6 97
+016-7 98
+017-1 99
+017-10 100
+017-2-1 101
+017-2-2 102
+017-2 103
+017-3 104
+017-4 105
+017-5 106
+017-6 107
+017-7 108
+017-8 109
+018-1-1 110
+018-1 111
+018-2-1 112
+018-2-2 113
+018-2-3 114
+018-2-4 115
+018-2-5 116
+018-2 117
+018-3 118
+018-4-1 119
+018-4-2 120
+018-4 121
+018-5-0 122
+018-5-1 123
+018-5-2 124
+018-5-3 125
+018-5-4 126
+018-5-boss 127
+018-5 128
+018-6-0 129
+018-6-1 130
+018-6-2 131
+018-6-3 132
+019-1-1 133
+019-1 134
+019-2 135
+019-3 136
+019-4-1 137
+019-4 138
+020-1 139
+020-2 140
+020-3 141
+020-4 142
+020-5 143
+020-6 144
+020-7-1 145
+020-7-2 146
+020-7 147
+021-1 148
+021-2 149
+021-3 150
+021-4 151
+022-1 152
+023-1 153
+023-2 154
+023-3-1 155
+023-3-2 156
+023-3 157
+024-1 158
+024-10 159
+024-11 160
+024-12 161
+024-13 162
+024-14 163
+024-15 164
+024-16 165
+024-2 166
+024-3 167
+024-4 168
+024-5 169
+024-6 170
+024-7 171
+024-8 172
+024-9 173
+025-2-1 174
+025-2 175
+boss 176
+botcheck 177
+guilds 178
+maze0 179
+maze1 180
+maze10 181
+maze11 182
+maze12 183
+maze13 184
+maze14 185
+maze15 186
+maze2 187
+maze3 188
+maze4 189
+maze5 190
+maze6 191
+maze7 192
+maze8 193
+maze9 194
+sec_pri 195
+soren-2 196
+soren 197
+test 198
+testbg 199
diff --git a/maps/re/001-12.mcache b/maps/re/001-12.mcache
new file mode 100644
index 000000000..0ae760c51
--- /dev/null
+++ b/maps/re/001-12.mcache
diff --git a/npc/001-11/_mobs.txt b/npc/001-11/_mobs.txt
index dc8a91342..5aebea517 100644
--- a/npc/001-11/_mobs.txt
+++ b/npc/001-11/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-11: Valentine Highlands mobs
-001-11,47,34,29,14	monster	Lovely Fluffy	1050,6,16000,0
+001-11,47,34,29,14	monster	Lovely Fluffy	1050,8,16000,0
 001-11,48,34,32,16	monster	Red Mushroom	1042,2,175000,50000
 001-11,74,48,1,2	monster	Chocolate Slime	1180,1,220000,50000
diff --git a/npc/001-12/_import.txt b/npc/001-12/_import.txt
new file mode 100644
index 000000000..7ce184ff6
--- /dev/null
+++ b/npc/001-12/_import.txt
@@ -0,0 +1,3 @@
+// Map 001-12: Enchanted Forest
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-12/_mobs.txt",
diff --git a/npc/001-12/_mobs.txt b/npc/001-12/_mobs.txt
new file mode 100644
index 000000000..d42ae3a76
--- /dev/null
+++ b/npc/001-12/_mobs.txt
@@ -0,0 +1,12 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-12: Enchanted Forest mobs
+001-12,99,98,23,23	monster	Clover Field	1028,2,90000,120000
+001-12,90,88,70,68	monster	Lovely Fluffy	1050,40,22000,1000
+001-12,22,89,6,69	monster	Duck	1029,4,60000,120000
+001-12,87,148,71,10	monster	Duck	1029,4,60000,120000
+001-12,96,79,64,60	monster	Red Mushroom	1042,20,175000,50000
+001-12,102,108,4,3	monster	Chocolate Slime	1180,2,220000,50000
+001-12,80,139,85,28	monster	Whirly Bird (BOSS)	1232,1,36000000,50000
+001-12,115,40,36,13	monster	Angry Bat	1194,6,260000,50000
+001-12,94,93,4,3	monster	Mana Piou	1155,1,220000,50000
+001-12,37,149,1,1	monster	Mana Piou	1155,3,220000,50000
diff --git a/npc/_import.txt b/npc/_import.txt
index 7be3e9868..5a4b32f53 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -7,6 +7,7 @@
 @include "npc/001-10-1/_import.txt"
 @include "npc/001-10/_import.txt"
 @include "npc/001-11/_import.txt"
+@include "npc/001-12/_import.txt"
 @include "npc/001-2/_import.txt"
 @include "npc/001-3-1/_import.txt"
 @include "npc/001-3/_import.txt"
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index 8179f9ef3..4c87c9627 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -75,6 +75,7 @@ OnInit:
     // Woodlands
     htput(.wcore, "001-4", "woodland");
     htput(.wcore, "001-11", "woodland");
+    htput(.wcore, "001-12", "woodland");
     htput(.wcore, "005-1", "woodland");
     htput(.wcore, "012-1", "woodland");
     htput(.wcore, "014-1", "woodland");