diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-06-03 15:26:15 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-06-03 15:26:15 -0300 |
| commit | 8b7bec52ffe5766426b8e4635d765ca85d1f6a83 (patch) | |
| tree | c1021edce63e41274e1d4c50e123bb0fdfdb0cb4 /npc/015-8 | |
| parent | ffbe65bb05d0c58d46903bfdc82e1543a570785e (diff) | |
| download | serverdata-8b7bec52ffe5766426b8e4635d765ca85d1f6a83.tar.gz serverdata-8b7bec52ffe5766426b8e4635d765ca85d1f6a83.tar.bz2 serverdata-8b7bec52ffe5766426b8e4635d765ca85d1f6a83.tar.xz serverdata-8b7bec52ffe5766426b8e4635d765ca85d1f6a83.zip | |
Fix bugs and move Sagratha's Campaign to Alpha Testing State
Diffstat (limited to 'npc/015-8')
| -rw-r--r-- | npc/015-8/config.txt | 28 | ||||
| -rw-r--r-- | npc/015-8/sealedshrine.txt | 2 |
2 files changed, 1 insertions, 29 deletions
diff --git a/npc/015-8/config.txt b/npc/015-8/config.txt index 6076fc9da..986e4bc65 100644 --- a/npc/015-8/config.txt +++ b/npc/015-8/config.txt @@ -7,34 +7,6 @@ 015-8 mapflag zone MMO 015-8-1 mapflag zone MMO -// Check instances and rebuild if needed -// Returns map name -// SaggyInstCheck( {house=true} ) -function script SaggyInstCheck { - .@house=getarg(0, true); - - .@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; - } - - if (.@house) { - return .@mapn$; - } else { - return .@map2$ - } -} - 015-8,99,179,0 script #Exit0158 NPC_HIDDEN,0,0,{ end; diff --git a/npc/015-8/sealedshrine.txt b/npc/015-8/sealedshrine.txt index 95efa69e2..7d898dcf6 100644 --- a/npc/015-8/sealedshrine.txt +++ b/npc/015-8/sealedshrine.txt @@ -525,6 +525,7 @@ OnTouch: // SaggyShrineStatue( .name$ ) function script SaggyShrineStatue { .@n$=getarg(0); + .@q=getq(HurnscaldQuest_Sagratha); // Initial check if (!MAGIC_LVL || .@q < 4) { @@ -539,7 +540,6 @@ function script SaggyShrineStatue { } mesn l("Guardian Statue"); - .@q=getq(HurnscaldQuest_Sagratha); if (.@q != 4) { mesq l("..."); next; |