diff options
| -rw-r--r-- | npc/functions/seasons.txt | 11 | ||||
| -rw-r--r-- | npc/functions/weather.txt | 10 |
2 files changed, 15 insertions, 6 deletions
diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt index 7859eb29c..4da8be856 100644 --- a/npc/functions/seasons.txt +++ b/npc/functions/seasons.txt @@ -40,13 +40,17 @@ function script SeasonControl { select "Summer Start", "Summer End", + "Autumn Start", + "Autumn End", "Abort"; switch (@menu) { case 1: donpcevent("#SeasonCore::OnSummerStart"); break; case 2: donpcevent("#SeasonCore::OnSummerEnd"); break; + case 3: donpcevent("#SeasonCore::OnAutumnStart"); break; + case 4: donpcevent("#SeasonCore::OnAutumnEnd"); break; } - } while (@menu != 3); + } while (@menu != 5); return; } @@ -69,6 +73,10 @@ function script SeasonReload { if (season() == AUTUMN && $@SEASON != AUTUMN) { donpcevent("#SeasonCore::OnAutumnStart"); } + // Autumn end delete drops + if (season() == AUTUMN && $@SEASON == SUMMER) { + donpcevent("#SeasonCore::OnAutumnEnd"); + } $@SEASON=season(); return; @@ -151,6 +159,7 @@ OnAutumnStart: end; OnAutumnEnd: + removemapmask "012-1", MASK_AUTUMN; delmonsterdrop(Mouboo, Mashmallow); end; diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index 69bf20d5a..bf8ed5570 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -94,21 +94,21 @@ OnMinute45: // Remove all current masks, and add rain/snow/sand if (.@type$ == "desert") { if (.@r < 10) - .@mk=MASK_RAIN; + .@mk=.@mk|MASK_RAIN; else if (.@r < 300) - .@mk=MASK_SANDSTORM; + .@mk=.@mk|MASK_SANDSTORM; } else if (.@type$ == "woodland") { if (.@r < 300) - .@mk=MASK_RAIN; + .@mk=.@mk|MASK_RAIN; if (season() == WINTER) .@mk=.@mk|MASK_SNOW; } else if (.@type$ == "iceland") { if (.@r < 30) - .@mk=MASK_RAIN; + .@mk=.@mk|MASK_RAIN; else if (.@r < 300) - .@mk=MASK_SNOW; + .@mk=.@mk|MASK_SNOW; } else { debugmes "Warning warning, blame Saulc! Weather system error on map "+.@key$; |