summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-12-28 20:45:32 -0300
committerJesusaves <cpntb1@ymail.com>2020-12-28 20:45:32 -0300
commit0419c5b84ff23c488472efdd2516105e93709c4c (patch)
tree9d802a784b7ccd3b93c61973e27a5ac5c4340f6e /npc
parent0be77d080cb8cbdcb5716efa9674d60f9a668973 (diff)
downloadserverdata-0419c5b84ff23c488472efdd2516105e93709c4c.tar.gz
serverdata-0419c5b84ff23c488472efdd2516105e93709c4c.tar.bz2
serverdata-0419c5b84ff23c488472efdd2516105e93709c4c.tar.xz
serverdata-0419c5b84ff23c488472efdd2516105e93709c4c.zip
Fix bugs regarding invalid warp to Nivalis (breaks several stuff in other towns)
Diffstat (limited to 'npc')
-rw-r--r--npc/commands/event.txt2
-rw-r--r--npc/functions/soul_menhir.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 088e15884..5135fc101 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -538,7 +538,7 @@ OnEffect:
message strcharinfo(0), l("You are now at the Contributor's Cave.");
end;
}
- if ($EVENT$ == "Christmas") {
+ if ($EVENT$ == "Christmas" && BaseLevel >= 20) {
warp "019-4-1", 32, 36;
message strcharinfo(0), l("You are now at the Christmas Workshop.");
end;
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index c498be6ea..c192b5f66 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -20,7 +20,7 @@ function script SoulMenhir {
rif($EVENT$ == "Valentine", l("[Valentine Day] Send soul to the Valentine Highlands!")), L_Valentine,
rif($EVENT$ == "Easter", l("[Easter] Send soul to the Mana Forest!")), L_Easter,
rif($EVENT$ == "Worker", l("[Worker Day] Send soul to the Contributor Cave!")), L_Worker,
- rif($EVENT$ == "Christmas", l("[Christmas] Send soul to the Christmas Workshop!")), L_Xmas, // TODO: In future there'll be an event map
+ rif($EVENT$ == "Christmas" && BaseLevel >= 20, l("[Christmas] Send soul to the Christmas Workshop!")), L_Xmas, // TODO: In future there'll be an event map
l("Leave it alone."), -;
return;