summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2023-07-19 13:29:18 -0300
committerJesusaves <cpntb1@ymail.com>2023-07-19 13:29:18 -0300
commit98fc4f7f619e4f45b88e1b3cef96d3f639ad2d06 (patch)
tree83b2c1808972c943debee018903023b90a25fe21
parent95abdf7166c49d147641e16acfe0e7ef9eb2fad4 (diff)
downloadserverdata-98fc4f7f619e4f45b88e1b3cef96d3f639ad2d06.tar.gz
serverdata-98fc4f7f619e4f45b88e1b3cef96d3f639ad2d06.tar.bz2
serverdata-98fc4f7f619e4f45b88e1b3cef96d3f639ad2d06.tar.xz
serverdata-98fc4f7f619e4f45b88e1b3cef96d3f639ad2d06.zip
Fixes and hard fixes
-rw-r--r--npc/006-10/logic.txt2
-rw-r--r--npc/033-1/misc.txt10
-rw-r--r--npc/functions/vault.txt6
3 files changed, 14 insertions, 4 deletions
diff --git a/npc/006-10/logic.txt b/npc/006-10/logic.txt
index f662b2d..7241d82 100644
--- a/npc/006-10/logic.txt
+++ b/npc/006-10/logic.txt
@@ -88,7 +88,7 @@ OnRw:
##01_CRQUEST = ##01_CRQUEST | MLP_CR_DEBUT;
specialeffect(FX_FANFARE, AREA, getcharid(3));
sleep2(15000);
- $@EVENT_08 = PORTHOS_UNUSED;
+ $@EVENT_08 = PORTHOS_ACTIVE;
warp("033-1", 72, 191);
end;
diff --git a/npc/033-1/misc.txt b/npc/033-1/misc.txt
index 360fffd..e76fc12 100644
--- a/npc/033-1/misc.txt
+++ b/npc/033-1/misc.txt
@@ -184,6 +184,16 @@ OnTouch:
dispbottom l("This portal is not currently active.");
end;
}
+ // This event is special
+ if (is_admin() || is_master()) {
+ mesc "Disable event?", 1;
+ next;
+ if (askyesno() == ASK_YES) {
+ $@EVENT_08 = PORTHOS_UNUSED;
+ close;
+ }
+ closeclientdialog;
+ }
warp $@EVENT_08_M$, $@EVENT_08_X, $@EVENT_08_Y;
end;
}
diff --git a/npc/functions/vault.txt b/npc/functions/vault.txt
index 81e9912..1bfa219 100644
--- a/npc/functions/vault.txt
+++ b/npc/functions/vault.txt
@@ -48,11 +48,11 @@ function script MirrorLakeSendTo {
closeclientdialog;
dispbottom l("Darkness fills your vision...");
export_vault();
- sleep2(500);
+ sleep2(800);
specialeffect FX_CIRCLE, SELF, getcharid(3);
- sleep2(500);
+ sleep2(1000);
specialeffect FX_MGSHIELD, SELF, getcharid(3);
- sleep2(500);
+ sleep2(1200);
kick(getcharid(3), 7); // 7 is not a valid kick reason
//atcommand("@kick "+strcharinfo(0));
end;