From b3288ff1233e9e38e6338db8c88e0710673809db Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 22 Dec 2018 21:54:28 -0200 Subject: Correct bugs on season handler. Introduce template for Winter Events. --- npc/functions/seasons.txt | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt index 61b7b86a8..df3c5ba40 100644 --- a/npc/functions/seasons.txt +++ b/npc/functions/seasons.txt @@ -42,6 +42,8 @@ function script SeasonControl { "Summer End", "Autumn Start", "Autumn End", + "Winter Start", + "Winter End", "Abort"; switch (@menu) { @@ -49,6 +51,8 @@ function script SeasonControl { case 2: donpcevent("#SeasonCore::OnSummerEnd"); break; case 3: donpcevent("#SeasonCore::OnAutumnStart"); break; case 4: donpcevent("#SeasonCore::OnAutumnEnd"); break; + case 5: donpcevent("#SeasonCore::OnWinterStart"); break; + case 6: donpcevent("#SeasonCore::OnWinterEnd"); break; } } while (@menu != 5); return; @@ -74,9 +78,17 @@ function script SeasonReload { donpcevent("#SeasonCore::OnAutumnStart"); } // Autumn end delete drops - if (season() == AUTUMN && $@SEASON == SUMMER) { + if (season() == WINTER && $@SEASON == AUTUMN) { donpcevent("#SeasonCore::OnAutumnEnd"); } + // Winter extra drops + if (season() == WINTER && $@SEASON != WINTER) { + donpcevent("#SeasonCore::OnWinterStart"); + } + // Winter end delete drops + if (season() == SPRING && $@SEASON == WINTER) { + donpcevent("#SeasonCore::OnWinterEnd"); + } // Non-season, but season-related // Christmas have a special feature @@ -195,6 +207,16 @@ OnAutumnEnd: delmonsterdrop(BlackMamba, PumpkandySeed); end; +OnWinterStart: + addmonsterdrop(Duck, GingerBreadMan, 360); + addmonsterdrop(WaterFairy, GingerBreadMan, 1000); + end; + +OnWinterEnd: + delmonsterdrop(Duck, GingerBreadMan); + delmonsterdrop(WaterFairy, GingerBreadMan); + end; + OnInit: OnHour00: if ($@SEASON != season()) { -- cgit v1.2.3-70-g09d2