Change the Converter to use different folder names

And update everything to use it.

5 files changed, 196 insertions, 0 deletions

diff --git a/npc/031-2/_import.txt b/npc/031-2/_import.txt
new file mode 100644
index 00000000..39d9ffce
--- /dev/null
+++ b/npc/031-2/_import.txt
@@ -0,0 +1,7 @@
+// Map 031-2: Angela's House
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+map: 031-2.gat
+npc: npc/031-2/_mobs.txt
+npc: npc/031-2/_warps.txt
+npc: npc/031-2/angelaHouse.txt
+npc: npc/031-2/cindyHouse.txt
diff --git a/npc/031-2/_mobs.txt b/npc/031-2/_mobs.txt
new file mode 100644
index 00000000..196d0da7
--- /dev/null
+++ b/npc/031-2/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Angela's House mobs
+
+
+
+031-2.gat,0,0,0	script	Mob031-2	-1,{
+	end;
+}
diff --git a/npc/031-2/_warps.txt b/npc/031-2/_warps.txt
new file mode 100644
index 00000000..e56544d2
--- /dev/null
+++ b/npc/031-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually changes will be removed when running the Converter.
+// Angela's House warps
+
+031-2.gat,23,30	warp	door	-1,-1,031-1.gat,95,82
diff --git a/npc/031-2/angelaHouse.txt b/npc/031-2/angelaHouse.txt
new file mode 100644
index 00000000..488f600a
--- /dev/null
+++ b/npc/031-2/angelaHouse.txt
@@ -0,0 +1,113 @@
+// author: Jenalya
+// reviewed by: 
+// state0, 1, 2: you shouldn't be able to come here
+// state3: it's your first visit, you can choose a reward
+// state4: you can do daily quests with white and yellow presents boxes
+// 
+
+031-2.gat,29,28,0	script	Angela	196, {
+
+	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 == 4) goto L_Hello_Again;  
+	if (@rescue_Cindy == 3) goto L_Reward;
+
+	mes "...";
+	close;
+	
+L_Reward:
+	mes "[Angela]";
+	mes "\"Hello " + strcharinfo(0) + ", thank you again. I'm so glad Cindy is back home safe.\"";
+	next;
+	mes "\"As I told you, my husband is an adventurer. He is on one of his travels, so he couldn't rescue Cindy himself.\"";
+	next;
+	mes "\"I want to give you one of his treasures. Beside all the junk he brings, there are some very valuable things.\"";
+	next;
+	mes "\"This item is called the Rock Knife. When you wield it, you feel as robust as a rock.\"";
+	
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_Full_Inv;
+
+	getitem "RockKnife", 1;
+	
+	set @rescue_Cindy, 4;
+	callsub S_Update_Mask;
+	
+	next;
+	mes "\"I hope this will be useful for you.\"";
+	next;
+	mes "\"I am so glad Cindy is safe. But there is still another problem. The Yetis took away all the white and yellow present boxes we wanted to bring to Santa!\"";
+	next;
+	mes "\"Usually, Yetis are very shy - I wonder why they did that. There is something strange going on.\"";
+	next;
+	mes "\"May I ask you for help again? I'll give you a small reward for every 3 boxes of one color you bring me.\"";
+	close;
+	
+L_Full_Inv:
+	mes "\"Oh, it seems you carry so much stuff - I will keep it for you until you can take it.\"";
+	close;
+	
+L_Hello_Again:
+	mes "[Angela]";
+	mes "\"Hello! Good to see you again. Please warm yourself.\"";
+	next;
+	menu 
+		"I just wanted to say hello.",-,
+		"I have some yellow present boxes.",L_Yellow,
+		"I have some white present boxes.",L_White;  
+	close;
+	
+L_Yellow:
+	set @dq_level, 70;
+	set @dq_cost, 32;
+	set @dq_count, 3;
+	set @dq_name$, "YellowPresentBox";
+	set @dq_friendly_name$, "yellow present box";
+	set @dq_money, 5300;
+	set @dq_exp, 1300;
+
+	callfunc "DailyQuest";
+	
+	next;
+	
+	if (@dq_return ==4) mes "\"Santa will be glad to have them back.\"";
+	close;
+
+L_White:
+	set @dq_level, 80;
+	set @dq_cost, 64;
+	set @dq_count, 3;
+	set @dq_name$, "WhitePresentBox";
+	set @dq_friendly_name$, "white present box";
+	set @dq_money, 10800;
+	set @dq_exp, 2800;
+
+	callfunc "DailyQuest";
+	
+	next;
+	
+	if (@dq_return ==4) mes "\"You are a great help!\"";
+	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-2/cindyHouse.txt b/npc/031-2/cindyHouse.txt
new file mode 100644
index 00000000..97aa2bb9
--- /dev/null
+++ b/npc/031-2/cindyHouse.txt
@@ -0,0 +1,64 @@
+// author: Jenalya
+// reviewed by: 
+// state0,1,2: you shouldn't be able to reach this place
+// state3 and greater: Cindy is saved, she says one of some random phrases
+//
+
+031-2.gat,27,26,0	script	Cindy	197, {
+
+	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_Happy_Random;
+
+	mes "...";
+	close; 
+
+L_Happy_Random:
+	getinventorylist;
+	set @candy, rand(50); 
+	if (@inventorylist_count < 100 && @candy == 42) goto L_Candy;
+	
+	setarray @quote_Cindy$, "Thank you so much for rescuing me!",
+	"My mother made really tasty cookies yesterday. But I already ate them all...",
+	"I want to go ice skating tomorrow. That will be fun!",
+	"I wonder when Daddy will come home next time. He always brings exciting stuff!",
+	strcharinfo(0) + "! You're my hero!",
+	"My mother is so upset about the Yetis - they are very very shy usually. You have to be lucky to see one. I wonder what's wrong with them.",
+	"When I'm a little older, I want to travel like you and my father. I want to see every place on the world!",
+	"Did you ever meet Santa? He's very kind! He always gives me some candy when we go to see him.",
+	strcharinfo(0) + ", you are sooo strong! Amazing! But my dad is strong too!";
+	set @random, rand(9);
+	if (@random != 5) emotion 3;
+	set @quote$, "\"" + @quote_Cindy$[@random] + "\"";
+	mes "[Cindy]";
+	mes @quote$;
+	close;
+	
+L_Candy:
+	mes "[Cindy]";
+	mes "\"Santa gave me some candy! Please, take that!\"";
+	getitem "Candy", 1;
+	close;
+	
+S_Update_Mask:
+        set QUEST_Nivalis_state,
+        	(QUEST_Nivalis_state & ~(@Q_Nivalis_state_MASK))
+                | (@rescue_Cindy << @Q_Nivalis_state_SHIFT);
+        return;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+