Tulimshar Inn

11 files changed, 160 insertions, 30 deletions

diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index e552f7c33..2b9dc08e6 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -22,3 +22,5 @@
 003-1,52,35,0	warp	#003-1_52_35	1,0,003-0-1,48,51
 003-1,49,23,0	warp	#003-1_49_23	0,0,003-0-1,22,25
 003-1,54,23,0	warp	#003-1_54_23	0,0,003-0-1,69,24
+003-1,70,137,0	warp	#003-1_70_137	0,0,003-9,62,135
+003-1,64,130,0	warp	#003-1_64_130	0,0,003-9,36,56
diff --git a/npc/003-1/sewer.txt b/npc/003-1/sewer.txt
index 408347145..b490f9923 100644
--- a/npc/003-1/sewer.txt
+++ b/npc/003-1/sewer.txt
@@ -39,3 +39,18 @@
     close;
 }
 
+003-1,73,133,0	script	#ToTheater	NPC_HIDDEN,0,0,{
+    end;
+
+OnTouch:
+    warp "003-9-1", 27, 37;
+    .@q=getq(General_EasterEggs);
+
+    if (!(.@q & EE_THEATER)) {
+        setq General_EasterEggs, .@q|EE_THEATER;
+        dispbottom l("For finding an Easter Egg, you got Strange Coins!");
+        getitem StrangeCoin, 2;
+    }
+
+    end;
+}
diff --git a/npc/003-10/slots.txt b/npc/003-10/slots.txt
index c3e845b27..add4b10e0 100644
--- a/npc/003-10/slots.txt
+++ b/npc/003-10/slots.txt
@@ -42,8 +42,8 @@ L_Menu:
     menu
         rif(countitem(CasinoCoins) >= 1, l("Spin!")), L_Spin,
         l("Prizes"), L_Info,
-        l("Trade"), L_Trade,
-        l("Leave"), L_Quit;
+        l("Leave"), -;
+    close;
 
 L_Info:
     mes "";
@@ -82,37 +82,9 @@ L_Spin:
     next;
     goto L_Menu;
 
-L_Trade:
-    openshop;
-    closedialog;
-    close;
-
-L_Quit:
-    close;
-
 OnInit:
     .sex = G_OTHER;
     .distance = 4;
-	tradertype(NST_CUSTOM);
-
-    sellitem MercBoxA, 940;
-    sellitem JeansShorts, 820;
-	sellitem ElixirOfLife, 150;
-    sellitem PoisonArrow, 30;
-    sellitem StrangeCoin, 5;
     end;
-
-OnCountFunds:
-	setcurrency(countitem(CasinoCoins));
-	end;
-
-OnPayFunds:
-	if( countitem(CasinoCoins) < @price )
-		end;
-	delitem CasinoCoins,@price;
-	purchaseok();
-	end;
-
-
 }
 
diff --git a/npc/003-9-1/_import.txt b/npc/003-9-1/_import.txt
new file mode 100644
index 000000000..073f5c712
--- /dev/null
+++ b/npc/003-9-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 003-9-1: Tulimshar Theater
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-9-1/_warps.txt",
diff --git a/npc/003-9-1/_warps.txt b/npc/003-9-1/_warps.txt
new file mode 100644
index 000000000..5d7acc8fa
--- /dev/null
+++ b/npc/003-9-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-9-1: Tulimshar Theater warps
+003-9-1,26,38,0	warp	#003-9-1_26_38	0,0,003-1,72,133
diff --git a/npc/003-9/_import.txt b/npc/003-9/_import.txt
new file mode 100644
index 000000000..49e21f7ce
--- /dev/null
+++ b/npc/003-9/_import.txt
@@ -0,0 +1,6 @@
+// Map 003-9: Tulimshar Inn
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-9/_warps.txt",
+"npc/003-9/gambler.txt",
+"npc/003-9/recepcionist.txt",
+"npc/003-9/scripted.txt",
diff --git a/npc/003-9/_warps.txt b/npc/003-9/_warps.txt
new file mode 100644
index 000000000..dd9e5a9bd
--- /dev/null
+++ b/npc/003-9/_warps.txt
@@ -0,0 +1,14 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-9: Tulimshar Inn warps
+003-9,62,136,0	warp	#003-9_62_136	0,0,003-1,70,138
+003-9,48,92,0	script	#003-9_48_92	NPC_HIDDEN,1,0,{
+	end;
+OnTouch:
+	slide 47,56; end;
+}
+003-9,48,57,0	script	#003-9_48_57	NPC_HIDDEN,1,0,{
+	end;
+OnTouch:
+	slide 48,93; end;
+}
+003-9,36,57,0	warp	#003-9_36_57	0,0,003-1,64,131
diff --git a/npc/003-9/gambler.txt b/npc/003-9/gambler.txt
new file mode 100644
index 000000000..c553b3308
--- /dev/null
+++ b/npc/003-9/gambler.txt
@@ -0,0 +1,80 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Tulimshar Inn Recepcionist
+
+003-9,42,123,0	script	Gambler Master	NPC_LOF_NOBLEMAN,{
+    mesn;
+    mesq l("Hello! Welcome to the Inn! I am an Alliance officer, and I oversee gambling all over the world!");
+    next;
+    mesn;
+    mesq l("So how can I help you?");
+    do
+    {
+        next;
+        select
+            l("I want to turn over my Casino Coins."),
+            l("How does Gambling works?"),
+            l("How can I obtain casino coins?"),
+            l("Nothing, thanks.");
+        mes "";
+        switch (@menu) {
+            case 1:
+                goto L_Trade;
+            case 2:
+                mesn;
+                mesq l("You find a slot machine or another gambler, and make a bet!");
+                next;
+                mesn;
+                mesq l("If you're right, you'll gain more Casino Coins! And even other nice things!");
+                next;
+                mesn;
+                mesq l("But if you're wrong, you'll have to pay up! There's no refunds. This is gambling, if you lose you lose!");
+                next;
+                mesn;
+                mesq l("If you're afraid of losing everything, then DEFINITELY do not gamble. %%2");
+                break;
+            case 3:
+                mesn;
+                mesq l("I dunno. I don't think they're sold anywhere.");
+                next;
+                mesn;
+                mesq l("I know a few bandits stole a few, and Lava Slimes love to eat Casino Coins.");
+                next;
+                mesn;
+                mesq l("I've even heard of people whom dug Casino Coins out of the ground, but as I said, I don't know. But you'll certainly come across a few o your adventures!");
+                break;
+        }
+    } while (@menu != 4);
+    close;
+
+L_Trade:
+    openshop;
+    closedialog;
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 5;
+	tradertype(NST_CUSTOM);
+
+    sellitem MercBoxA, 940;
+    sellitem JeansShorts, 820;
+	sellitem ElixirOfLife, 150;
+    sellitem PoisonArrow, 30;
+    sellitem StrangeCoin, 5;
+    end;
+
+OnCountFunds:
+	setcurrency(countitem(CasinoCoins));
+	end;
+
+OnPayFunds:
+	if( countitem(CasinoCoins) < @price )
+		end;
+	delitem CasinoCoins,@price;
+	purchaseok();
+	end;
+}
+
diff --git a/npc/003-9/recepcionist.txt b/npc/003-9/recepcionist.txt
new file mode 100644
index 000000000..cda685472
--- /dev/null
+++ b/npc/003-9/recepcionist.txt
@@ -0,0 +1,17 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Tulimshar Inn Recepcionist
+
+003-9,62,128,0	script	Recepcionist#TInn	NPC_LOF_BARKEEPER,{
+    npctalk3 l("Hello, and welcome to Tulimshar Inn.");
+    emote E_HAPPY;
+    close;
+
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 5;
+    end;
+}
+
diff --git a/npc/003-9/scripted.txt b/npc/003-9/scripted.txt
new file mode 100644
index 000000000..3e5f6f970
--- /dev/null
+++ b/npc/003-9/scripted.txt
@@ -0,0 +1,16 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Scripted functions (Lua)
+
+003-9,58,121,0	script	#TInnClockPassage	NPC_NO_SPRITE,{
+    dispbottom l("If I only could find another way in...");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 3;
+    end;
+}
+
diff --git a/npc/_import.txt b/npc/_import.txt
index e28a6a0fb..738391d3b 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -40,6 +40,8 @@
 @include "npc/003-6/_import.txt"
 @include "npc/003-7/_import.txt"
 @include "npc/003-8/_import.txt"
+@include "npc/003-9-1/_import.txt"
+@include "npc/003-9/_import.txt"
 @include "npc/004-1/_import.txt"
 @include "npc/004-2-1/_import.txt"
 @include "npc/004-2/_import.txt"