diff options
| -rw-r--r-- | npc/014-5-1/objects.txt | 3 | ||||
| -rw-r--r-- | npc/014-5/sagratha.txt | 8 | ||||
| -rw-r--r-- | npc/015-8/sealedshrine.txt | 60 |
3 files changed, 36 insertions, 35 deletions
diff --git a/npc/014-5-1/objects.txt b/npc/014-5-1/objects.txt index ed3520924..72dae0794 100644 --- a/npc/014-5-1/objects.txt +++ b/npc/014-5-1/objects.txt @@ -32,7 +32,8 @@ OnInit: mesc l("Enter though the window to the secret caves?"); next; if (askyesno() == ASK_YES) { - warp "015-8", 99, 178; + .@mapn$="sgt2@"+getcharid(0); + warp .@mapn$, 99, 178; closeclientdialog; end; } diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt index 17810cba9..59b6e37da 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, .@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_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_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 571030dd1..038d854be 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); + SaggySealInit(.name$, .x, .y, 0, getmap()); end; OnBreakSeal01: - SaggySealInit(.name$, .x, .y, 1); + SaggySealInit(.name$, .x, .y, 1, getmap()); end; OnBreakSeal02: - SaggySealInit(.name$, .x, .y, 2); + SaggySealInit(.name$, .x, .y, 2, getmap()); end; OnBreakSeal03: - SaggySealInit(.name$, .x, .y, 3); + SaggySealInit(.name$, .x, .y, 3, getmap()); end; OnBreakSeal04: - SaggySealInit(.name$, .x, .y, 4); + SaggySealInit(.name$, .x, .y, 4, getmap()); end; OnBreakSeal05: - SaggySealInit(.name$, .x, .y, 5); + SaggySealInit(.name$, .x, .y, 5, getmap()); end; OnBreakSeal06: - SaggySealInit(.name$, .x, .y, 6); + SaggySealInit(.name$, .x, .y, 6, getmap()); end; OnBreakSeal07: - SaggySealInit(.name$, .x, .y, 7); + SaggySealInit(.name$, .x, .y, 7, getmap()); end; OnBreakSeal08: - SaggySealInit(.name$, .x, .y, 8); + SaggySealInit(.name$, .x, .y, 8, getmap()); end; OnBreakSeal09: - SaggySealInit(.name$, .x, .y, 9); + SaggySealInit(.name$, .x, .y, 9, getmap()); 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); + SaggySealInit(.name$, .x, .y, 0, getmap()); end; OnBreakSeal01: - SaggySealInit(.name$, .x, .y, 1); + SaggySealInit(.name$, .x, .y, 1, getmap()); end; OnBreakSeal02: - SaggySealInit(.name$, .x, .y, 2); + SaggySealInit(.name$, .x, .y, 2, getmap()); end; OnBreakSeal03: - SaggySealInit(.name$, .x, .y, 3); + SaggySealInit(.name$, .x, .y, 3, getmap()); end; OnBreakSeal04: - SaggySealInit(.name$, .x, .y, 4); + SaggySealInit(.name$, .x, .y, 4, getmap()); end; OnBreakSeal05: - SaggySealInit(.name$, .x, .y, 5); + SaggySealInit(.name$, .x, .y, 5, getmap()); end; OnBreakSeal06: - SaggySealInit(.name$, .x, .y, 6); + SaggySealInit(.name$, .x, .y, 6, getmap()); end; OnBreakSeal07: - SaggySealInit(.name$, .x, .y, 7); + SaggySealInit(.name$, .x, .y, 7, getmap()); end; OnBreakSeal08: - SaggySealInit(.name$, .x, .y, 8); + SaggySealInit(.name$, .x, .y, 8, getmap()); end; OnBreakSeal09: - SaggySealInit(.name$, .x, .y, 9); + SaggySealInit(.name$, .x, .y, 9, getmap()); 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); + SaggySealInit(.name$, .x, .y, 0, getmap()); end; OnBreakSeal01: - SaggySealInit(.name$, .x, .y, 1); + SaggySealInit(.name$, .x, .y, 1, getmap()); end; OnBreakSeal02: - SaggySealInit(.name$, .x, .y, 2); + SaggySealInit(.name$, .x, .y, 2, getmap()); end; OnBreakSeal03: - SaggySealInit(.name$, .x, .y, 3); + SaggySealInit(.name$, .x, .y, 3, getmap()); end; OnBreakSeal04: - SaggySealInit(.name$, .x, .y, 4); + SaggySealInit(.name$, .x, .y, 4, getmap()); end; OnBreakSeal05: - SaggySealInit(.name$, .x, .y, 5); + SaggySealInit(.name$, .x, .y, 5, getmap()); end; OnBreakSeal06: - SaggySealInit(.name$, .x, .y, 6); + SaggySealInit(.name$, .x, .y, 6, getmap()); end; OnBreakSeal07: - SaggySealInit(.name$, .x, .y, 7); + SaggySealInit(.name$, .x, .y, 7, getmap()); end; OnBreakSeal08: - SaggySealInit(.name$, .x, .y, 8); + SaggySealInit(.name$, .x, .y, 8, getmap()); end; OnBreakSeal09: - SaggySealInit(.name$, .x, .y, 9); + SaggySealInit(.name$, .x, .y, 9, getmap()); end; OnBreakSeal10: |