Bug fixes

moved diryn south of Hurnscald, fixed bugs in 027-2 and 012-4
added pvpflag for 012-4 fixed terranite armor, fixed news for correct info
and better wrapping

5 files changed, 79 insertions, 1 deletions

diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt
index 2bdd6303..312d7fbf 100644
--- a/npc/008-1_Hurnscald_outskirts/_import.txt
+++ b/npc/008-1_Hurnscald_outskirts/_import.txt
@@ -2,6 +2,7 @@ map: 008-1.gat
 npc: npc/008-1_Hurnscald_outskirts/_mobs.txt
 npc: npc/008-1_Hurnscald_outskirts/_warps.txt
 npc: npc/008-1_Hurnscald_outskirts/andra.txt
+npc: npc/008-1_Hurnscald_outskirts/diryn.txt
 npc: npc/008-1_Hurnscald_outskirts/dock.txt
 npc: npc/008-1_Hurnscald_outskirts/george.txt
 npc: npc/008-1_Hurnscald_outskirts/hinnak.txt
diff --git a/npc/008-1_Hurnscald_outskirts/diryn.txt b/npc/008-1_Hurnscald_outskirts/diryn.txt
new file mode 100644
index 00000000..6cd7f2aa
--- /dev/null
+++ b/npc/008-1_Hurnscald_outskirts/diryn.txt
@@ -0,0 +1,75 @@
+//This is a teleportation (warp) NPC.  Its purpose is to offer expensive, fast trips throughout the world.
+
+008-1.gat,81,82,0	script	Diryn the Traveler	103,{
+	mes "[Diryn]";
+    	mes "\"Greetings.  I am Diryn the Traveler, Assistant Councilor of Tulimshar and teleportation extraordinaire.  Tulimshar is expanding our influence throughout the world, so I was sent here to aid all who are willing and able to take on the threats to our interests.\"";
+	next;
+	mes "\"The monsters of the world have grown out of control, harming people, trade and travel.  Needless to say, Tulimshar is not happy with this problem.  Our solution: Rally those powerful enough to combat the monster threat and send them to hot spots to challenge the monster threat head on.  However, teleportation to these areas is not only extremely dangerous, but also highly expensive.   Do you think you got what it takes?\"";
+	menu
+		"I sure do!", L_Diryn_Yes,
+		"No thank you", L_Diryn_No;
+	close;
+
+L_Diryn_Yes:
+	mes "[Diryn]";
+	mes "\"Excellent.  I can send you to many places, but again, the fees are large. Where shall I send you?\"";
+	menu
+		"Druid Tree (3000 GP)", L_Diryn_Druid_Tree,
+		"Graveyard (3000 GP)", L_Diryn_Graveyard,
+		"Magic House (2000 GP)", L_Diryn_Magic_House,
+		"Terranite Cave (3000 GP)", L_Diryn_Terranite,
+		"Tulimshar Town Square (2000 GP)", L_Diryn_Tulimshar,
+		"Not Interested", L_Diryn_No;
+	close;
+
+L_Diryn_Druid_Tree:
+	if (zeny < 3000) goto L_NoMoney;
+	mes "[Diryn]";
+	mes "\"Be fearless!\"";
+	set zeny, zeny-3000;
+	warp "005-1.gat",73,36;
+	close;
+
+L_Diryn_Graveyard:
+	if (zeny < 3000) goto L_NoMoney;
+	mes "[Diryn]";
+	mes "\"Be fearless!\"";
+	set zeny, zeny-3000;
+    	warp "027-1.gat",70,85;
+    	close;
+
+L_Diryn_Magic_House:
+	if (zeny < 2000) goto L_NoMoney;
+	mes "[Diryn]";
+	mes "\"Be fearless!\"";
+	set zeny, zeny-2000;
+	warp "013-1.gat",45,92;
+	close;
+
+L_Diryn_Terranite:
+	if (zeny < 3000) goto L_NoMoney;
+	mes "[Diryn]";
+	mes "\"Be fearless!\"";
+	set zeny, zeny-3000;
+	warp "012-3.gat",445,65;
+	close;
+
+L_Diryn_Tulimshar:
+	if (zeny < 2000) goto L_NoMoney;
+	mes "[Diryn]";
+	mes "\"Be fearless!\"";
+	set zeny, zeny-2000;
+	warp "001-1.gat",44,70;
+	close;
+
+L_Diryn_No:
+	mes "[Diryn]";
+	mes "\"Perhaps some day you will have the courage to help us.  Enjoy your stay here in Hurnscald.\"";
+	close;
+
+L_NoMoney:
+	mes "[Diryn]";
+	mes "\"Sorry, you don't have enough.  Maybe next time.\"";
+	close;
+
+}
diff --git a/npc/012-4_Cave/_import.txt b/npc/012-4_Cave/_import.txt
index 70e118bc..59703ed9 100644
--- a/npc/012-4_Cave/_import.txt
+++ b/npc/012-4_Cave/_import.txt
@@ -1,3 +1,4 @@
 map: 012-4.gat
 npc: npc/012-4_Cave/_mobs.txt
 npc: npc/012-4_Cave/_warps.txt
+npc: npc/012-4_Cave/pvpflag.txt
diff --git a/npc/012-4_Cave/pvpflag.txt b/npc/012-4_Cave/pvpflag.txt
new file mode 100644
index 00000000..b796cefa
--- /dev/null
+++ b/npc/012-4_Cave/pvpflag.txt
@@ -0,0 +1 @@
+012-4.gat mapflag pvp
diff --git a/npc/027-2_Caretakers_House/_warps.txt b/npc/027-2_Caretakers_House/_warps.txt
index 32db1af8..8b7af158 100644
--- a/npc/027-2_Caretakers_House/_warps.txt
+++ b/npc/027-2_Caretakers_House/_warps.txt
@@ -1,3 +1,3 @@
 // 027-2 Caretaker's House warps
 
-027-2.gat,25,32	warp	toGraveyard	-1,-1,027-1.gat,88,85
+027-2.gat,26,33	warp	toGraveyard	-1,-1,027-1.gat,88,85