summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/functions/soul_menhir.txt27
1 files changed, 6 insertions, 21 deletions
diff --git a/npc/functions/soul_menhir.txt b/npc/functions/soul_menhir.txt
index 91c670961..0e256f890 100644
--- a/npc/functions/soul_menhir.txt
+++ b/npc/functions/soul_menhir.txt
@@ -13,16 +13,9 @@ function script SoulMenhir {
rif($EVENT$ == "Easter", l("[Easter] Send soul to the Mana Forest!")), L_Easter,
rif($EVENT$ == "Worker", l("[Worker Day] Send soul to the Contributor Cave!")), L_Worker,
rif($EVENT$ == "Christmas", l("[Christmas] Send soul to the Christmas Workshop!")), L_Xmas, // TODO: In future there'll be an event map
- l("Leave it alone."), L_Return;
+ l("Leave it alone."), -;
-//L_Towel:
-// if (TowelLastUsed > (gettimetick(2) - 1800))
-// goto L_DontPanic;
-// TowelLastUsed = gettimetick(2);
-// mes l("[Soul Menhir]");
-// mes "(You touch the mysterious stone. Somehow it feels hard and soft at the same time.)";
-// getitem "HitchhikersTowel", 1;
-// goto L_Return;
+ return;
L_Bind:
if (@map$ == "003-1" && !(TELEPORTERS & TP_TULIM))
@@ -48,8 +41,9 @@ L_Shortversion:
goto L_Save;
L_Save:
- if (@x == 0 && @y == 0)
- goto L_FindPoint;
+ @n = rand2(getarraysize(@Xs));
+ @x = @Xs[@n];
+ @y = @Ys[@n];
goto L_Do_Save;
L_Aeros:
@@ -97,7 +91,7 @@ L_Xmas:
L_DontPanic:
message strcharinfo(0), l("(A strange barrier keeps you from touching the stone at this time.)");
- goto L_Return;
+ return;
L_Do_Save:
if (GSET_SOULMENHIR_MANUAL) {
@@ -110,14 +104,5 @@ L_Do_Save:
// As we have a dialog box open, this function produces an undesirable player talk.
//savepointparticle @map$, @x, @y, NO_INN;
- goto L_Return;
-
-L_FindPoint:
- @n = rand2(getarraysize(@Xs));
- @x = @Xs[@n];
- @y = @Ys[@n];
- goto L_Do_Save;
-
-L_Return:
return;
}