diff options
author | Jesusaves <cpntb1@ymail.com> | 2021-11-23 11:36:49 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2021-11-23 11:36:49 -0300 |
commit | 5dd6d5d5a37ef893e56f3b632dad3d0b92f4b0f0 (patch) | |
tree | 1287f522c51557a568a2e383a391ad01da25998e | |
parent | d40e9205d28d96061f8fa91d619805aa66c7e173 (diff) | |
download | serverdata-5dd6d5d5a37ef893e56f3b632dad3d0b92f4b0f0.tar.gz serverdata-5dd6d5d5a37ef893e56f3b632dad3d0b92f4b0f0.tar.bz2 serverdata-5dd6d5d5a37ef893e56f3b632dad3d0b92f4b0f0.tar.xz serverdata-5dd6d5d5a37ef893e56f3b632dad3d0b92f4b0f0.zip |
Instance the first glade, and also try to renew instances automatically
-rw-r--r-- | npc/080-3/cutscene.txt | 1 | ||||
-rw-r--r-- | npc/081-3/logic.txt | 7 | ||||
-rw-r--r-- | npc/annuals/xmas/2021.txt | 9 |
3 files changed, 11 insertions, 6 deletions
diff --git a/npc/080-3/cutscene.txt b/npc/080-3/cutscene.txt index e290c0d3..189b4881 100644 --- a/npc/080-3/cutscene.txt +++ b/npc/080-3/cutscene.txt @@ -18,4 +18,5 @@ OnTouch: end; } +// FIXME: Alissa's ED Cutscene diff --git a/npc/081-3/logic.txt b/npc/081-3/logic.txt index 427a36ef..c2d19bd8 100644 --- a/npc/081-3/logic.txt +++ b/npc/081-3/logic.txt @@ -170,8 +170,11 @@ OnTouch: l("[Run away]"); mes ""; if (@menu == 1) { - // FIXME: Alissa's ED Cutscene - warp "080-3", 83, 154; + /* We need to determine if instance exists and is needed */ + X21INIT(); + + .@mapn$="0803@"+X21ID2(); + warp .@mapn$, 44, 49; } // NOTE: Right now, anyone can do so? else if (@menu == 3) { diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt index 268394cb..8a24652f 100644 --- a/npc/annuals/xmas/2021.txt +++ b/npc/annuals/xmas/2021.txt @@ -29,14 +29,15 @@ function script X21INIT { .@inst = instance_create("Northen Lights", X21ID(), X21TYPE()); // Instance must be created if (.@inst >= 0) { - .@mapa$="0812@"+X21ID2(); - .@mapn$="0813@"+X21ID2(); // We... Could use base name, actually, but whatever - instance_attachmap("081-2", .@inst, false, .@mapa$); - instance_attachmap("081-3", .@inst, false, .@mapn$); + instance_attachmap("081-2", .@inst, false, "0812@"+X21ID2()); + instance_attachmap("081-3", .@inst, false, "0813@"+X21ID2()); + instance_attachmap("080-3", .@inst, false, "0803@"+X21ID2()); instance_set_timeout(1800, 1800, .@inst); instance_init(.@inst); } + if (instance_id() >= 0) + instance_set_timeout(1800, 1800); return; } |