Make Maps, add model on 017-3 for coding sake

17 files changed, 112 insertions, 21 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 064a654f4..b372367a2 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -83,6 +83,7 @@ map_list: (
     "017-2",
     "017-3",
     "017-4",
+    "017-5",
     "018-1-1",
     "018-1",
     "018-2-1",
@@ -92,6 +93,7 @@ map_list: (
     "018-4-1",
     "018-4-2",
     "018-4",
+    "018-5",
     "boss",
     "botcheck",
     "sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index 949b6d21e..dec891b03 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -80,19 +80,21 @@
 017-2 80
 017-3 81
 017-4 82
-018-1-1 83
-018-1 84
-018-2-1 85
-018-2 86
-018-3-1 87
-018-3 88
-018-4-1 89
-018-4-2 90
-018-4 91
-boss 92
-botcheck 93
-sec_pri 94
-soren-2 95
-soren 96
-test 97
-testbg 98
+017-5 83
+018-1-1 84
+018-1 85
+018-2-1 86
+018-2 87
+018-3-1 88
+018-3 89
+018-4-1 90
+018-4-2 91
+018-4 92
+018-5 93
+boss 94
+botcheck 95
+sec_pri 96
+soren-2 97
+soren 98
+test 99
+testbg 100
diff --git a/maps/re/017-1.mcache b/maps/re/017-1.mcache
index 8b57f5410..bceeacd62 100644
--- a/maps/re/017-1.mcache
+++ b/maps/re/017-1.mcache
diff --git a/maps/re/017-5.mcache b/maps/re/017-5.mcache
new file mode 100644
index 000000000..1750a85f0
--- /dev/null
+++ b/maps/re/017-5.mcache
diff --git a/maps/re/018-1.mcache b/maps/re/018-1.mcache
index bbc99e118..5fd249b7c 100644
--- a/maps/re/018-1.mcache
+++ b/maps/re/018-1.mcache
diff --git a/maps/re/018-5.mcache b/maps/re/018-5.mcache
new file mode 100644
index 000000000..3fde2e0ed
--- /dev/null
+++ b/maps/re/018-5.mcache
diff --git a/npc/017-1/_warps.txt b/npc/017-1/_warps.txt
index ac6269f8f..85b8bd8e4 100644
--- a/npc/017-1/_warps.txt
+++ b/npc/017-1/_warps.txt
@@ -1,9 +1,10 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 017-1: Land Of Fire Village warps
-017-1,176,197,0	warp	#017-1_176_197	0,0,018-2,63,105
-017-1,152,224,0	warp	#017-1_152_224	0,0,018-1,32,66
+017-1,180,193,0	warp	#017-1_180_193	0,0,018-2,63,105
+017-1,152,224,0	warp	#017-1_152_224	0,0,018-1,32,68
 017-1,119,60,0	warp	#017-1_119_60	0,0,017-2,31,30
 017-1,219,91,0	warp	#017-1_219_91	0,0,014-4,95,33
 017-1,55,143,0	warp	#017-1_55_143	2,0,017-3,32,44
 017-1,150,87,0	warp	#017-1_150_87	0,0,017-4,27,41
 017-1,155,87,0	warp	#017-1_155_87	0,0,017-4,35,41
+017-1,133,155,0	warp	#017-1_133_155	0,0,017-5,23,33
diff --git a/npc/017-3/model.c b/npc/017-3/model.c
new file mode 100644
index 000000000..53fff5983
--- /dev/null
+++ b/npc/017-3/model.c
@@ -0,0 +1,45 @@
+// TMW2/LoF scripts.
+// Authors:
+//    TMW-LoF Team
+//    Jesusalva
+// Description:
+//    Permanently repeatable quest, without any special limit
+
+017-3,68,87,0	script	Model	NPC_PLAYER,{
+    mesn;
+    mesq l("This room is too dark. I want to brighten it up.");
+    next;
+    .@price=(getiteminfo(CaveSnakeLamp, ITEMINFO_SELLPRICE)*11/10)*5;
+    mesn;
+    mesq l("I am willing to pay @@ GP for each 5 @@ you bring me!", .@price, getitemlink(CaveSnakeLamp));
+    next;
+    select
+        rif(countitem(CaveSnakeLamp) >= 5, l("Here they are!")),
+        l("Not now...");
+    mes "";
+    if (@menu == 1) {
+        delitem CaveSnakeLamp, 5;
+        Zeny=Zeny+.@price;
+        getexp (.@price/rand(2,3)), 5;
+        mesn;
+        mesq l("Many, many thanks!");
+        next;
+    }
+    mesn;
+    mesq l("Too bad these lamps wear off after a while... I am making stocks of them now!");
+    close;
+
+OnInit:
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, FancyHat);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShirt);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_WEAPON, JeansShorts);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 2);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 4);
+
+    .sex=G_MALE;
+    .distance=5;
+    end;
+}
+
diff --git a/npc/017-5/_import.txt b/npc/017-5/_import.txt
new file mode 100644
index 000000000..3c5b312d2
--- /dev/null
+++ b/npc/017-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 017-5: LoF Weapon Smith & Shop
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/017-5/_warps.txt",
+"npc/017-5/nahrec.txt",
diff --git a/npc/017-5/_warps.txt b/npc/017-5/_warps.txt
new file mode 100644
index 000000000..df2913260
--- /dev/null
+++ b/npc/017-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 017-5: LoF Weapon Smith & Shop warps
+017-5,23,34,0	warp	#017-5_23_34	0,0,017-1,133,156
diff --git a/npc/017-5/nahrec.txt b/npc/017-5/nahrec.txt
index 54ea9044a..5c10bfd24 100644
--- a/npc/017-5/nahrec.txt
+++ b/npc/017-5/nahrec.txt
@@ -4,10 +4,10 @@
 //    Jesusalva
 // Description:
 //    General Purpose Blacksmith
-//          TODO: Shield building on market square
 //          TODO: Mylarin Dust for THE EPISODE. This means Savior Pants is part of THE EPISODE
+//          TODO: Silversmith on 24, 25
 
-017-5,0,0,0	script	Nahrec	NPC_PLAYER,{
+017-5,44,24,0	script	Nahrec	NPC_PLAYER,{
     // blacksmith_create( BaseItem1, Amount, BaseItem2, Amount, PrizeItem, Price )
     function blacksmith_create {
         .@base1=getarg(0);
diff --git a/npc/018-2/_warps.txt b/npc/018-2/_warps.txt
index 3a4af7540..d529700c0 100644
--- a/npc/018-2/_warps.txt
+++ b/npc/018-2/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 018-2: Heroes' Hold - Outside warps
-018-2,63,106,0	warp	#018-2_63_106	0,0,017-1,176,196
+018-2,63,106,0	warp	#018-2_63_106	0,0,017-1,180,194
 018-2,72,63,0	warp	#018-2_72_63	3,0,018-2-1,26,32
diff --git a/npc/018-5/_import.txt b/npc/018-5/_import.txt
new file mode 100644
index 000000000..aa575340c
--- /dev/null
+++ b/npc/018-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 018-5: Lilit Island
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/018-5/_mobs.txt",
+"npc/018-5/soul_menhir.txt",
diff --git a/npc/018-5/_mobs.txt b/npc/018-5/_mobs.txt
new file mode 100644
index 000000000..0b1e80524
--- /dev/null
+++ b/npc/018-5/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 018-5: Lilit Island mobs
+018-5,68,87,25,16	monster	Water Fairy	1185,8,20000,40000
+018-5,66,84,25,18	monster	Grass Snake	1169,10,10000,10000
+018-5,82,88,41,15	monster	Wind Fairy	1185,8,40000,20000
+018-5,99,47,22,14	monster	Poison Fairy	1186,6,30000,30000
+018-5,58,146,26,12	monster	Mountain Snake	1123,6,120000,0
diff --git a/npc/018-5/soul_menhir.txt b/npc/018-5/soul_menhir.txt
new file mode 100644
index 000000000..6a28f95ef
--- /dev/null
+++ b/npc/018-5/soul_menhir.txt
@@ -0,0 +1,20 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Soul Menhir
+
+018-5,111,52,0	script	Soul Menhir#lil	NPC_MOSS,{
+    @map$ = "018-1";
+    setarray @Xs, 110, 111, 112;
+    setarray @Ys,  53,  53,  53;
+    @x = 0;
+    @y = 0;
+    callfunc "SoulMenhir";
+    @map$ = "";
+    cleararray @Xs[0], 0, getarraysize(@Xs);
+    cleararray @Ys[0], 0, getarraysize(@Ys);
+    @x = 0;
+    @y = 0;
+    close;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index a7400bae6..a9f03c872 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -82,6 +82,7 @@
 @include "npc/017-2/_import.txt"
 @include "npc/017-3/_import.txt"
 @include "npc/017-4/_import.txt"
+@include "npc/017-5/_import.txt"
 @include "npc/018-1-1/_import.txt"
 @include "npc/018-1/_import.txt"
 @include "npc/018-2-1/_import.txt"
@@ -91,6 +92,7 @@
 @include "npc/018-4-1/_import.txt"
 @include "npc/018-4-2/_import.txt"
 @include "npc/018-4/_import.txt"
+@include "npc/018-5/_import.txt"
 @include "npc/boss/_import.txt"
 @include "npc/botcheck/_import.txt"
 @include "npc/sec_pri/_import.txt"
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index 383db3b1d..b0f3e68e9 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -60,6 +60,7 @@ OnInit:
     htput(.wcore, "018-1", "woodland");
     htput(.wcore, "018-2", "woodland");
     htput(.wcore, "018-4", "woodland");
+    htput(.wcore, "018-5", "woodland");
 
     // Icelands
     htput(.wcore, "001-7", "iceland");