summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-02-26 03:39:04 -0300
committerJesusaves <cpntb1@ymail.com>2020-02-26 03:39:04 -0300
commit6569f451c9c75817825c86cd3b670b0b08f96b60 (patch)
tree8633d59d80f8044b81c3b4ac4f264a002c8f996e /npc
parent6fdbb9c2bb8657ed641a06bc037dc54c5a302d03 (diff)
downloadserverdata-6569f451c9c75817825c86cd3b670b0b08f96b60.tar.gz
serverdata-6569f451c9c75817825c86cd3b670b0b08f96b60.tar.bz2
serverdata-6569f451c9c75817825c86cd3b670b0b08f96b60.tar.xz
serverdata-6569f451c9c75817825c86cd3b670b0b08f96b60.zip
Fix bugs, add placeholders
Diffstat (limited to 'npc')
-rw-r--r--npc/003-0/_import.txt1
-rw-r--r--npc/003-0/mainquest.txt21
-rw-r--r--npc/003-1/magic.txt34
-rw-r--r--npc/003-2/lua.txt2
4 files changed, 25 insertions, 33 deletions
diff --git a/npc/003-0/_import.txt b/npc/003-0/_import.txt
index c9fea03ef..d7fe2f96f 100644
--- a/npc/003-0/_import.txt
+++ b/npc/003-0/_import.txt
@@ -2,5 +2,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/003-0/_mobs.txt",
"npc/003-0/_warps.txt",
+"npc/003-0/mainquest.txt",
"npc/003-0/recepcionist.txt",
"npc/003-0/trickmaster.txt",
diff --git a/npc/003-0/mainquest.txt b/npc/003-0/mainquest.txt
new file mode 100644
index 000000000..a145d111a
--- /dev/null
+++ b/npc/003-0/mainquest.txt
@@ -0,0 +1,21 @@
+// TMW2 scripts.
+// Authors:
+// Jesusalva
+// Description:
+// Main Quest
+
+003-0,49,35,0 script #MQ25Trigger NPC_HIDDEN,3,0,{
+ end;
+
+OnTouch:
+ .@m$=getmap();
+ .@n$=instance_npcname(.name$);
+ .@ni=is_night();
+ dispbottom col(l("SCRIPT ERROR (%s/%s)", .@m$, .@n$), 1);
+ end;
+
+OnInit:
+ disablenpc .name$;
+ end;
+}
+
diff --git a/npc/003-1/magic.txt b/npc/003-1/magic.txt
index 9fe18037b..fada53a37 100644
--- a/npc/003-1/magic.txt
+++ b/npc/003-1/magic.txt
@@ -12,7 +12,7 @@ OnTouch:
mesc l("You cannot enter here while you have event weapons or a cart."), 1;
close;
}
- // TODO: Main Quest Event Control
+ // Main Quest Event
if (LUA_ASKED_TO_SAVE_PROFESSOR) {
.@mapn$="0030@"+getcharid(0);
// Instance doesn't exists
@@ -38,35 +38,3 @@ OnTouch:
end;
}
-function script SaggyInstCheck {
- .@house=getarg(0, true);
-
- .@q2=getq2(HurnscaldQuest_Sagratha);
- // Map name limit: 4 chars (sgt1)
- .@mapn$="sgt1@"+getcharid(0);
- .@map2$="sgt2@"+getcharid(0);
- if (!(isinstance(.@q2) && .@q2 != 0)) {
- .@inst = instance_create("Sagratha House "+getcharid(0), getcharid(3), IOT_CHAR);
- instance_attachmap("014-5-1", .@inst, false, .@mapn$);
- //instance_attachmap("015-8", .@inst, false, .@mapn$);
- instance_attachmap("015-8-1", .@inst, false, .@map2$);
- // Instance lasts one hour
- instance_set_timeout(3600, 3600, .@inst);
- instance_init(.@inst);
- setq2 HurnscaldQuest_Sagratha, .@inst;
- }
-
- // It broke
- if (getmapinfo(MAPINFO_SIZE_X, .@mapn$) <= 0) {
- setq2 HurnscaldQuest_Sagratha, 0;
- // Infinite Loop?
- return callfunc("SaggyInstCheck", .@house);
- }
-
- if (.@house) {
- return .@mapn$;
- } else {
- return .@map2$;
- }
-}
-
diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index c2210bd7a..77208ca65 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -562,6 +562,8 @@ function luaTask5 {
mes "";
msObjective(!LUA_ASKED_TO_SAVE_PROFESSOR, l("* Defeat the Assassin"));
+ mes "";
+ mesc l("NOTE: The Energy Ball explodes and Kills. Very. Well. Make them a priority!");
return;
}