diff options
author | Jesusaves <cpntb1@ymail.com> | 2019-08-31 15:03:45 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2019-08-31 15:03:45 -0300 |
commit | 63256388cb5b9ef7bc1a4afbd0270c135882d622 (patch) | |
tree | 7519f7aa64fd56f71038ad59ee747ba2c761082f /npc/017-1 | |
parent | 5dab87b522e5ff18b6a62e86c369ac3295c1817f (diff) | |
parent | 4de339bf2c92af5f74cdb28b0eb62e8ca66993c4 (diff) | |
download | serverdata-testserver.tar.gz serverdata-testserver.tar.bz2 serverdata-testserver.tar.xz serverdata-testserver.zip |
Merge branch 'master' into testservertestserver
Diffstat (limited to 'npc/017-1')
-rw-r--r-- | npc/017-1/townhall.txt | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/npc/017-1/townhall.txt b/npc/017-1/townhall.txt index 61df25334..772688eed 100644 --- a/npc/017-1/townhall.txt +++ b/npc/017-1/townhall.txt @@ -4,7 +4,7 @@ // Description: // LoF Townhall Access Control -017-1,180,20,0 script #LoF_Townhall01 NPC_HIDDEN,{ +017-1,180,20,0 script #LoF_Townhall01 NPC_NO_SPRITE,0,0,{ end; OnTouch: @@ -14,13 +14,10 @@ OnTouch: warp "017-10", 56, 78; } end; -OnInit: - .distance=1; - end; } -017-1,182,20,0 script #LoF_Townhall02 NPC_HIDDEN,{ +017-1,182,20,0 script #LoF_Townhall02 NPC_NO_SPRITE,0,0,{ end; OnTouch: @@ -30,12 +27,9 @@ OnTouch: warp "017-10", 60, 78; } end; -OnInit: - .distance=1; - end; } -017-1,171,20,0 script #LoF_Townhall03 NPC_HIDDEN,{ +017-1,171,20,0 script #LoF_Townhall03 NPC_NO_SPRITE,0,0,{ end; OnTouch: @@ -45,12 +39,9 @@ OnTouch: warp "017-10", 36, 78; } end; -OnInit: - .distance=1; - end; } -017-1,190,20,0 script #LoF_Townhall04 NPC_HIDDEN,{ +017-1,190,20,0 script #LoF_Townhall04 NPC_NO_SPRITE,0,0,{ end; OnTouch: @@ -60,9 +51,6 @@ OnTouch: warp "017-10", 80, 78; } end; -OnInit: - .distance=1; - end; } ///////////////////////////// // Main Quest 6 @@ -85,8 +73,8 @@ function script BarbaraInstCheck { .@inst = instance_create("Forgotten Shrine "+getcharid(0), getcharid(3), IOT_CHAR); instance_attachmap("018-6-0", .@inst, false, .@map0$); instance_attachmap("018-6-1", .@inst, false, .@map1$); - //instance_attachmap("018-6-2", .@inst, false, .@map2$); - //instance_attachmap("018-6-3", .@inst, false, .@map3$); + instance_attachmap("018-6-2", .@inst, false, .@map2$); + instance_attachmap("018-6-3", .@inst, false, .@map3$); // Instance lasts two hours instance_set_timeout(7200, 7200, .@inst); instance_init(.@inst); @@ -104,11 +92,10 @@ function script BarbaraInstCheck { return getd(".@map"+.@house+"$"); } -017-1,32,44,0 script #LoF_EleniumMines NPC_HIDDEN,{ +017-1,32,44,0 script #LoF_EleniumMines NPC_NO_SPRITE,0,0,{ end; OnTouch: - // TODO: OnQuest: Instance .@q=getq(LoFQuest_Barbara); if (.@q >= 1) { warp BarbaraInstCheck(1), 80, 199; @@ -116,8 +103,5 @@ OnTouch: warp "018-6-1", 80, 199; } end; -OnInit: - .distance=1; - end; } |