From 67db5e8cca82df8cbca5e4fdb4e3069b77473034 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Sat, 4 Dec 2021 18:05:11 +0100 Subject: XMAS2021 Grinchboo time fix (#597) --- world/map/npc/annuals/xmas/2021.txt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/world/map/npc/annuals/xmas/2021.txt b/world/map/npc/annuals/xmas/2021.txt index 653ca98e..19241638 100644 --- a/world/map/npc/annuals/xmas/2021.txt +++ b/world/map/npc/annuals/xmas/2021.txt @@ -7,7 +7,7 @@ 009-1,57,38,0|script|#GrinchHurns|431 { close; - + OnEvent: npctalk strnpcinfo(0), $@XMAS2021GrinchTalk$; end; @@ -17,7 +17,7 @@ OnEvent: 001-1,51,77,0|script|#GrinchTulim|431 { close; - + OnEvent: npctalk strnpcinfo(0), $@XMAS2021GrinchTalk$; end; @@ -27,7 +27,7 @@ OnEvent: 020-1,76,84,0|script|#GrinchNivalis|431 { close; - + OnEvent: npctalk strnpcinfo(0), $@XMAS2021GrinchTalk$; end; @@ -37,7 +37,7 @@ OnEvent: 029-1,52,93,0|script|#GrinchCandor|431 { close; - + OnEvent: npctalk strnpcinfo(0), $@XMAS2021GrinchTalk$; end; @@ -46,7 +46,7 @@ OnEvent: ///////////////////////////////////////////////////////////////// -|script|XMAS2021KillGrinch|32767 { - close; + close; OnInit: /* @@ -60,10 +60,10 @@ OnInit: */ set $@XMAS2021GrinchTalk$, "Grinchboo : Grrr it's that annyoing chrismas time again but this time there is an event on testing.themanaworld.org starting at 12th december. Look [@@https://forums.themanaworld.org/viewtopic.php?p=162964#p162964|here@@]!"; disablenpc "#GrinchHurns"; - disablenpc "#GrinchTulim"; + disablenpc "#GrinchTulim"; disablenpc "#GrinchNivalis"; disablenpc "#GrinchCandor"; - + initnpctimer; end; @@ -72,47 +72,47 @@ OnTimer3000: if ($@GrinchTalkTime == 1) goto L_XMAS2021GrinchTalkTime; end; - + L_XMAS2021GrinchTalkTime: set $@GrinchTalkTime, 0; - + donpcevent "XMAS2021Respawn::OnEvent"; - + disablenpc "#GrinchHurns"; disablenpc "#GrinchTulim"; disablenpc "#GrinchNivalis"; disablenpc "#GrinchCandor"; end; - + OnTimer12000: // wait a bit so that the dead Grinchboo can disapear, in some rare cases that does not work if ($@GrinchKilled == 1) goto L_XMAS2021KilledGrinch; end; - -L_XMAS2021KilledGrinch: + +L_XMAS2021KilledGrinch: enablenpc "#GrinchHurns"; enablenpc "#GrinchTulim"; enablenpc "#GrinchNivalis"; enablenpc "#GrinchCandor"; - + donpcevent "#GrinchHurns::OnEvent"; donpcevent "#GrinchTulim::OnEvent"; donpcevent "#GrinchNivalis::OnEvent"; donpcevent "#GrinchCandor::OnEvent"; - + set $@GrinchKilled, 0; set $@GrinchTalkTime, 1; - + setnpctimer 0; end; -OnTimer150000: +OnTimer900000: killmonster "009-1","XMAS2021Respawn::OnGrinch"; killmonster "001-1","XMAS2021Respawn::OnGrinch"; killmonster "020-1","XMAS2021Respawn::OnGrinch"; killmonster "029-1","XMAS2021Respawn::OnGrinch"; - + set $@GrinchKilled, 1; setnpctimer 0; end; -- cgit v1.2.3-70-g09d2