summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-03 09:49:24 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-03 09:49:24 -0300
commitc6d19cbd0fb219722d9045df403955fbc8c7a478 (patch)
treeb9fd3d064e90e3614a462405cfea9b0e92503fb0
parentc10e529990bdb639ab69f42c856812de0fc8d160 (diff)
downloadserverdata-c6d19cbd0fb219722d9045df403955fbc8c7a478.tar.gz
serverdata-c6d19cbd0fb219722d9045df403955fbc8c7a478.tar.bz2
serverdata-c6d19cbd0fb219722d9045df403955fbc8c7a478.tar.xz
serverdata-c6d19cbd0fb219722d9045df403955fbc8c7a478.zip
You can now enter on Sagratha's Boss Room
-rw-r--r--npc/014-5/sagratha.txt5
-rw-r--r--npc/015-8/config.txt3
-rw-r--r--npc/015-8/sealedshrine.txt36
3 files changed, 40 insertions, 4 deletions
diff --git a/npc/014-5/sagratha.txt b/npc/014-5/sagratha.txt
index 183c208a7..455ea04c8 100644
--- a/npc/014-5/sagratha.txt
+++ b/npc/014-5/sagratha.txt
@@ -127,13 +127,14 @@ L_Open:
.@q2=getq2(HurnscaldQuest_Sagratha);
// Map name limit: 4 chars (sgt1)
.@mapn$="sgt1@"+getcharid(0);
+ .@map2$="sgt2@"+getcharid(0);
if (isinstance(.@q2) && .@q2 != 0) {
warp .@mapn$, 33, 44;
} 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$);
+ instance_attachmap("015-8-1", .@inst, false, .@map2$);
// 40 minutes (2400s) inside, or 5 minutes (300s) outside
instance_set_timeout(2400, 300, .@inst);
instance_init(.@inst);
@@ -145,8 +146,8 @@ L_Open:
close;
L_Welcome:
- dispbottom l("Mouboos are cute");
warp "014-5-1", 33, 44;
+ dispbottom l("Mouboos are cute");
end;
OnTouch:
diff --git a/npc/015-8/config.txt b/npc/015-8/config.txt
index a65afe93b..c7c8343d7 100644
--- a/npc/015-8/config.txt
+++ b/npc/015-8/config.txt
@@ -27,11 +27,12 @@ OnTouch:
.@q2=getq2(HurnscaldQuest_Sagratha);
// Map name limit: 4 chars (sgt1)
.@mapn$="sgt1@"+getcharid(0);
+ .@map2$="sgt2@"+getcharid(0);
if (!(isinstance(.@q2) && .@q2 != 0)) {
.@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$);
+ instance_attachmap("015-8-1", .@inst, false, .@map2$);
// 40 minutes (2400s) inside, or 5 minutes (300s) outside
instance_set_timeout(2400, 300, .@inst);
instance_init(.@inst);
diff --git a/npc/015-8/sealedshrine.txt b/npc/015-8/sealedshrine.txt
index c356d1408..c892163f1 100644
--- a/npc/015-8/sealedshrine.txt
+++ b/npc/015-8/sealedshrine.txt
@@ -621,8 +621,42 @@ OnInit:
}
// Quest Status 5: Riddle solved, access granted
+ if (.@q == 5) {
+ enable_items();
+ mesc l(".:: The Mouboo Temple ::."), 3;
+ mesc l("WARNING: You are about to enter a HIGH-RISK zone."), 1;
+ mesc l("We advise you to change your equipment now."), 1;
+ if (getmapusers("015-8") > 1)
+ mesc l("THIS IS A SOLO FIGHT, TEAMS ARE NOT ALLOWED INSIDE."), 1;
+ next;
+ disable_items();
+ if (askyesno() == ASK_YES) {
+ closeclientdialog;
+
+ .@q2=getq2(HurnscaldQuest_Sagratha);
+ // Map name limit: 4 chars (sgt1)
+ .@mapn$="sgt1@"+getcharid(0);
+ .@map2$="sgt2@"+getcharid(0);
+ if (!(isinstance(.@q2) && .@q2 != 0)) {
+ .@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, .@map2$);
+ // 40 minutes (2400s) inside, or 5 minutes (300s) outside
+ instance_set_timeout(2400, 300, .@inst);
+ instance_init(.@inst);
+ setq2 HurnscaldQuest_Sagratha, .@inst;
+ }
+ warp .@map2$, 50, 78;
+ end;
+ }
+ close;
+ }
+
// Quest Status 6: Boss defeated, no instance needed
- dispbottom "ERROR";
+ if (.@q >= 6) {
+ warp "015-8-1", 50, 78;
+ }
end;
}