diff options
| -rw-r--r-- | npc/080-3/cutscene.txt | 5 | ||||
| -rw-r--r-- | npc/annuals/xmas/2021.txt | 29 |
2 files changed, 27 insertions, 7 deletions
diff --git a/npc/080-3/cutscene.txt b/npc/080-3/cutscene.txt index 298dc6cd..3d8d2832 100644 --- a/npc/080-3/cutscene.txt +++ b/npc/080-3/cutscene.txt @@ -3,6 +3,8 @@ // Jesusalva // Notes: // Christmas 2021 - Peaceful Glade +// FIXME: Santa must tell about Gak acting "out of character" by getting the +// Mask of Blinking Evil. Otherwise, it'll be a seriously loose end. 080-3,83,155,0 script #0803exit NPC_HIDDEN,1,0,{ end; @@ -144,6 +146,9 @@ OnInit: mesq l("...I already showed her that."); close; } + if (!.stable) { + mesc l("I probably should start with something about where she was supposed to be and who she is, and tell her the whole story from that."); + } /* First Cutscene */ switch (@menu) { diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt index eed17da9..0495f0e5 100644 --- a/npc/annuals/xmas/2021.txt +++ b/npc/annuals/xmas/2021.txt @@ -47,20 +47,26 @@ function script X21INIT { 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); + /* Create locks */ + setcells .@mapa$, 103, 211, 107, 212, 1, "X21L1@"+X21ID(); + setcells .@mapa$, 124, 127, 131, 128, 1, "X21L2@"+X21ID(); + setcells .@mapa$, 47, 71, 51, 72, 1, "X21L3@"+X21ID(); + /* Spawn Monsters */ - "#XMAS21Core"::spawn(Grinchboo, 3, .@mapa$); + "#XMAS21Core"::spawn(Grinchboo, 5, .@mapa$); "#XMAS21Core"::spawn(Grinchboo, 3, .@mapc$); /* Northern Lights Dungeon */ - "#XMAS21Core"::spawn(WhiteSlime, 40, .@mapa$); - "#XMAS21Core"::spawn(Archant, 9, .@mapa$); + "#XMAS21Core"::spawn(WhiteSlime, 37, .@mapa$); + "#XMAS21Core"::spawn(Archant, 7, .@mapa$); //"#XMAS21Core"::spawn(BlueSpark, 1, .@mapa$); //? //"#XMAS21Core"::spawn(RedSpark, 1, .@mapa$); //? "#XMAS21Core"::spawn(AzulSlime, 20, .@mapa$); - "#XMAS21Core"::spawn(SantaSlime, 25, .@mapa$); + "#XMAS21Core"::spawn(SantaSlime, 24, .@mapa$); "#XMAS21Core"::spawn(Moggun, 30, .@mapa$); "#XMAS21Core"::spawn(Yeti, 4, .@mapa$); "#XMAS21Core"::spawn(Wisp, 5, .@mapa$); @@ -68,11 +74,11 @@ function script X21INIT { "#XMAS21Core"::spawn(Spectre, 5, .@mapa$); "#XMAS21Core"::spawn(ManaGhost, 14, .@mapa$); "#XMAS21Core"::spawn(IceElement, 3, .@mapa$); - "#XMAS21Core"::spawn(IceSkull, 3, .@mapa$); + "#XMAS21Core"::spawn(IceSkull, 2, .@mapa$); "#XMAS21Core"::spawn(Nutcracker, 6, .@mapa$); - "#XMAS21Core"::spawn(Fluffy, 18, .@mapa$); + "#XMAS21Core"::spawn(Fluffy, 16, .@mapa$); - /* Peaceful/Mystic/Forgotten Glade */ + /* Peaceful/Mystic/Forgotten Glade (Past) */ "#XMAS21Core"::spawn(CrotcherScorpion, 14, .@mapc$); "#XMAS21Core"::spawn(Snail, 22, .@mapc$); "#XMAS21Core"::spawn(Bee, 9, .@mapc$); @@ -82,6 +88,15 @@ function script X21INIT { "#XMAS21Core"::spawn(Hyvern, 6, .@mapc$); "#XMAS21Core"::spawn(WitchGuard, 8, .@mapc$); + /* Peaceful/Mystic/Forgotten Glade (Present) */ + "#XMAS21Core"::spawn(Fluffy, 9, .@mapd$); + "#XMAS21Core"::spawn(Snail, 11, .@mapd$); + "#XMAS21Core"::spawn(Bee, 5, .@mapd$); + "#XMAS21Core"::spawn(Butterfly, 15, .@mapd$); + "#XMAS21Core"::spawn(PinkFlower, 24, .@mapd$); + "#XMAS21Core"::spawn(Pinkie, 18, .@mapd$); + "#XMAS21Core"::spawn(Hyvern, 3, .@mapd$); + } if (instance_id() >= 0) instance_set_timeout(1800, 1800); |