summaryrefslogtreecommitdiff
path: root/npc/functions/weather.txt
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-09-08 14:39:55 -0300
committerJesusaves <cpntb1@ymail.com>2018-09-08 14:39:55 -0300
commitbedb73920b06e3a2309c2bb07cd4cde639f87fab (patch)
tree058395be080afefe09269692da05ae1a34d5c1d1 /npc/functions/weather.txt
parent960ecd8767e4af8a840dec7b76c09151a93dfbd2 (diff)
downloadserverdata-bedb73920b06e3a2309c2bb07cd4cde639f87fab.tar.gz
serverdata-bedb73920b06e3a2309c2bb07cd4cde639f87fab.tar.bz2
serverdata-bedb73920b06e3a2309c2bb07cd4cde639f87fab.tar.xz
serverdata-bedb73920b06e3a2309c2bb07cd4cde639f87fab.zip
Maintenance
Diffstat (limited to 'npc/functions/weather.txt')
-rw-r--r--npc/functions/weather.txt10
1 files changed, 5 insertions, 5 deletions
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$;