summaryrefslogtreecommitdiff
path: root/npc/commands/event.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/commands/event.txt')
-rw-r--r--npc/commands/event.txt60
1 files changed, 37 insertions, 23 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index fab032dde..b346b9e41 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -237,17 +237,8 @@ OnCall:
end;
OnCall:
- if (!$@GM_EVENT && $EVENT$ == "Valentine") {
- if (readparam(Hp) == readparam(MaxHp) && readparam(Sp) == readparam(MaxSp) && !(getmapname() == "boss" || getmapname() == "sec_pri" || getmapname() ~= "000-*" || getmapname() ~= "008-*" || getmapname() ~= "sore*")) {
- warp "001-11", 38, 32;
- message strcharinfo(0), l("You are now at the Valentine Highlands.");
- } else {
- dispbottom l("You cannot be hurt, must have full mana, and must be in a area where the Mana Plane is connected so @toevent work.");
- }
- end;
- }
-
- if (!$@GM_EVENT && !$@MK_SCENE)
+ // Calculate
+ if (!$@GM_EVENT && !$@MK_SCENE && $EVENT$ == "")
dispbottom l("The mana bridge is closed at the moment.");
else if (BaseLevel < 10)
dispbottom l("You are not strong enough to survive this trip.");
@@ -272,24 +263,47 @@ OnCall:
end;
}
- if (!$@GM_EVENT)
+ // Aeros Events takes precedence over permanent events
+ if ($@GM_EVENT)
{
- //dispbottom ("SCRIPT ERROR - blame Saulc - gmevent not set, mkscene set");
- dispbottom l("The mana bridge is closed at the moment.");
+ .@gt=$@AEROS_SPWN;
+ if (.@gt == 2)
+ .@gt=rand(0,1);
+ switch (.@gt) {
+ case 0:
+ warp "001-1", 235, 26; break;
+ case 1:
+ warp "001-1", 23, 108; break;
+ }
+ specialeffect(63, AREA, getcharid(3));
end;
}
- .@gt=$@AEROS_SPWN;
- if (.@gt == 2)
- .@gt=rand(0,1);
- switch (.@gt) {
- case 0:
- warp "001-1", 235, 26; break;
- case 1:
- warp "001-1", 23, 108; break;
+ // Events are the least priority
+ if ($EVENT$ == "Valentine") {
+ warp "001-11", 38, 32;
+ message strcharinfo(0), l("You are now at the Valentine Highlands.");
+ end;
+ }
+ if ($EVENT$ == "Easter") {
+ warp "001-4", 151, 157;
+ message strcharinfo(0), l("You are now at the Magical Forest.");
+ end;
+ }
+ if ($EVENT$ == "Worker Day") {
+ warp "001-5", 22, 79;
+ message strcharinfo(0), l("You are now at the Contributor's Cave.");
+ end;
+ }
+ if ($EVENT$ == "Christmas") {
+ warp "019-4-1", 32, 36;
+ message strcharinfo(0), l("You are now at the Christmas Workshop.");
+ end;
}
- specialeffect(63, AREA, getcharid(3));
}
+
+ // Seems like it was a Blame Saulc-like event...
+ dispbottom l("The mana bridge is closed at the moment.");
end;
OnInit: