Merge branch 'master' into jesusalva/innsjesusalva/inns

6 files changed, 69 insertions, 48 deletions

diff --git a/npc/008-1-1/_import.txt b/npc/008-1-1/_import.txt
index be748cf8..4788f56c 100644
--- a/npc/008-1-1/_import.txt
+++ b/npc/008-1-1/_import.txt
@@ -4,3 +4,5 @@
 "npc/008-1-1/_warps.txt",
 "npc/008-1-1/galimatia.txt",
 "npc/008-1-1/koga.txt",
+"npc/008-1-1/morcant.txt",
+"npc/008-1-1/sign.txt",
diff --git a/npc/008-1-1/_mobs.txt b/npc/008-1-1/_mobs.txt
index a34ccc1c..3bd8151c 100644
--- a/npc/008-1-1/_mobs.txt
+++ b/npc/008-1-1/_mobs.txt
@@ -2,7 +2,7 @@
 // Map 008-1-1: Woodland mobs
 008-1-1,173,86,25,5	monster	Forest Maggot	1028,12,500,2500
 008-1-1,132,56,7,5	monster	Forest Maggot	1028,5,500,2500
-008-1-1,144,91,11,16	monster	Butterfly	1032,8,10000,10000
+008-1-1,74,59,9,16	monster	Butterfly	1032,4,20000,10000
 008-1-1,63,73,11,5	monster	Maggot	1026,7,500,10000
 008-1-1,206,87,6,4	monster	Mouboo	1023,3,30000,60000
 008-1-1,131,45,0,0	monster	Beehive	1056,1,30000,100000
@@ -17,50 +17,16 @@
 008-1-1,112,75,2,2	monster	Pink Flower	1034,1,100,10000
 008-1-1,110,46,3,2	monster	Mauve Plant	1036,3,1000,2000
 008-1-1,159,93,9,7	monster	Silkworm	1040,4,3000,6000
-008-1-1,68,29,7,7	monster	Mouboo	1023,3,30000,60000
+008-1-1,62,36,7,7	monster	Mouboo	1023,3,30000,60000
 008-1-1,126,45,0,0	monster	Beehive	1056,1,30000,100000
 008-1-1,121,45,0,0	monster	Beehive	1056,1,30000,100000
-008-1-1,94,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,38,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,94,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,93,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,93,39,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,94,39,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,95,39,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,94,40,0,0	monster	Blue Rose	1061,1,20000,15000
-008-1-1,93,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,43,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,95,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,96,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,96,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,97,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,97,43,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,98,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,99,42,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,99,41,0,0	monster	Yellow Tulip	1059,1,20000,15000
-008-1-1,94,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,94,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,95,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,95,44,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,96,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,97,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,97,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,97,44,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,98,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,99,45,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,98,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,95,46,0,0	monster	Red Rose	1062,1,20000,15000
-008-1-1,93,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,94,47,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,95,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,96,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,96,47,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,97,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,98,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,98,47,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,99,48,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,98,49,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,97,49,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,95,49,0,0	monster	Yellow Rose	1060,1,20000,15000
-008-1-1,94,49,0,0	monster	Yellow Rose	1060,1,20000,15000
+008-1-1,163,178,2,1	monster	Red Rose	1062,1,50000,10000
+008-1-1,158,191,3,1	monster	Yellow Rose	1060,1,20000,5000
+008-1-1,166,184,1,1	monster	Blue Rose	1061,1,100000,20000
+008-1-1,137,86,11,16	monster	Butterfly	1032,8,10000,10000
+008-1-1,75,41,14,4	monster	Silkworm	1040,3,9000,6000
+008-1-1,122,75,8,4	monster	Forest Maggot	1028,3,50000,2500
+008-1-1,96,45,1,0	monster	Red Rose	1062,1,50000,10000
+008-1-1,97,47,2,0	monster	Yellow Rose	1060,1,20000,5000
+008-1-1,99,45,0,0	monster	Blue Rose	1061,1,100000,20000
+008-1-1,161,67,45,11	monster	Moubi	1072,1,200000,1250000
diff --git a/npc/008-1-1/_warps.txt b/npc/008-1-1/_warps.txt
index 56d9cc3f..db9189dc 100644
--- a/npc/008-1-1/_warps.txt
+++ b/npc/008-1-1/_warps.txt
@@ -2,3 +2,5 @@
 // Map 008-1-1: Woodland warps
 008-1-1,247,85,0	warp	#008-1-1_247_85	0,1,008-1,21,85
 008-1-1,202,47,0	warp	#008-1-1_202_47	0,0,008-3-0,129,112
+008-1-1,51,57,0	warp	#008-1-1_51_57	0,0,008-2-32,40,37
+008-1-1,181,198,0	warp	#008-1-1_181_198	1,0,008-1-2,180,32
diff --git a/npc/008-1-1/koga.txt b/npc/008-1-1/koga.txt
index f32e953c..e0a7c2b8 100644
--- a/npc/008-1-1/koga.txt
+++ b/npc/008-1-1/koga.txt
@@ -9,8 +9,15 @@
     speech
         l("So, finally, we are here."),
         l("Do you want to go back to Artis? You really should be afraid of the Legion there, now that you have been here in Woodland. They somehow smell the odor of the Brotherhood.");
-        l("Better you stay here for a while. Come back when you are stronger.");
-
+    next;
+    mesc l("Return to Artis?");
+    if (askyesno() == ASK_YES)
+    {
+        closeclientdialog;
+        setmount 0;
+        warp "001-1", 199, 91;
+        dispbottom l("After a tiring, yet fast, travel by Koga, you arrive at @@.", l("Artis"));
+    }
     close;
 
 OnInit:
diff --git a/npc/008-1-1/morcant.txt b/npc/008-1-1/morcant.txt
new file mode 100644
index 00000000..afb35ad8
--- /dev/null
+++ b/npc/008-1-1/morcant.txt
@@ -0,0 +1,20 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Morcant the Captain, taking care on harbor issues.
+// THIS IS A PLACEHOLDER!
+
+008-1-1,58,57,0	script	Morcant	NPC_MORCANT,{
+    speech
+        l("Hello."),
+        l("My name is Morcant. I am a Captain, a bit bored since this harbor is not frequented much."),
+        l("I would like to offer you food and tell you stories, but.. have you ever heard of WildX? I won't need to say more, do I?");
+
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/008-1-1/sign.txt b/npc/008-1-1/sign.txt
new file mode 100644
index 00000000..df554c2d
--- /dev/null
+++ b/npc/008-1-1/sign.txt
@@ -0,0 +1,24 @@
+// Evol scripts.
+// Authors:
+//    Micksha
+// Description:
+//    Sign pillars in West Woodland.
+
+008-1-1,53,58,0	script	Sign#008-1-1-merchant	NPC_NO_SPRITE,{
+    npctalkonce l("Merchant House");
+    close;
+
+OnInit:
+    .distance = 1;
+    .sex = G_OTHER;
+    end;
+}
+008-1-1,157,87,0	script	Sign#008-1-1-central	NPC_NO_SPRITE,{
+    npctalkonce l("Right: Hurnscald | Down: Swamp");
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+}