After some live testing, Inn Cutscene is complete :3

3 files changed, 45 insertions, 23 deletions

diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index 0887c0d5a..2e034b06c 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -309,7 +309,9 @@ L_Task:
             goto L_Finish;
         }
     }
-    Exception("Something went wrong, this is not a valid MQ2 state: "+.@q2);
+    //Exception("Something went wrong, this is not a valid MQ2 state: "+.@q2);
+    mesn;
+    mesq l("Safe travels!");
     close;
 
 
@@ -379,7 +381,7 @@ function luaAssignTask2 {
     next;
     mesn;
     mes l("%s is by becoming a %s.", b(l("The first job,")), b(l("Fisherman/Fisherwoman")));
-    mes l("Food is, and should always will be, in demand.");
+    mes l("Food is, and should always be, in demand.");
     // If you skipped Tutorial: You already know all this
     tutmes l("Fishing is a boring task. Throw the bait, wait for fish to bite. Pull before it is too late. Then sell the fish for money."), l("Fishing");
     next;
diff --git a/npc/003-9/recepcionist.txt b/npc/003-9/recepcionist.txt
index 69b0ad890..a4efdd6ea 100644
--- a/npc/003-9/recepcionist.txt
+++ b/npc/003-9/recepcionist.txt
@@ -37,15 +37,21 @@
     close;
 
 L_Cutscene:
-    mesc l("continues"), 1;
-    close;
+    mesn strcharinfo(0);
+    mesq l("Hello, Lua told me she booked a room for me.");
+    next;
+    mesn;
+    mesq l("Ah, so you must be %s, the new guy! Yes, it is on the rooms upstairs. I'll bring you there, don't you worry a thing!", strcharinfo(0));
+    tutmes l("During cutscenes, you cannot move. If you do, you'll be forcibly pushed back."), l("Cutscenes");
+    next;
+    closeclientdialog;
 	.@mapn$="tinn@"+getcharid(0);
 	.@inst = instance_create("Tulim Inn "+getcharid(0), getcharid(3), IOT_CHAR);
     instance_attachmap("003-9", .@inst, false, .@mapn$);
     // Instance lasts 6 minutes
 	instance_set_timeout(360, 360, .@inst);
 	instance_init(.@inst);
-    warp .@man$, 36, 47;
+    warp .@mapn$, 36, 47;
     setpcblock(255, true);
     addtimer 1000, "#TulimInnStory::OnEvent1";
     close;
diff --git a/npc/003-9/scripted.txt b/npc/003-9/scripted.txt
index cad87af4f..752775c93 100644
--- a/npc/003-9/scripted.txt
+++ b/npc/003-9/scripted.txt
@@ -27,43 +27,45 @@ OnEvent1:
 
 OnEvent2:
 	.@mapn$="tinn@"+getcharid(0);
-    setunitdata(@tinn_assa, UDT_SPEED, 200); // So they walk at same pace
+    setunitdata(@tinn_boss, UDT_SPEED, 190); // So they walk at same pace
+    setunitdata(@tinn_assa, UDT_SPEED, 190); // So they walk at same pace
     unitwalk(@tinn_assa, 40, 48);
     addtimer 1860, .name$+"::OnEvent3"; // Roughly 9/11 tiles time
     end;
 
 OnEvent3:
 	.@mapn$="tinn@"+getcharid(0);
-    unitwarp(@tinn_boss, .@mapn$, 40, 47);
-    sc_start(SC_STUN, 13940, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, @tinn_boss);
+    //unitwarp(@tinn_boss, .@mapn$, 40, 47);
+    sc_start(SC_STUN, 17240, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, @tinn_boss);
     unittalk(@tinn_boss, l("*hurry up, your moron!*"));
     addtimer 440, .name$+"::OnEvent4"; // Roughly 2/11 tiles time
     end;
 
 OnEvent4:
 	.@mapn$="tinn@"+getcharid(0);
-    unitwarp(@tinn_assa, .@mapn$, 40, 48);
-    sc_start(SC_STUN, 1000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, @tinn_assa);
+    //unitwarp(@tinn_assa, .@mapn$, 40, 48);
+    sc_start(SC_STUN, 22000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, @tinn_assa);
     unittalk(@tinn_assa, l("*sorry, boss!*"));
-    addtimer 1000, .name$+"::OnEvent5";
+    //atcommand("@refresh"); // Can't use @commands at block 255
+    addtimer 2000, .name$+"::OnEvent5";
     end;
 
 OnEvent5:
 	.@mapn$="tinn@"+getcharid(0);
     unittalk(@tinn_boss, l("*is everything ready?*"));
-    addtimer 1500, .name$+"::OnEvent6";
+    addtimer 2000, .name$+"::OnEvent6";
     end;
 
 OnEvent6:
 	.@mapn$="tinn@"+getcharid(0);
     unittalk(@tinn_assa, l("*Yes, boss!*"));
-    addtimer 1300, .name$+"::OnEvent7";
+    addtimer 1500, .name$+"::OnEvent7";
     end;
 
 OnEvent7:
 	.@mapn$="tinn@"+getcharid(0);
     unittalk(@tinn_boss, l("*Don't shout, you moron!*"));
-    addtimer 1400, .name$+"::OnEvent8";
+    addtimer 2000, .name$+"::OnEvent8";
     end;
 
 OnEvent8:
@@ -82,15 +84,17 @@ OnEvent10:
 	.@mapn$="tinn@"+getcharid(0);
     @tinn_ball=monster(.@mapn$, 41, 47, l("Energy Ball"), EnergyBall, 1);
     @tinn_ba11=monster(.@mapn$, 41, 48, l("Energy Ball"), EnergyBall, 1);
-    sc_start(SC_STUN, 1000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, @tinn_ball);
-    sc_start(SC_STUN, 1000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, @tinn_ba11);
+    sc_start(SC_STUN, 11500, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, @tinn_ball);
+    sc_start(SC_STUN, 11500, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, @tinn_ba11);
+    setunitdata(@tinn_ball, UDT_SPEED, 200); // So they walk at same pace
+    setunitdata(@tinn_ba11, UDT_SPEED, 200); // So they walk at same pace
     addtimer 2000, .name$+"::OnEvent11";
     end;
 
 OnEvent11:
 	.@mapn$="tinn@"+getcharid(0);
     unittalk(@tinn_boss, l("*Don't fail me. If you do, ensure you're well past dead before.*"));
-    addtimer 1800, .name$+"::OnEvent12";
+    addtimer 2800, .name$+"::OnEvent12";
     end;
 
 OnEvent12:
@@ -122,29 +126,39 @@ OnEvent15:
 OnEvent16:
 	.@mapn$="tinn@"+getcharid(0);
     unittalk(@tinn_assa, l("*The Professor will never know what got him...*"));
-    addtimer 800, .name$+"::OnEvent17";
+    addtimer 2000, .name$+"::OnEvent17";
     end;
 
 OnEvent17:
 	.@mapn$="tinn@"+getcharid(0);
     unittalk(@tinn_assa, l("*hehehe...*"));
     unitwalk(@tinn_assa, 47, 56);
-    addtimer 2200, .name$+"::OnEvent18";
+    addtimer 200, .name$+"::OnEvent18";
     end;
 
 OnEvent18:
+    unitwalk(@tinn_ball, 47, 56);
+    unitwalk(@tinn_ba11, 48, 56);
+    addtimer 2000, .name$+"::OnEvent19";
+    end;
+
+OnEvent19:
 	.@mapn$="tinn@"+getcharid(0);
     unitwarp(@tinn_assa, "boss", 22, 22);
+    unitwarp(@tinn_ball, "boss", 22, 22);
+    unitwarp(@tinn_ba11, "boss", 22, 22);
     unitkill(@tinn_assa);
-    addtimer 200, .name$+"::OnEvent19";
+    unitkill(@tinn_ball);
+    unitkill(@tinn_ba11);
+    addtimer 200, .name$+"::OnEvent20";
     end;
 
-OnEvent19:
+OnEvent20:
     dispbottom l("*are they gone...?*");
-    addtimer 200, .name$+"::OnEvent20";
+    addtimer 1000, .name$+"::OnEvent21";
     end;
 
-OnEvent20:
+OnEvent21:
     setpcblock(255, false);
     dispbottom l("I better report this to Lua!");
     LUA_ASKED_TO_SLEEP=false;