summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-16 23:26:39 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-16 23:26:39 -0300
commit7149c7db7bb9a7b06d0a7b3e32ec3455762a3970 (patch)
treeed6b2efc9053803280c9aed70d98654e08d18f26 /npc
parentcd928385d26a8e3b99543711ec601738c6e50bac (diff)
downloadserverdata-7149c7db7bb9a7b06d0a7b3e32ec3455762a3970.tar.gz
serverdata-7149c7db7bb9a7b06d0a7b3e32ec3455762a3970.tar.bz2
serverdata-7149c7db7bb9a7b06d0a7b3e32ec3455762a3970.tar.xz
serverdata-7149c7db7bb9a7b06d0a7b3e32ec3455762a3970.zip
Fix a typo, notes, preventive quest reset
Diffstat (limited to 'npc')
-rw-r--r--npc/003-1/lieutenantdausen.txt2
-rw-r--r--npc/009-1/guards.txt2
-rw-r--r--npc/012-1/guards.txt2
-rw-r--r--npc/020-1/guards.txt2
-rw-r--r--npc/023-3-1/logic.txt4
-rw-r--r--npc/023-3/logic.txt4
-rw-r--r--npc/024-16/king.txt5
7 files changed, 14 insertions, 7 deletions
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 467c74fb1..6f13aff7b 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -289,7 +289,7 @@ OnGuardDeath:
OnMKSiege:
OnStartSiege:
- kamibroadcast(col("WARNING! WARNING! Monster Army marching towards Tulimshar!!",1));
+ kamibroadcast(col("WARNING! WARNING! Monster Army moving towards Tulimshar!!",1));
do_siege("003-1", "004-1", "TULIM", TP_TULIM, .name$, .siegetime);
initnpctimer;
end;
diff --git a/npc/009-1/guards.txt b/npc/009-1/guards.txt
index 7803e32e4..83c9e0841 100644
--- a/npc/009-1/guards.txt
+++ b/npc/009-1/guards.txt
@@ -61,7 +61,7 @@ L_MKControl:
OnMKSiege:
OnStartSiege:
- kamibroadcast(col("WARNING! WARNING! Monster Army marching towards Halinarzo!!",1));
+ kamibroadcast(col("WARNING! WARNING! Monster Army is moving towards Halinarzo!!",1));
do_siege("009-1", "010-2", "HALIN", TP_TULIM, .name$, .siegetime);
initnpctimer;
end;
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index e0b4f693d..a2c429a10 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -601,7 +601,7 @@ OnInit:
// Begin Siege
OnMKSiege:
OnStartSiege:
- kamibroadcast(col("WARNING! WARNING! Monster Army marching towards Hurnscald!!",1));
+ kamibroadcast(col("WARNING! WARNING! Monster Army is moving towards Hurnscald!!",1));
do_siege("012-1", "014-3", "HURNS", TP_HURNS, .name$, .siegetime);
initnpctimer;
end;
diff --git a/npc/020-1/guards.txt b/npc/020-1/guards.txt
index 2d9d820ff..4211f16a5 100644
--- a/npc/020-1/guards.txt
+++ b/npc/020-1/guards.txt
@@ -33,7 +33,7 @@ L_MKControl:
OnMKSiege:
OnStartSiege:
- kamibroadcast(col("WARNING! WARNING! Monster Army marching towards Nivalis!!",1));
+ kamibroadcast(col("WARNING! WARNING! Monster Army is moving towards Nivalis!!",1));
do_siege("020-1", "019-2", "NIVAL", TP_NIVAL, .name$, .siegetime);
initnpctimer;
end;
diff --git a/npc/023-3-1/logic.txt b/npc/023-3-1/logic.txt
index 1962edfb3..8cf304e45 100644
--- a/npc/023-3-1/logic.txt
+++ b/npc/023-3-1/logic.txt
@@ -17,7 +17,7 @@ OnTouch:
percentheal -100, -100;
return false;
}
- if (.@q == 13) {
+ if (.@q == 15) {
dispbottom lg("I'm not a coward! I must press forward!");
end;
}
@@ -56,7 +56,7 @@ OnTouch:
percentheal -100, -100;
return false;
}
- if (.@q == 13) {
+ if (.@q == 15) {
dispbottom lg("I'm not a coward! I must press forward!");
end;
}
diff --git a/npc/023-3/logic.txt b/npc/023-3/logic.txt
index dc9e439ee..1f523a735 100644
--- a/npc/023-3/logic.txt
+++ b/npc/023-3/logic.txt
@@ -58,7 +58,7 @@ OnTouch:
percentheal -100, -100;
return false;
}
- if (.@q == 13) {
+ if (.@q == 15) {
dispbottom lg("I'm not a coward! I must press forward!");
end;
}
@@ -80,3 +80,5 @@ OnInit:
end;
}
+
+
diff --git a/npc/024-16/king.txt b/npc/024-16/king.txt
index 22ff44c1d..a6f549e6b 100644
--- a/npc/024-16/king.txt
+++ b/npc/024-16/king.txt
@@ -90,6 +90,11 @@ L_Continue:
L_Campaign:
.@q=getq(FrostiaQuest_Homunculus);
+ // Logout/dead/etc. → Destroy the quest state
+ // Meaning you'll have to start over. To prevent logout-cheats.
+ if (.@q)
+ setq FrostiaQuest_Homunculus, 0, 0, 0;
+
// Endtrail
mes "";
mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;