011-4 Eternal Swamps Navigation Area

1 files changed, 20 insertions, 3 deletions

diff --git a/npc/011-3/flood.txt b/npc/011-3/flood.txt
index 0fda21d8a..4ff712b7c 100644
--- a/npc/011-3/flood.txt
+++ b/npc/011-3/flood.txt
@@ -17,6 +17,12 @@ OnSwampMob:
 OnInit:
     addmapmask "011-3", MASK_SPECIAL;
     bindatcmd "es_flood", "#EternalSwampCore::OnSkipFlood", 99, 99, 1;
+
+    // We need to keep 011-4 in sync with 011-3, dealt here
+    addmapmask "011-4", MASK_SPECIAL;
+    setcells "011-4", 157, 31, 159, 34, 1, "ESwpRBridge1";
+    setcells "011-4", 157, 44, 159, 52, 1, "ESwpRBridge2";
+    setcells "011-4", 151, 76, 153, 83, 1, "ESwpRBridge3";
     end;
 
 OnMinute02:
@@ -51,12 +57,19 @@ OnSkipFlood:
         delcells "ESwpBridge6";
         delcells "ESwpBridge7";
         delcells "ESwpBridge8";
+        setcells "011-4", 157, 31, 159, 34, 1, "ESwpRBridge1";
+        setcells "011-4", 157, 44, 159, 52, 1, "ESwpRBridge2";
+        setcells "011-4", 151, 76, 153, 83, 1, "ESwpRBridge3";
         mapannounce "011-3", "Eternal Swamps: The flood ceases!",bc_all|bc_npc;
+        mapannounce "011-4", "Eternal Swamps: The flood ceases!",bc_all|bc_npc;
     } else {
-        // 40% chances to flood, 75% during night
-        .@odds=40;
+        // 45% chances to flood, 80% during night
+        // When raining: floods 60% at day and 95% at night
+        .@odds=45;
         if (is_night())
             .@odds+=35;
+        if (getmapmask("011-3") & MASK_RAIN)
+            .@odds+=15;
 
         /*
         // Bugfix
@@ -68,7 +81,7 @@ OnSkipFlood:
         */
 
         // Maybe we should flood it
-        if (rand(0,100) < .@odds) {
+        if (rand2(0,100) < .@odds) {
             if ($@GM_OVERRIDE) debugmes "[Flood] F - Flooding";
             removemapmask "011-3", MASK_SPECIAL;
 
@@ -81,10 +94,14 @@ OnSkipFlood:
             setcells "011-3", 41, 197, 43, 203, 1, "ESwpBridge6";
             setcells "011-3", 36, 227, 38, 233, 1, "ESwpBridge7";
             setcells "011-3", 31,  67, 33,  72, 1, "ESwpBridge8";
+            delcells "ESwpRBridge1";
+            delcells "ESwpRBridge2";
+            delcells "ESwpRBridge3";
 
             //debugmes "[Flood] F - Spawn and Announce";
             areamonster "011-3", 20, 20, 60, 260, "Bluepar", Bluepar, rand2(11,29), "#EternalSwampCore::OnSwampMob";
             mapannounce "011-3", "Eternal Swamps: A flood starts!",bc_all|bc_npc;
+            mapannounce "011-4", "Eternal Swamps: A flood starts!",bc_all|bc_npc;
 
             // TODO: Handle players in bridges
             //debugmes "[Flood] F - Map Timer OK";