Change the Converter to use different folder names

And update everything to use it.

6 files changed, 202 insertions, 0 deletions

diff --git a/npc/031-1/_import.txt b/npc/031-1/_import.txt
new file mode 100644
index 00000000..f525795e
--- /dev/null
+++ b/npc/031-1/_import.txt
@@ -0,0 +1,8 @@
+// Map 031-1: NivalisPort
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 031-1.gat
+npc: npc/031-1/_mobs.txt
+npc: npc/031-1/_warps.txt
+npc: npc/031-1/angelaOutside.txt
+npc: npc/031-1/frozenbeard.txt
+npc: npc/031-1/house.txt
diff --git a/npc/031-1/_mobs.txt b/npc/031-1/_mobs.txt
new file mode 100644
index 00000000..2d799801
--- /dev/null
+++ b/npc/031-1/_mobs.txt
@@ -0,0 +1,26 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// NivalisPort mobs
+
+031-1.gat,75,72,86,110	monster	Santa Slime	1015,5,100000,30000,Mob031-1::On1015
+031-1.gat,89,74,86,110	monster	Squirrel	1038,10,100000,30000,Mob031-1::On1038
+031-1.gat,89,74,86,110	monster	Fluffy	1020,15,100000,30000,Mob031-1::On1020
+
+
+031-1.gat,0,0,0	script	Mob031-1	-1,{
+On1015:
+	set @mobID, 1015;
+	callfunc "MobPoints";
+	break;
+
+On1020:
+	set @mobID, 1020;
+	callfunc "MobPoints";
+	break;
+
+On1038:
+	set @mobID, 1038;
+	callfunc "MobPoints";
+	break;
+
+	end;
+}
diff --git a/npc/031-1/_warps.txt b/npc/031-1/_warps.txt
new file mode 100644
index 00000000..9ca21459
--- /dev/null
+++ b/npc/031-1/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// NivalisPort warps
+
+031-1.gat,37,55	warp	toNivalis	-1,-1,020-1.gat,106,55
+031-1.gat,76,24	warp	toLabyrinth	-1,-1,031-3.gat,212,298
diff --git a/npc/031-1/angelaOutside.txt b/npc/031-1/angelaOutside.txt
new file mode 100644
index 00000000..3df9daa9
--- /dev/null
+++ b/npc/031-1/angelaOutside.txt
@@ -0,0 +1,116 @@
+// author: Jenalya
+// reviewed by:
+// state0: Angela is to upset to tell you anything, needs a concentration potion
+// state1: got the mission to save Cindy
+// state2 and state3: Cindy is saved Angela invites you to visit them for giving a reward
+// state greater than 3: Angela invites and asks you to bring present boxes
+
+031-1.gat,79,24,0	script	Angela	195, {
+
+	set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
+	set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
+
+	set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
+
+    if (@rescue_Cindy > 3) goto L_Please_Visit_Again;
+	if (@rescue_Cindy > 1) goto L_Please_Visit;
+	if (@rescue_Cindy == 1) goto L_Please_Help;
+
+	mes "[Angela]";
+	mes "\"Please, I need help! My little daughter!\"";
+	next;
+	mes "\"It's terrible, oh my dear child!\"";
+	next;
+
+	if (countitem("ConcentrationPotion") > 0 && baselevel > 69) goto L_Menu_Potion;
+
+	menu
+		"\"Please calm down and tell me what happened.\"", L_Whining,
+		"Leave", -;
+	close;
+
+L_Whining:
+	mes "[Angela]";
+	mes "\"My poor little daughter, please! Oh no, oh no...\"";
+	next;
+	mes "\"We need to do something! My poor little Cindy! My cute little girl!\"";
+	next;
+	mes "\"It's so terrible, how could that happen? Please, I need help, it's so terrible.\"";
+	next;
+	mes "\"Those awful filthy monsters - terrible!\"";
+	next;
+	mes "\"Oh Cindy, my little Cindy - oh no...\"";
+	next;
+	mes "\"Please help, we need to do something!\"";
+	next;
+	mes "\"It's so terrible, my poor cute little Cindy...\"";
+	next;
+	mes "\"Oh, when I think what might happen to her right now!\"";
+	next;
+	mes "\"She is crying and sobbing.\"";
+	next;
+	mes "\"It seems she is too upset to tell you anything helpful. If she would just calm down and concentrate a bit...\"";
+	close;
+
+L_Menu_Potion:
+	menu
+		"\"Please calm down and tell me what happened.\"", L_Whining,
+		"Give her a concentration potion.", L_Calm_Down,
+		"Leave", -;
+	close;
+
+L_Calm_Down:
+	if (countitem("ConcentrationPotion") == 0) goto L_No_Potion;
+	delitem "ConcentrationPotion", 1;
+	mes "She drinks the concentration potions and calms down.";
+	mes "[Angela]";
+	mes "\"Thank you, this was helpful.\"";
+	next;
+	mes "\"My daughter Cindy and I were on our way to Santa, to bring him some presents. Many people here in Nivalis are helping Santa with his business.\"";
+	next;
+	mes "\"When we passed the entrance of this cave, a pack of Yetis came out of there. It's disturbing, because usually they are very shy.\"";
+	next;
+	mes "\"We tried to run away, but there were too many of them. They took my poor little Cindy and all the presents with them.\"";
+	next;
+	mes "\"Oh my poor little girl. I'm so worried - what might they do with her? Oh no!\"";
+	next;
+	mes "\"You look like an adventurer! Please, can you go in that cave and rescue my little Cindy? I beg you for help!\"";
+	set @rescue_Cindy, 1;
+	callsub S_Update_Mask;
+	close;
+
+L_No_Potion:
+	mes "You don't have a concentration potion.";
+	close;
+
+L_Please_Help:
+	mes "[Angela]";
+	mes "\"Please go in that cave and rescue my daughter!\"";
+	close;
+
+L_Please_Visit:
+	mes "[Angela]";
+	mes "\"Thank you so much for rescuing my beloved Cindy. Please come to visit us in our house at the beach.\"";
+	next;
+	mes "\"My husband is an adventurer like you, and I want to give you something he got on his travels to show my gratitude.\"";
+	close;
+
+L_Please_Visit_Again:
+	mes "[Angela]";
+	mes "\"Hello! You are welcome to visit us in our house at the beach everytime. Cindy loves to see you!\"";
+	next;
+	mes "\"If you have found any present boxes the Yetis took away, please bring them to our house. Usually, the Yetis are very shy... their behavior is a bit odd.\"";
+	close;
+
+S_Update_Mask:
+        set QUEST_Nivalis_state,
+        	(QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
+                | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
+        return;
+}
+
+
+
+
+
+
diff --git a/npc/031-1/frozenbeard.txt b/npc/031-1/frozenbeard.txt
new file mode 100644
index 00000000..4f871554
--- /dev/null
+++ b/npc/031-1/frozenbeard.txt
@@ -0,0 +1,29 @@
+//
+
+031-1.gat,97,115,0	script	Frozenbeard	138,{
+
+	mes "[Frozenbeard]";
+	mes "\"Arrr mate! There is no dock here, so I had to row boat from my ship!  I am pioneering and mapping the trade route between here and Argaes, around the Hurnscald area.  I'll hail my shipmates to send a boat and we'll sail out to Argaes, be there in no time, but it will cost you a fee.  500 gold pieces.  What do you say?";
+	menu
+		"Sure.  (500 GP)", L_Frozenbeard_Argaes,
+		"Not right now.", L_Frozenbeard_Stay;
+	close;
+
+L_Frozenbeard_Argaes:
+	if (zeny < 500) goto L_NoMoney;
+	mes "[Frozenbeard]";
+	mes "\"Pleasant Journeys!\"";
+	set zeny, zeny-500;
+	warp "008-1.gat",137,64;
+	close;
+
+L_Frozenbeard_Stay:
+	mes "[Frozenbeard]";
+	mes "\"Suit yourself.  Feel free to come out here anytime, I am really busy making sure these routes are accurate.\"";
+	close;
+
+L_NoMoney:
+	mes "[Frozenbeard]";
+	mes "\"You need more money.  I'll wait here while you get some.\"";
+	close;
+}
diff --git a/npc/031-1/house.txt b/npc/031-1/house.txt
new file mode 100644
index 00000000..d9714ef5
--- /dev/null
+++ b/npc/031-1/house.txt
@@ -0,0 +1,18 @@
+// here is based on the queststatus for the rescue Cindy quest, if the player can enter
+// player can enter, if Cindy is already saved and the player has been invited, quest status > 2
+// author: Jenalya
+
+031-1.gat,95,80,0	script	#Door	127,1,1,{
+	set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
+	set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
+
+	set @rescue_Cindy, ((QUEST_Nivalis_state & @Q_Nivalis_state_MASK) >> @Q_Nivalis_state_SHIFT);
+   
+    if (@rescue_Cindy > 2) goto L_Warp;
+		message strcharinfo(0), "The door is locked.";
+    close;
+    
+L_Warp:      
+    warp "031-2.gat", 23, 28;
+    end;
+}