summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/002-3/nard.txt2
-rw-r--r--npc/commands/event.txt11
2 files changed, 10 insertions, 3 deletions
diff --git a/npc/002-3/nard.txt b/npc/002-3/nard.txt
index 0be2810d4..11c675530 100644
--- a/npc/002-3/nard.txt
+++ b/npc/002-3/nard.txt
@@ -210,6 +210,8 @@ L_NotYet:
Zeny = Zeny-.@price;
LOCATION$="Tulim";
getitem TulimMap, 1;
+ if ($EVENT$ == "Event")
+ getitem MercCard_EH, 1;
mesq l("Set sail! We're going to Tulimshar!");
next;
showavatar;
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index b9048508f..30593870e 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -148,6 +148,7 @@ function script GlobalEventMenu {
l("Enable Easter"),
l("Enable Worker's Day"),
l("Enable Thanksgiving"),
+ l("Enable Event Horizon"),
l("Enable Christmas"),
l("Enable Demure's Birthday"),
l("Reset Kill Saulc Event (Monthly)");
@@ -177,19 +178,23 @@ function script GlobalEventMenu {
*/
break;
case 6:
- set $EVENT$, "Thanksgiving";
+ $EVENT$="Thanksgiving";
logmes "Enabled THANKS GIVING event.", LOGMES_ATCOMMAND;
break;
case 7:
+ $EVENT$="Event";
+ logmes "Enabled EVENT (HORIZON) event.", LOGMES_ATCOMMAND;
+ break;
+ case 8:
logmes "Enabled CHRISTMAS event.", LOGMES_ATCOMMAND;
query_sql("DELETE FROM `quest` WHERE `quest_id` = '"+SQuest_Christmas+"'");
sChristmas(); break;
- case 8:
+ case 9:
$EVENT$=any("Demure Birthday", "Blame Saulc");
dispbottom("Maybe in future this increases everyone attack speed? Well, for now,");
dispbottom("This is not actually an event, it just lower prices at Lua GM shop.");
break;
- case 9: DelItemFromEveryPlayer(MurdererCrown); break;
+ case 10: DelItemFromEveryPlayer(MurdererCrown); break;
}
return;