summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-12-07 23:45:46 -0300
committerJesusaves <cpntb1@ymail.com>2021-12-07 23:45:46 -0300
commite28d346c54d72f85e8dfbf6c3447d9a74f39a5af (patch)
treefee9244f5c38fe687e2fbeb2c0a9e0c8634214d1
parent89923e0eb25553cc56fee628a4574b2cbce74d55 (diff)
downloadserverdata-e28d346c54d72f85e8dfbf6c3447d9a74f39a5af.tar.gz
serverdata-e28d346c54d72f85e8dfbf6c3447d9a74f39a5af.tar.bz2
serverdata-e28d346c54d72f85e8dfbf6c3447d9a74f39a5af.tar.xz
serverdata-e28d346c54d72f85e8dfbf6c3447d9a74f39a5af.zip
Alissa and Gak should sit on the bench, not stand over it like idiots.
-rw-r--r--npc/080-1/final.txt8
-rw-r--r--npc/081-1/dungeon.txt1
2 files changed, 9 insertions, 0 deletions
diff --git a/npc/080-1/final.txt b/npc/080-1/final.txt
index 4760e672..28982d61 100644
--- a/npc/080-1/final.txt
+++ b/npc/080-1/final.txt
@@ -26,6 +26,7 @@ OnInstanceInit:
OnInit:
.distance=4;
.speed=125;
+ npcsit;
/* I thought in making a shop here */
/* Valentine Dress, Love Potions, Pinkie Crystal... */
/* Would be confusing and bad, so removed. */
@@ -94,6 +95,8 @@ OnInit:
setnpcdir(.@ali$, 0); // Fail-safe
npctalk l("He sssaid I could tttrade forrr a rare orrr evennn level up if I gave ittt to GM Santa..."), .@gak$;
sleep2(3000);
+ setnpcdir(.@ali$, 0); // Fail-safe
+ npcsit(.@ali$);
npctalk l("But Alissssa isss worth wayyy morrre thannn thattt. You cannn have ittt."), .@gak$;
sleep2(2000);
if (X21TYPE() == IOT_PARTY) {
@@ -123,6 +126,11 @@ OnInit:
sellitem(.prizes[.@i], .prices[.@i]);
}
freeloop(false);
+ npcsit;
+ end;
+
+OnInstanceInit:
+ npcsit;
end;
OnCountFunds:
diff --git a/npc/081-1/dungeon.txt b/npc/081-1/dungeon.txt
index fbc20c60..f99283fa 100644
--- a/npc/081-1/dungeon.txt
+++ b/npc/081-1/dungeon.txt
@@ -138,6 +138,7 @@ function complete {
}
function dowarp {
+ if (!isChristmas21()) end; // Fail-safe
dispbottom l("Santa Helper : Fly awayyy!!");
warp "081-1", 58, 103;
closeclientdialog;