Regenerate maps, this time, with 020-5

8 files changed, 27 insertions, 15 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 6e01913b6..87e4eee6c 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -115,6 +115,7 @@ map_list: (
     "020-1",
     "020-2",
     "020-3",
+    "020-5",
     "021-1",
     "021-2",
     "021-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index 4102f4046..05459e71a 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -112,18 +112,19 @@
 020-1 112
 020-2 113
 020-3 114
-021-1 115
-021-2 116
-021-3 117
-021-4 118
-022-1 119
-023-1 120
-023-2 121
-024-1 122
-boss 123
-botcheck 124
-sec_pri 125
-soren-2 126
-soren 127
-test 128
-testbg 129
+020-5 115
+021-1 116
+021-2 117
+021-3 118
+021-4 119
+022-1 120
+023-1 121
+023-2 122
+024-1 123
+boss 124
+botcheck 125
+sec_pri 126
+soren-2 127
+soren 128
+test 129
+testbg 130
diff --git a/maps/re/020-5.mcache b/maps/re/020-5.mcache
new file mode 100644
index 000000000..5c3af1dca
--- /dev/null
+++ b/maps/re/020-5.mcache
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
index e22094b0d..2e3ca3065 100644
--- a/npc/020-1/_warps.txt
+++ b/npc/020-1/_warps.txt
@@ -1,6 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 020-1: Nivalis warps
 020-1,47,48,0	warp	#020-1_47_48	0,0,020-2,30,36
+020-1,86,46,0	warp	#020-1_86_46	0,0,020-5,33,30
 020-1,57,91,0	warp	#020-1_57_91	0,0,020-3,20,28
 020-1,70,128,0	warp	#020-1_70_128	3,0,019-1,70,22
 020-1,107,55,0	warp	#020-1_107_55	0,0,019-2,38,55
diff --git a/npc/020-5/_import.txt b/npc/020-5/_import.txt
new file mode 100644
index 000000000..5857fefbe
--- /dev/null
+++ b/npc/020-5/_import.txt
@@ -0,0 +1,3 @@
+// Map 020-5: Nivalis Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-5/_warps.txt",
diff --git a/npc/020-5/_warps.txt b/npc/020-5/_warps.txt
new file mode 100644
index 000000000..8b70d15da
--- /dev/null
+++ b/npc/020-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-5: Nivalis Indoors warps
+020-5,33,31,0	warp	#020-5_33_31	2,0,020-1,86,47
diff --git a/npc/_import.txt b/npc/_import.txt
index a7cea2d42..830823605 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -114,6 +114,7 @@
 @include "npc/020-1/_import.txt"
 @include "npc/020-2/_import.txt"
 @include "npc/020-3/_import.txt"
+@include "npc/020-5/_import.txt"
 @include "npc/021-1/_import.txt"
 @include "npc/021-2/_import.txt"
 @include "npc/021-3/_import.txt"
diff --git a/npc/functions/mobpoint.txt b/npc/functions/mobpoint.txt
index 8bb2148e4..7e3a6e1f2 100644
--- a/npc/functions/mobpoint.txt
+++ b/npc/functions/mobpoint.txt
@@ -40,6 +40,8 @@ OnNPCKillEvent:
     end;
 
 // When you kill a player, some special care is needed
+// Only a few maps will give you experience for PK: Tulimshar's Guards Arena, 
+// Frostia Imperial PVP Arena, Call Of Dusty, Arena Quirino Voraz, Terranite Cave.
 OnPCKillEvent:
     // killedrid
     // This is actually just a bunch of tests.