Add templates for Hinnak and Oscar, make maps

6 files changed, 76 insertions, 1 deletions

diff --git a/npc/012-1/_import.txt b/npc/012-1/_import.txt
index 1c82193bc..3e50006cc 100644
--- a/npc/012-1/_import.txt
+++ b/npc/012-1/_import.txt
@@ -6,6 +6,7 @@
 "npc/012-1/dyrinthetraveler.txt",
 "npc/012-1/guards.txt",
 "npc/012-1/gwendolyn.txt",
+"npc/012-1/hinnak.txt",
 "npc/012-1/jack.txt",
 "npc/012-1/locamit.txt",
 "npc/012-1/mapflags.txt",
diff --git a/npc/012-1/_mobs.txt b/npc/012-1/_mobs.txt
index 1f6feba67..0d87ed307 100644
--- a/npc/012-1/_mobs.txt
+++ b/npc/012-1/_mobs.txt
@@ -2,7 +2,7 @@
 // Map 012-1: Hurnscald mobs
 012-1,90,63,35,14	monster	Red Butterfly	1025,4,30000,90000
 012-1,90,62,36,15	monster	Mana Bug	1075,5,30000,90000
-012-1,92,33,45,15	monster	Pinkie	1132,8,30000,90000
+012-1,85,33,35,15	monster	Pinkie	1132,8,30000,90000
 012-1,44,47,21,32	monster	Clover Patch	1028,4,60000,90000
 012-1,135,58,7,29	monster	Piousse	1003,6,40000,60000
 012-1,85,86,52,15	monster	Silk Worm	1034,5,30000,30000
diff --git a/npc/012-1/hinnak.txt b/npc/012-1/hinnak.txt
new file mode 100644
index 000000000..b19792e88
--- /dev/null
+++ b/npc/012-1/hinnak.txt
@@ -0,0 +1,36 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+// Description:
+//    Hurnscald farmer
+
+014-3,187,84,0	script	Hinnak	NPC_ORC,{
+    .@q1=getq(HurnscaldQuest_Farmers);
+    .@q2=getq2(HurnscaldQuest_Farmers);
+    mesn;
+    if (strcharinfo(0) == $MOST_HEROIC$) mesq l("Ah, if it isn't @@? You're the talk of the town!", $MOST_HEROIC$);
+    if (strcharinfo(0) == $MOST_HEROIC$) next;
+    if (.@q1 < 2) goto L_Oscar;
+
+
+L_Oscar:
+    mesq l("Don't bother me, I'm busy right now. Since the Monster King left, I barely got a night of rest...");
+    close;
+
+L_Close:
+    close;
+
+OnInit:
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, RiceHat);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, MoonshroomRobe);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, TulimsharGuardBoots);
+    setunitdata(.@npcId, UDT_WEAPON, CottonTrousers);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 2);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 0);
+
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
+
diff --git a/npc/014-3/_import.txt b/npc/014-3/_import.txt
index 38507716e..bfb200d19 100644
--- a/npc/014-3/_import.txt
+++ b/npc/014-3/_import.txt
@@ -2,3 +2,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/014-3/_mobs.txt",
 "npc/014-3/_warps.txt",
+"npc/014-3/oscar.txt",
diff --git a/npc/014-3/_mobs.txt b/npc/014-3/_mobs.txt
index 26a7c88ad..57e5bba6e 100644
--- a/npc/014-3/_mobs.txt
+++ b/npc/014-3/_mobs.txt
@@ -4,3 +4,4 @@
 014-3,146,131,70,21	monster	Forest Mushroom	1060,9,60000,45000
 014-3,122,121,90,35	monster	Squirrel	1032,26,30000,42000
 014-3,62,101,37,32	monster	Centaur	1139,4,60000,60000
+014-3,192,94,22,15	monster	Pinkie	1132,6,30000,90000
diff --git a/npc/014-3/oscar.txt b/npc/014-3/oscar.txt
new file mode 100644
index 000000000..acfc5b03f
--- /dev/null
+++ b/npc/014-3/oscar.txt
@@ -0,0 +1,36 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+// Description:
+//    Hurnscald farmer
+
+014-3,187,84,0	script	Oscar	NPC_RAIJIN,{
+    .@q1=getq(HurnscaldQuest_Farmers);
+    .@q2=getq2(HurnscaldQuest_Farmers);
+    mesn;
+    if (strcharinfo(0) == $MOST_HEROIC$) mesq l("Ah, if it isn't @@? You're the talk of the town!", $MOST_HEROIC$);
+    if (strcharinfo(0) == $MOST_HEROIC$) next;
+    if (.@q1 < 2) goto L_Hinnak;
+
+
+L_Hinnak:
+    mesq l("Don't bother me, I'm busy right now. Since the Monster King left, I barely got a night of rest...");
+    close;
+
+L_Close:
+    close;
+
+OnInit:
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, RiceHat);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, MoonshroomRobe);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, TulimsharGuardBoots);
+    setunitdata(.@npcId, UDT_WEAPON, CottonTrousers);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 2);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 0);
+
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+}
+