summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/003-2/lua.txt26
1 files changed, 13 insertions, 13 deletions
diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index a7e6824c0..c7b407c8d 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -272,7 +272,7 @@ L_Task:
.@q2=getq2(General_Narrator);
}
- mesc b(l(".:: Main Quest 2-%d ::.", .@q2)), 3;
+ mesc b(l(".:: Main Quest 2-%d ::.", (.@q2+1)/2)), 3;
if (.@q2 == 1) {
luaTask1();
next;
@@ -309,21 +309,11 @@ L_Task:
goto L_Finish;
}
}
+ Exception("Something went wrong, this is not a valid MQ2 state: "+.@q2);
+ close;
- next;
- /* TODO: Checks
- if (BaseLevel >= 20 &&
- JobLevel >= 6 &&
- Zeny >= 1000 &&
- (CRAFTQUEST || MPQUEST) &&
- countitem(TulimsharGuardCard) &&
- countitem(FishingRod))
- goto L_Finish;
- */
- close;
-
// Declare functions
@@ -367,6 +357,8 @@ function luaCheckTask1 {
+
+
function luaAssignTask2 {
next;
return;
@@ -389,6 +381,8 @@ function luaCheckTask2 {
+
+
function luaAssignTask3 {
next;
return;
@@ -414,6 +408,8 @@ function luaCheckTask3 {
+
+
function luaAssignTask4 {
next;
return;
@@ -435,6 +431,8 @@ function luaCheckTask4 {
+
+
function luaAssignTask5 {
next;
return;
@@ -456,6 +454,8 @@ function luaCheckTask5 {
+
+
// Then we jump to L_Complete
// When you finish the last quest from Lua
L_Finish: