From 5946460b3e6da69a54dec8300491381a2acb2df2 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 23 Jun 2018 22:09:36 -0300
Subject: Move Luanna inside Halinarzo's Church

---
 conf/map/maps.conf    |   1 +
 db/map_index.txt      |  57 +++++++++++++++++++++++++-------------------------
 maps/re/009-1.mcache  | Bin 789 -> 791 bytes
 maps/re/009-5.mcache  | Bin 0 -> 101 bytes
 npc/009-1/_import.txt |   1 -
 npc/009-1/_warps.txt  |   1 +
 npc/009-1/luanna.txt  |  30 --------------------------
 npc/009-5/_import.txt |   4 ++++
 npc/009-5/_warps.txt  |   3 +++
 npc/009-5/luanna.txt  |  30 ++++++++++++++++++++++++++
 npc/_import.txt       |   1 +
 11 files changed, 69 insertions(+), 59 deletions(-)
 create mode 100644 maps/re/009-5.mcache
 delete mode 100644 npc/009-1/luanna.txt
 create mode 100644 npc/009-5/_import.txt
 create mode 100644 npc/009-5/_warps.txt
 create mode 100644 npc/009-5/luanna.txt

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index bc2be10db..ee007f664 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -51,6 +51,7 @@ map_list: (
     "009-2",
     "009-3",
     "009-4",
+    "009-5",
     "010-1-1",
     "010-1",
     "010-2",
diff --git a/db/map_index.txt b/db/map_index.txt
index 7c2f6a481..7688064e1 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -48,31 +48,32 @@
 009-2 48
 009-3 49
 009-4 50
-010-1-1 51
-010-1 52
-010-2 53
-011-1 54
-011-2 55
-012-1 56
-012-2 57
-012-3 58
-012-4 59
-012-5 60
-012-6 61
-012-7 62
-014-1 63
-014-2 64
-014-3 65
-015-1 66
-015-2 67
-015-3 68
-016-1 69
-016-6 70
-016-7 71
-boss 72
-botcheck 73
-sec_pri 74
-soren-2 75
-soren 76
-test 77
-testbg 78
+009-5 51
+010-1-1 52
+010-1 53
+010-2 54
+011-1 55
+011-2 56
+012-1 57
+012-2 58
+012-3 59
+012-4 60
+012-5 61
+012-6 62
+012-7 63
+014-1 64
+014-2 65
+014-3 66
+015-1 67
+015-2 68
+015-3 69
+016-1 70
+016-6 71
+016-7 72
+boss 73
+botcheck 74
+sec_pri 75
+soren-2 76
+soren 77
+test 78
+testbg 79
diff --git a/maps/re/009-1.mcache b/maps/re/009-1.mcache
index d5d47e27e..ee37bb77f 100644
Binary files a/maps/re/009-1.mcache and b/maps/re/009-1.mcache differ
diff --git a/maps/re/009-5.mcache b/maps/re/009-5.mcache
new file mode 100644
index 000000000..d492dc73e
Binary files /dev/null and b/maps/re/009-5.mcache differ
diff --git a/npc/009-1/_import.txt b/npc/009-1/_import.txt
index 15f7c47ae..0d482e907 100644
--- a/npc/009-1/_import.txt
+++ b/npc/009-1/_import.txt
@@ -6,7 +6,6 @@
 "npc/009-1/fisherman.txt",
 "npc/009-1/foxhound.txt",
 "npc/009-1/guards.txt",
-"npc/009-1/luanna.txt",
 "npc/009-1/lynnthetraveler.txt",
 "npc/009-1/mapflags.txt",
 "npc/009-1/soul-menhir.txt",
diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt
index 13dbb0b1f..09a9baf36 100644
--- a/npc/009-1/_warps.txt
+++ b/npc/009-1/_warps.txt
@@ -6,3 +6,4 @@
 009-1,73,63,0	warp	#009-1_73_63	0,0,009-2,28,65
 009-1,86,34,0	warp	#009-1_86_34	0,0,009-3,44,56
 009-1,33,62,0	warp	#009-1_33_62	0,0,009-4,48,53
+009-1,64,38,0	warp	#009-1_64_38	1,0,009-5,32,41
diff --git a/npc/009-1/luanna.txt b/npc/009-1/luanna.txt
deleted file mode 100644
index b1cdb5024..000000000
--- a/npc/009-1/luanna.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-// TMW2 Script
-// Author:
-//    Jesusalva, 4144
-// Description:
-//  Luanna is responsible for marriage. Temporary location. Subject to change stuff later.
-
-009-1,107,32,0	script	Luanna	NPC_FEMALE,{
-    marriagemain();
-    close;
-
-OnTimer30000:
-    marriagecheck();
-    end;
-
-OnInit:
-    .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
-    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 10);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 5);
-
-    .sex = G_FEMALE;
-    .distance = 5;
-    initnpctimer;
-
-    end;
-
-}
diff --git a/npc/009-5/_import.txt b/npc/009-5/_import.txt
new file mode 100644
index 000000000..20d4451b1
--- /dev/null
+++ b/npc/009-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 009-5: Halinarzo Church
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/009-5/_warps.txt",
+"npc/009-5/luanna.txt",
diff --git a/npc/009-5/_warps.txt b/npc/009-5/_warps.txt
new file mode 100644
index 000000000..ee7350c51
--- /dev/null
+++ b/npc/009-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 009-5: Halinarzo Church warps
+009-5,33,42,0	warp	#009-5_33_42	1,0,009-1,63,39
diff --git a/npc/009-5/luanna.txt b/npc/009-5/luanna.txt
new file mode 100644
index 000000000..089062310
--- /dev/null
+++ b/npc/009-5/luanna.txt
@@ -0,0 +1,30 @@
+// TMW2 Script
+// Author:
+//    Jesusalva, 4144
+// Description:
+//  Luanna is responsible for marriage. Subject to change stuff later.
+
+009-5,32,29,0	script	Luanna	NPC_FEMALE,{
+    marriagemain();
+    close;
+
+OnTimer30000:
+    marriagecheck();
+    end;
+
+OnInit:
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 10);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 5);
+
+    .sex = G_FEMALE;
+    .distance = 5;
+    initnpctimer;
+
+    end;
+
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 2ef34ed29..2dca8f0b0 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -50,6 +50,7 @@
 @include "npc/009-2/_import.txt"
 @include "npc/009-3/_import.txt"
 @include "npc/009-4/_import.txt"
+@include "npc/009-5/_import.txt"
 @include "npc/010-1-1/_import.txt"
 @include "npc/010-1/_import.txt"
 @include "npc/010-2/_import.txt"
-- 
cgit v1.2.3-70-g09d2