diff options
author | Jesusaves <cpntb1@ymail.com> | 2021-05-25 12:46:31 +0000 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2021-05-25 12:46:31 +0000 |
commit | 52314d53ea702d06eb469178b666b813f1854fde (patch) | |
tree | 3b70dcbb2acac103fd0cbacc6c23b657d3ddb68c /npc/052-2/partyroom.txt | |
parent | c95da3402c6323460fefd4a399de272d5a9e0ca9 (diff) | |
parent | 08b629060711da081f9e6065764e1a7d32919fc8 (diff) | |
download | serverdata-52314d53ea702d06eb469178b666b813f1854fde.tar.gz serverdata-52314d53ea702d06eb469178b666b813f1854fde.tar.bz2 serverdata-52314d53ea702d06eb469178b666b813f1854fde.tar.xz serverdata-52314d53ea702d06eb469178b666b813f1854fde.zip |
Merge branch 'mapfix' into 'master'
Mapfix
See merge request themanaworld/evolved/serverdata!2
Diffstat (limited to 'npc/052-2/partyroom.txt')
-rw-r--r-- | npc/052-2/partyroom.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/npc/052-2/partyroom.txt b/npc/052-2/partyroom.txt index 55c9bcdb..399c690d 100644 --- a/npc/052-2/partyroom.txt +++ b/npc/052-2/partyroom.txt @@ -1,5 +1,5 @@ -052-2,88,19,0 script #TriggerDialog NPC32767,3,2,{ +052-2,98,29,0 script #TriggerDialog NPC32767,3,2,{ @step = 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; if ($@illia_level_7_progress == 0 && strcharinfo(0) == $@iLLIA_HERO$) goto L_SpawnLuvia; @@ -16,19 +16,19 @@ L_ShouldNotBeHere: } -052-2,77,48,0 script #TriggerPlaceLuvia NPC32767,1,1,{ +052-2,87,58,0 script #TriggerPlaceLuvia NPC32767,1,1,{ if (strcharinfo(0) != $@iLLIA_HERO$) end; if ($@illia_progress == 7 && $@illia_level_7_progress == 0) goto L_PlaceLuvia; end; L_PlaceLuvia: - npcwarp 88, 15, "#LuviaDaemon"; - npcwarp 88, 15, "Luvia"; + npcwarp 98, 25, "#LuviaDaemon"; + npcwarp 98, 25, "Luvia"; end; } -052-2,88,15,0 script Luvia NPC371,{ +052-2,98,25,0 script Luvia NPC371,{ @step = 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; if ($@illia_level_7_progress == 0 && strcharinfo(0) == $@iLLIA_HERO$) goto L_Start; @@ -68,7 +68,7 @@ OnTimer15000: } -052-2,88,15,0 script #LuviaDaemon NPC32767,{ +052-2,98,25,0 script #LuviaDaemon NPC32767,{ end; OnCommandInvoke: @@ -165,7 +165,7 @@ S_SpawnWitchGuard: misceffect FX_GROUND_SPAWN; monster "052-2", getx(), gety(), "", 1103, 1, "#LuviaDaemon::OnWGD"; detachrid; - areatimer 0, "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnWGS"; + areatimer 0, "052-2", 83, 21, 125, 59, 0, "#LuviaDaemon::OnWGS"; return; OnTimer30000: @@ -181,7 +181,7 @@ OnTimer30000: L_TriggerTrance: $@illia_level_7_progress = 3; $@illia_luvia_trance_delay = 0; - areatimer 0, "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnTT"; + areatimer 0, "052-2", 83, 21, 125, 59, 0, "#LuviaDaemon::OnTT"; setnpctimer 0; end; @@ -200,9 +200,9 @@ OnDeath: mapannounce "052-2", "Luvia : How? By mere humans! But we will see again! Enjoy your victory while it lasts, " + $@iLLIA_HERO$ + "!!", 0; $@illia_bp = $Illia_Luvia_Harvest * 16 / 10 + 120; - areatimer 0, "052-2", 73, 11, 115, 49, 0, "#LuviaDaemon::OnBP"; + areatimer 0, "052-2", 83, 21, 125, 59, 0, "#LuviaDaemon::OnBP"; - areatimer 0, "052-2", 73, 11, 115, 49, 2000, "#LuviaDaemon::OnW00t"; + areatimer 0, "052-2", 83, 21, 125, 59, 2000, "#LuviaDaemon::OnW00t"; $@illia_progress = 8; callfunc "UpdateIlliaProgress"; @@ -254,11 +254,11 @@ OnW00t: } -052-2,88,12,0 script #ToLuviaRoomDoor NPC32767,1,2,{ +052-2,98,22,0 script #ToLuviaRoomDoor NPC32767,1,2,{ @step = 7; if ($@illia_progress < @step) goto L_ShouldNotBeHere; if ($@illia_level_7_progress < 4) end; - warp "052-2", 133, 84; + warp "052-2", 143, 94; end; L_ShouldNotBeHere: |