summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/011-3/flood.txt10
-rw-r--r--npc/functions/weather.txt17
2 files changed, 22 insertions, 5 deletions
diff --git a/npc/011-3/flood.txt b/npc/011-3/flood.txt
index 0fd0212f5..2d1d0abbb 100644
--- a/npc/011-3/flood.txt
+++ b/npc/011-3/flood.txt
@@ -3,7 +3,7 @@
// Jesusalva
// Description:
// Controls Eternal Swamps.
-// Contains functions to flood the map (hide the bridges - mask 1024)
+// Contains functions to flood the map (hide the bridges - mask 1024 + mask 2)
// Flood happens at random and causes BluePar to be spawn. Runs every 6/4 minutes.
// At the 6th minute of an hour (6, 16, 26, 36, 46, 56)
// At the 2nd minute of an hour (2, 14 ... 44, 54)
@@ -15,7 +15,7 @@ OnSwampMob:
end;
OnInit:
- addmapmask "011-3", 1024;
+ addmapmask "011-3", MASK_SPECIAL;
end;
OnMinute02:
@@ -30,12 +30,12 @@ OnMinute42:
OnMinute46:
OnMinute52:
OnMinute56:
- .@fd=!(getmapmask("011-3")&1024); // .@fd - is flooded?
+ .@fd=!(getmapmask("011-3")&MASK_SPECIAL); // .@fd - is flooded?
if (.@fd) {
// If it is flooded, unflood it to prevent players getting struck for too long
killmonster("011-3", "#EternalSwampCore::OnSwampMob");
- addmapmask "011-3", 1024;
+ addmapmask "011-3", MASK_SPECIAL;
delcells "EterSwampBridge1";
delcells "EterSwampBridge2";
delcells "EterSwampBridge3";
@@ -52,7 +52,7 @@ OnMinute56:
// Maybe we should flood it
if (rand(0,100) < .@odds) {
- removemapmask "011-3", 1024;
+ removemapmask "011-3", MASK_SPECIAL;
setcells "011-3", 37, 22, 39, 24, 3, "EterSwampBridge1";
setcells "011-3", 37, 34, 39, 41, 3, "EterSwampBridge2";
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index 437b84400..ec161fa20 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -89,6 +89,10 @@ OnInit:
htput(.wcore, "020-1", "iceland");
htput(.wcore, "022-1", "iceland");
+ // Special
+ htput(.wcore, "011-3", "special");
+
+
debugmes "[Weather.sys] Total Maps = " + htsize(.wcore);
// No "end" here, so server starts with weather
OnMinute00:
@@ -136,6 +140,19 @@ OnMinute45:
else if (.@r < 300)
.@mk=.@mk|MASK_SNOW;
+ } else if (.@type$ == "special") {
+ // This biom is too hot for snow. But it may rain.
+ if (.@r < 300)
+ .@mk=.@mk|MASK_RAIN;
+
+ // Fog? (Evil Sanctum and Monster Attack) Or Sandstorm?
+ if (.@r % 4 == 2)
+ .@mk=.@mk|MASK_EVILSANCTUM;
+ else if (.@r % 4 == 1)
+ .@mk=.@mk|MASK_SANDSTORM;
+ else if (.@r % 4 == 3)
+ .@mk=.@mk|MASK_MATTACK;
+
} else {
debugmes "Warning warning, blame Saulc! Weather system error on map "+.@key$;
announce("ERROR BLAME SAULC! WEATHER SYSTEM CORRUPTED.", bc_all);