summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFedja Beader <fedja@protonmail.ch>2024-08-18 19:09:42 +0200
committerFedja Beader <fedja@protonmail.ch>2025-03-06 20:56:30 +0000
commite8f2e580edce3faad8440c00f769e54706142504 (patch)
tree7c02316e3a1bc6bcd837f63ad747cca9b3019d13
parent8d56f1f61ad9aa3f2bed2cf380ca91a6c43ed455 (diff)
downloadserverdata-e8f2e580edce3faad8440c00f769e54706142504.tar.gz
serverdata-e8f2e580edce3faad8440c00f769e54706142504.tar.bz2
serverdata-e8f2e580edce3faad8440c00f769e54706142504.tar.xz
serverdata-e8f2e580edce3faad8440c00f769e54706142504.zip
Fix extra ) and figured out maze map IDs so use those instead of 999999
-rw-r--r--npc/commands/event.txt24
1 files changed, 12 insertions, 12 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 9bf98f8b4..1314d1b76 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -488,53 +488,53 @@ OnEffect:
break;
case MK_SIEGE_HURNS:
array_push(.@choices$, l("Assist %s", "Hurnscald"));
- array_push(.@choices$, "101201"));
+ array_push(.@choices$, "101201");
break;
case MK_SIEGE_NIVAL:
array_push(.@choices$, l("Assist %s", "Nivalis"));
- array_push(.@choices$, "102001"));
+ array_push(.@choices$, "102001");
break;
}
}
if ($@GM_EVENT) {
array_push(.@choices$, l("Participate in Aeros event"));
- array_push(.@choices$, "100101"));
+ array_push(.@choices$, "100101");
}
if ($@FEFE_DELAY > gettimetick(2) && !$@FEFE_CAVE_LEVEL && $@FEFE_CAVE_HERO$ != "" && !$@FEFE_WAVE) {
array_push(.@choices$, l("Assist %s in Candor Battle Cave", $@FEFE_CAVE_HERO$));
- array_push(.@choices$, "100106"));
+ array_push(.@choices$, "100106");
}
if ($EVENT$ == "Valentine") {
array_push(.@choices$, l("Go to Valentine Highlands"));
- array_push(.@choices$, "100111"));
+ array_push(.@choices$, "100111");
}
if ($EVENT$ == "Easter") {
array_push(.@choices$, l("Go to Easter event"));
- array_push(.@choices$, "100104"));
+ array_push(.@choices$, "100104");
}
if ($EVENT$ == "Worker") {
array_push(.@choices$, l("Go to Contributor's Cave"));
- array_push(.@choices$, "100105"));
+ array_push(.@choices$, "100105");
}
if ($EVENT$ == "Christmas" && BaseLevel >= 20) {
array_push(.@choices$, l("Go to the Christmas Workshop"));
- array_push(.@choices$, "10190401"));
+ array_push(.@choices$, "10190401");
}
if ($EVENT$ == "Tower" && countitem(EventDreamTicket)) {
array_push(.@choices$, l("Ascend a dream tower"));
- array_push(.@choices$, "999999")); // What map ID?
+ array_push(.@choices$, "103000"); // the last two digits vary
}
if ($EVENT$ == "Olympics") {
array_push(.@choices$, l("Go to Porthos"));
- array_push(.@choices$, "100114"));
+ array_push(.@choices$, "100114");
}
if ($EVENT$ == "Raid") {
array_push(.@choices$, l("Challenge the raiding boss!"));
- array_push(.@choices$, "100113"));
+ array_push(.@choices$, "100113");
}
if (getarraysize(.@choices$) == 2) {
@@ -601,7 +601,7 @@ OnEffect:
warp "019-4-1", 32, 36;
message strcharinfo(0), l("You are now at the Christmas Workshop.");
break;
- case 999999:
+ case 103000:
doevent "sDreamTower::OnWarpTo";
break;
case 100114: