summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/003-1/magic.txt6
-rw-r--r--npc/003-2/lua.txt9
-rw-r--r--npc/003-9/recepcionist.txt2
3 files changed, 11 insertions, 6 deletions
diff --git a/npc/003-1/magic.txt b/npc/003-1/magic.txt
index 499d3a509..61b97c9c8 100644
--- a/npc/003-1/magic.txt
+++ b/npc/003-1/magic.txt
@@ -7,10 +7,15 @@
003-1,34,33,0 script #MagicSchoolGate1 NPC_HIDDEN,0,0,{
end;
OnTouch:
+ // Event Restrictions
if (countitem(Event1HSword)+countitem(Event2HSword)+countitem(EventBow)+countitem(EventWand)+countitem(RentCart)) {
mesc l("You cannot enter here while you have event weapons or a cart."), 1;
close;
}
+ // TODO: Main Quest Instance
+ if (LUA_ASKED_TO_SAVE_PROFESSOR) {
+ dispbottom "Runtime error.";
+ }
/*
if (countitem(JesusalvaGrimorium) <= 0 || MAGIC_LVL < 2) {
slide 36, 39;
@@ -19,6 +24,5 @@ OnTouch:
}
*/
warp "003-0", 48, 51;
- //dispbottom col(l("CONDEMNED: This building has been condemned. The roof may fall. Be careful!"), 1);
end;
}
diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index faf6e5c89..c2210bd7a 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -505,9 +505,6 @@ function luaCheckTask4 {
function luaAssignTask5 {
- mesc l("FIXME: This quest is not yet ready, blame Jesusalva ASAP");
- close;
-
inventoryplace MercBoxAA, 1;
mesn;
@@ -540,7 +537,7 @@ function luaAssignTask5 {
mesn;
mesq l("During night the professor also goes to the Magic Academy, using the hidden north port, on the building to left of the Magic Council...");
if (!is_night())
- mesc l("However, it's also possible they're there already.");
+ mesc l("However, it's also possible they're there already. Be careful for ambushes!");
next;
mesn;
@@ -552,6 +549,7 @@ function luaAssignTask5 {
next;
mesn;
mesq l("Now go! Lives are at stack!");
+ mesc l("NOTE: The Energy Ball explodes and Kills. Very. Well. Make them a priority!"), 1;
next;
getitem MercBoxAA, 1;
@@ -560,6 +558,9 @@ function luaAssignTask5 {
} // Your Report, the plan
function luaTask5 {
+ mesc l("FIXME: This quest is not yet ready, blame Jesusalva ASAP");
+ mes "";
+
msObjective(!LUA_ASKED_TO_SAVE_PROFESSOR, l("* Defeat the Assassin"));
return;
}
diff --git a/npc/003-9/recepcionist.txt b/npc/003-9/recepcionist.txt
index a4efdd6ea..b21cedb15 100644
--- a/npc/003-9/recepcionist.txt
+++ b/npc/003-9/recepcionist.txt
@@ -52,7 +52,7 @@ L_Cutscene:
instance_set_timeout(360, 360, .@inst);
instance_init(.@inst);
warp .@mapn$, 36, 47;
- setpcblock(255, true);
+ setpcblock(255, true); // FIXME: No commands?! Better add a new constant?
addtimer 1000, "#TulimInnStory::OnEvent1";
close;