summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-11-27 16:55:10 -0300
committerJesusaves <cpntb1@ymail.com>2021-11-27 16:55:10 -0300
commitbaf463293f0211b9d62a0574673a32298ae6033c (patch)
tree9bbcdb3602de8301c1e772376eefb368ca6f5f7b /npc
parent016f9537143114df5e58874f1abe493efcc15d84 (diff)
downloadserverdata-baf463293f0211b9d62a0574673a32298ae6033c.tar.gz
serverdata-baf463293f0211b9d62a0574673a32298ae6033c.tar.bz2
serverdata-baf463293f0211b9d62a0574673a32298ae6033c.tar.xz
serverdata-baf463293f0211b9d62a0574673a32298ae6033c.zip
I forgot a couple lines for Livio
Diffstat (limited to 'npc')
-rw-r--r--npc/080-3/cutscene.txt20
-rw-r--r--npc/081-3/logic.txt1
-rw-r--r--npc/annuals/xmas/2021.txt6
3 files changed, 17 insertions, 10 deletions
diff --git a/npc/080-3/cutscene.txt b/npc/080-3/cutscene.txt
index 926b2ee4..298dc6cd 100644
--- a/npc/080-3/cutscene.txt
+++ b/npc/080-3/cutscene.txt
@@ -200,17 +200,21 @@ function rushed {
}
function ending {
- // FIXME: Final Cutscene
- end;
-
mesn;
mesq l("What happened to Gorrik...?");
next;
- select
- l("[Tell her the truth]"),
- l("[Tell her the truth]");
- mes "";
- // Prize?
+ mesc l("While you do not know the details, you still try to explain the situation to Alissa.");
+ mesc l("How Gak became an undead, how long he sought for her, until finally, when he had almost given hope... How Santa decided to intervene.");
+ next;
+ mesc l("After hearing your history, you could not tell if Alissa was glad or sad.");
+ next;
+ mesn;
+ mesq l("...I'll follow.");
+ next;
+ mesn;
+ mesq l("Bring me to him.");
+ // (Poor Gak, he is up to an earful once player completes this quest...)
+ // FIXME: Prize?
.stable += 1;
X21ED1_DOCLEAR();
disablenpc .name$;
diff --git a/npc/081-3/logic.txt b/npc/081-3/logic.txt
index 5e360183..ce8f1022 100644
--- a/npc/081-3/logic.txt
+++ b/npc/081-3/logic.txt
@@ -3,6 +3,7 @@
// Jesusalva
// Notes:
// Christmas 2021 - Boss Chamber #1
+// FIXME: What if players *fail* this? e.g. die
081-3,44,36,0 script Pentagram#Xmas21A NPC424,{
.@id = X21ID();
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt
index 192ce8a0..eed17da9 100644
--- a/npc/annuals/xmas/2021.txt
+++ b/npc/annuals/xmas/2021.txt
@@ -41,10 +41,12 @@ function script X21INIT {
.@mapa$ = "0812@"+X21ID2(); // Northern Lights
.@mapb$ = "0813@"+X21ID2(); // Existential Frontier
.@mapc$ = "0803@"+X21ID2(); // Forgotten/Mystic/Peaceful Glade
+ .@mapd$ = "0801@"+X21ID2(); // Peaceful Glade (Present)
instance_attachmap("081-2", .@inst, false, .@mapa$);
- instance_attachmap("081-3", .@inst, false, "0813@"+X21ID2());
- instance_attachmap("080-3", .@inst, false, "0803@"+X21ID2());
+ instance_attachmap("081-3", .@inst, false, .@mapb$);
+ instance_attachmap("080-3", .@inst, false, .@mapc$);
+ instance_attachmap("080-1", .@inst, false, .@mapd$);
instance_set_timeout(1800, 1800, .@inst);
instance_init(.@inst);