Lay out some stuff and fix some obvious bugs (untested)

7 files changed, 60 insertions, 5 deletions

diff --git a/npc/014-2-2/gemini.txt b/npc/014-2-2/gemini.txt
index 376e7c9be..c4def5627 100644
--- a/npc/014-2-2/gemini.txt
+++ b/npc/014-2-2/gemini.txt
@@ -96,10 +96,26 @@ OnCore:
             if (countitem(LazuriteHeart))
                 delitem LazuriteHeart, countitem(LazuriteHeart);
             break;
+        case 10: // Luvia first cutscene
+            break;
+        case 11: // Survived cutscene
+            getexp 256000, 6400;
+            break;
+        case 12: // Storage cutscene
+            break;
+        case 13: // Survived storage
+            getexp 384000, 9600;
+            break;
+        case 14: // Luvia Showdown cutscene
+            break;
+        case 15: // Defeated Luvia and now on pursuit!
+            getexp 512000, 12800;
+            break;
         }
     }
     addtimer(5000, "#Gemini::OnCore");
     end;
 }
 
+// Max experience gain: 1,404,000 XP and 35,100 JXP
 
diff --git a/npc/034-3/gemini.txt b/npc/034-3/gemini.txt
index f08ff2bef..352a4064d 100644
--- a/npc/034-3/gemini.txt
+++ b/npc/034-3/gemini.txt
@@ -76,7 +76,7 @@ OnChannel:
     .@magic_power_loss = 53 - ((readparam2(bInt)+1)*2)/10;
 
     dispbottom l("Ok, let's stay focused now!");
-    areamonster "052-1", 27, 20, 77, 47, strmobinfo(1, Forain), Forain, 1;
+    areamonster getmap(), 27, 20, 77, 47, strmobinfo(1, Forain), Forain, 1;
     // TODO: Loop
     debugmes "NPC: %s / %s (%d)", .name$, .extname$, instance_id();
     .aid=getcharid(3);
@@ -92,11 +92,11 @@ OnTimer13000:
     initnpctimer; // Reset timer
     // Time to spawn monsters
     .@pc = getmapusers(.mp$);
-    areamonster "052-1", 56, 30, 60, 31, "Guardian", Scar, 1+.@pc;
-    areamonster "052-1", 27, 20, 77, 47, strmobinfo(1, Forain), Forain, 2;
+    areamonster .mp$, 56, 30, 60, 31, "Guardian", Scar, 1+.@pc;
+    areamonster .mp$, 27, 20, 77, 47, strmobinfo(1, Forain), Forain, 2;
     // Terranites only show up when doing multiplayer, based on number of players
     if (.@pc >= 2)
-        areamonster "052-1", 56, 30, 60, 31, "Guardian", Terranite, (.@pc/2);
+        areamonster .mp$, 56, 30, 60, 31, "Guardian", Terranite, (.@pc/2);
 OnTimer10000:
 OnTimer8000:
 OnTimer6000:
diff --git a/npc/034-4/_import.txt b/npc/034-4/_import.txt
index 0cf168dce..4e1f47cbf 100644
--- a/npc/034-4/_import.txt
+++ b/npc/034-4/_import.txt
@@ -1,3 +1,6 @@
 // Map 034-4: Forsaken Inn
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/034-4/exit.txt",
+"npc/034-4/intro.txt",
+"npc/034-4/lobby.txt",
+"npc/034-4/storage.txt",
diff --git a/npc/034-4/exit.txt b/npc/034-4/exit.txt
index 3a6c5dfba..b1b6b4d33 100644
--- a/npc/034-4/exit.txt
+++ b/npc/034-4/exit.txt
@@ -2,7 +2,7 @@
 // Authors:
 //    Jesusalva
 // Description:
-//    Gemini Sisters Quest - Final Chamber
+//    Gemini Sisters Quest - Part D: Final Chamber
 
 034-4,144,82,0	script	#GeminiFExit	NPC_HIDDEN,0,0,{
 
@@ -187,3 +187,15 @@ OnSick:
     end;
 }
 
+034-4,146,83,0	script	Chest#gemini	NPC_CHEST,{
+    if (instance_id() < 0 || getcharid(1) < 1) end;
+    GeminiCheck(15);
+    // TODO: Prizes
+    end;
+
+OnInit:
+    .distance=2;
+    end;
+}
+
+
diff --git a/npc/034-4/intro.txt b/npc/034-4/intro.txt
new file mode 100644
index 000000000..d2dbc06e7
--- /dev/null
+++ b/npc/034-4/intro.txt
@@ -0,0 +1,8 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Gemini Sisters Quest - Part A: Party Room
+
+
+
diff --git a/npc/034-4/lobby.txt b/npc/034-4/lobby.txt
new file mode 100644
index 000000000..3336004f9
--- /dev/null
+++ b/npc/034-4/lobby.txt
@@ -0,0 +1,8 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Gemini Sisters Quest - Part C: Showdown
+
+
+
diff --git a/npc/034-4/storage.txt b/npc/034-4/storage.txt
new file mode 100644
index 000000000..0e2523109
--- /dev/null
+++ b/npc/034-4/storage.txt
@@ -0,0 +1,8 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Gemini Sisters Quest - Part B: Storage Room
+
+
+