summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-01 19:52:31 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-01 19:52:31 -0300
commit3e3704730a574e34bfcfe700a3b9884bc9e07d99 (patch)
treedd9fe3834c307e1d2121d5fb2f0ee239fb3de7a4
parent2604ed34371f2cda40c2e628dcca8883018ced91 (diff)
downloadserverdata-3e3704730a574e34bfcfe700a3b9884bc9e07d99.tar.gz
serverdata-3e3704730a574e34bfcfe700a3b9884bc9e07d99.tar.bz2
serverdata-3e3704730a574e34bfcfe700a3b9884bc9e07d99.tar.xz
serverdata-3e3704730a574e34bfcfe700a3b9884bc9e07d99.zip
Revert "Move 015-8 to an instance (what)"
This reverts commit 2604ed34371f2cda40c2e628dcca8883018ced91. Sure, an instance is better. But it won't work because _mobs
-rw-r--r--npc/014-5-1/objects.txt3
-rw-r--r--npc/014-5/sagratha.txt8
-rw-r--r--npc/015-8/sealedshrine.txt60
3 files changed, 35 insertions, 36 deletions
diff --git a/npc/014-5-1/objects.txt b/npc/014-5-1/objects.txt
index 72dae0794..ed3520924 100644
--- a/npc/014-5-1/objects.txt
+++ b/npc/014-5-1/objects.txt
@@ -32,8 +32,7 @@ OnInit:
mesc l("Enter though the window to the secret caves?");
next;
if (askyesno() == ASK_YES) {
- .@mapn$="sgt2@"+getcharid(0);
- warp .@mapn$, 99, 178;
+ warp "015-8", 99, 178;
closeclientdialog;
end;
}
diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt
index 59b6e37da..17810cba9 100644
--- a/npc/014-5/sagratha.txt
+++ b/npc/014-5/sagratha.txt
@@ -132,10 +132,10 @@ L_Open:
} else {
.@inst = instance_create("Sagratha House "+getcharid(0), getcharid(3), IOT_CHAR);
instance_attachmap("014-5-1", .@inst, false, .@mapn$);
- instance_attachmap("015-8", .@inst, false, "sgt2@"+getcharid(0));
- //instance_attachmap("015-8-1", .@inst, false, "sgt3@"+getcharid(0));
- // 40 minutes (2400s) inside, or 5 minutes (300s) outside
- instance_set_timeout(2400, 300, .@inst);
+ //instance_attachmap("015-8", .@inst, false, .@mapn$);
+ //instance_attachmap("015-8-1", .@inst, false, .@mapn$);
+ // 20 minutes (1200s) inside, or 5 minutes (300s) outside
+ instance_set_timeout(1200, 30, .@inst);
instance_init(.@inst);
setq2 HurnscaldQuest_Sagratha, .@inst;
warp .@mapn$, 33, 44;
diff --git a/npc/015-8/sealedshrine.txt b/npc/015-8/sealedshrine.txt
index 038d854be..571030dd1 100644
--- a/npc/015-8/sealedshrine.txt
+++ b/npc/015-8/sealedshrine.txt
@@ -168,43 +168,43 @@ OnTouch:
}
// It is stage 3, so we will write to setq3 that the seal is open... Soon.
- SaggySealInit(.name$, .x, .y, 0, getmap());
+ SaggySealInit(.name$, .x, .y, 0);
end;
OnBreakSeal01:
- SaggySealInit(.name$, .x, .y, 1, getmap());
+ SaggySealInit(.name$, .x, .y, 1);
end;
OnBreakSeal02:
- SaggySealInit(.name$, .x, .y, 2, getmap());
+ SaggySealInit(.name$, .x, .y, 2);
end;
OnBreakSeal03:
- SaggySealInit(.name$, .x, .y, 3, getmap());
+ SaggySealInit(.name$, .x, .y, 3);
end;
OnBreakSeal04:
- SaggySealInit(.name$, .x, .y, 4, getmap());
+ SaggySealInit(.name$, .x, .y, 4);
end;
OnBreakSeal05:
- SaggySealInit(.name$, .x, .y, 5, getmap());
+ SaggySealInit(.name$, .x, .y, 5);
end;
OnBreakSeal06:
- SaggySealInit(.name$, .x, .y, 6, getmap());
+ SaggySealInit(.name$, .x, .y, 6);
end;
OnBreakSeal07:
- SaggySealInit(.name$, .x, .y, 7, getmap());
+ SaggySealInit(.name$, .x, .y, 7);
end;
OnBreakSeal08:
- SaggySealInit(.name$, .x, .y, 8, getmap());
+ SaggySealInit(.name$, .x, .y, 8);
end;
OnBreakSeal09:
- SaggySealInit(.name$, .x, .y, 9, getmap());
+ SaggySealInit(.name$, .x, .y, 9);
end;
OnBreakSeal10:
@@ -254,43 +254,43 @@ OnTouch:
}
// It is stage 3, so we will write to setq3 that the seal is open... Soon.
- SaggySealInit(.name$, .x, .y, 0, getmap());
+ SaggySealInit(.name$, .x, .y, 0);
end;
OnBreakSeal01:
- SaggySealInit(.name$, .x, .y, 1, getmap());
+ SaggySealInit(.name$, .x, .y, 1);
end;
OnBreakSeal02:
- SaggySealInit(.name$, .x, .y, 2, getmap());
+ SaggySealInit(.name$, .x, .y, 2);
end;
OnBreakSeal03:
- SaggySealInit(.name$, .x, .y, 3, getmap());
+ SaggySealInit(.name$, .x, .y, 3);
end;
OnBreakSeal04:
- SaggySealInit(.name$, .x, .y, 4, getmap());
+ SaggySealInit(.name$, .x, .y, 4);
end;
OnBreakSeal05:
- SaggySealInit(.name$, .x, .y, 5, getmap());
+ SaggySealInit(.name$, .x, .y, 5);
end;
OnBreakSeal06:
- SaggySealInit(.name$, .x, .y, 6, getmap());
+ SaggySealInit(.name$, .x, .y, 6);
end;
OnBreakSeal07:
- SaggySealInit(.name$, .x, .y, 7, getmap());
+ SaggySealInit(.name$, .x, .y, 7);
end;
OnBreakSeal08:
- SaggySealInit(.name$, .x, .y, 8, getmap());
+ SaggySealInit(.name$, .x, .y, 8);
end;
OnBreakSeal09:
- SaggySealInit(.name$, .x, .y, 9, getmap());
+ SaggySealInit(.name$, .x, .y, 9);
end;
OnBreakSeal10:
@@ -340,43 +340,43 @@ OnTouch:
}
// It is stage 3, so we will write to setq3 that the seal is open... Soon.
- SaggySealInit(.name$, .x, .y, 0, getmap());
+ SaggySealInit(.name$, .x, .y, 0);
end;
OnBreakSeal01:
- SaggySealInit(.name$, .x, .y, 1, getmap());
+ SaggySealInit(.name$, .x, .y, 1);
end;
OnBreakSeal02:
- SaggySealInit(.name$, .x, .y, 2, getmap());
+ SaggySealInit(.name$, .x, .y, 2);
end;
OnBreakSeal03:
- SaggySealInit(.name$, .x, .y, 3, getmap());
+ SaggySealInit(.name$, .x, .y, 3);
end;
OnBreakSeal04:
- SaggySealInit(.name$, .x, .y, 4, getmap());
+ SaggySealInit(.name$, .x, .y, 4);
end;
OnBreakSeal05:
- SaggySealInit(.name$, .x, .y, 5, getmap());
+ SaggySealInit(.name$, .x, .y, 5);
end;
OnBreakSeal06:
- SaggySealInit(.name$, .x, .y, 6, getmap());
+ SaggySealInit(.name$, .x, .y, 6);
end;
OnBreakSeal07:
- SaggySealInit(.name$, .x, .y, 7, getmap());
+ SaggySealInit(.name$, .x, .y, 7);
end;
OnBreakSeal08:
- SaggySealInit(.name$, .x, .y, 8, getmap());
+ SaggySealInit(.name$, .x, .y, 8);
end;
OnBreakSeal09:
- SaggySealInit(.name$, .x, .y, 9, getmap());
+ SaggySealInit(.name$, .x, .y, 9);
end;
OnBreakSeal10: