summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/014-5/sagratha.txt1
-rw-r--r--npc/015-8/config.txt2
-rw-r--r--npc/015-8/sealedshrine.txt16
3 files changed, 10 insertions, 9 deletions
diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt
index fc8220ac7..183c208a7 100644
--- a/npc/014-5/sagratha.txt
+++ b/npc/014-5/sagratha.txt
@@ -145,6 +145,7 @@ L_Open:
close;
L_Welcome:
+ dispbottom l("Mouboos are cute");
warp "014-5-1", 33, 44;
end;
diff --git a/npc/015-8/config.txt b/npc/015-8/config.txt
index 40d6e3b26..a65afe93b 100644
--- a/npc/015-8/config.txt
+++ b/npc/015-8/config.txt
@@ -6,7 +6,7 @@
015-8 mapflag zone MMO
-018-5,99,179,0 script #Exit0158 NPC_HIDDEN,0,0,{
+015-8,99,179,0 script #Exit0158 NPC_HIDDEN,0,0,{
end;
OnTouch:
diff --git a/npc/015-8/sealedshrine.txt b/npc/015-8/sealedshrine.txt
index 97a494f15..b44c82adb 100644
--- a/npc/015-8/sealedshrine.txt
+++ b/npc/015-8/sealedshrine.txt
@@ -32,10 +32,10 @@ function script SaggySealInit {
.@x=getarg(1);
.@y=getarg(2);
.@z=getarg(3);
- .@m$=getarg(4, "018-5");
+ .@m$=getarg(4, "015-8");
// Do nothing if @SaggySeal$ is busy - we will NOT begin another unsealing.
- if (@SaggySeal$ != "" && .@z)
+ if (@SaggySeal$ != "" && !.@z)
end;
else
@SaggySeal$=.@n$;
@@ -157,7 +157,7 @@ function script SaggySealTrueInit {
-018-5,0,0,0 script #SaggySeal1 NPC_SUMMONING_CIRC,0,0,{
+015-8,0,0,0 script #SaggySeal1 NPC_SUMMONING_CIRC,0,0,{
end;
OnTouch:
@@ -243,7 +243,7 @@ OnInit:
-018-5,0,0,0 script #SaggySeal2 NPC_SUMMONING_CIRC,0,0,{
+015-8,0,0,0 script #SaggySeal2 NPC_SUMMONING_CIRC,0,0,{
end;
OnTouch:
@@ -329,7 +329,7 @@ OnInit:
-018-5,0,0,0 script #SaggySeal3 NPC_SUMMONING_CIRC,0,0,{
+015-8,0,0,0 script #SaggySeal3 NPC_SUMMONING_CIRC,0,0,{
end;
OnTouch:
@@ -409,7 +409,7 @@ OnInit:
// Sagratha Seals Eletronic Barriers
-018-5,120,130,0 script #SaggySealBarrier1 NPC_HIDDEN,0,4,{
+015-8,120,130,0 script #SaggySealBarrier1 NPC_HIDDEN,0,4,{
OnTouch:
if (@SaggySeal$ != "") {
npctalk3 l("The seal retaliates! It was super effective. You are dead!");
@@ -420,7 +420,7 @@ OnTouch:
end;
}
-018-5,74,142,0 script #SaggySealBarrier2 NPC_HIDDEN,0,4,{
+015-8,74,142,0 script #SaggySealBarrier2 NPC_HIDDEN,0,4,{
OnTouch:
if (@SaggySeal$ != "") {
npctalk3 l("The seal retaliates! It was super effective. You are dead!");
@@ -431,7 +431,7 @@ OnTouch:
end;
}
-018-5,137,154,0 script #SaggySealBarrier3 NPC_HIDDEN,0,5,{
+015-8,137,154,0 script #SaggySealBarrier3 NPC_HIDDEN,0,5,{
OnTouch:
if (@SaggySeal$ != "") {
npctalk3 l("The seal retaliates! It was super effective. You are dead!");