011-3 is now working thanks to @4144 :smiley:

2 files changed, 11 insertions, 12 deletions

diff --git a/npc/011-3/_mobs.txt b/npc/011-3/_mobs.txt
index d85a130b7..81221eb96 100644
--- a/npc/011-3/_mobs.txt
+++ b/npc/011-3/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 011-3: Eternal Swamps - Landbridge mobs
-011-3,39,205,19,14	monster	Angry Red Scorpion	1130,15,100000,30000
-011-3,40,206,19,14	monster	Fire Goblin	1067,20,100000,30000
+011-3,39,205,19,14	monster	Angry Red Scorpion	1130,10,100000,30000
+011-3,40,206,19,14	monster	Fire Goblin	1067,10,100000,30000
 011-3,38,207,19,14	monster	Old Snake	1199,5,100000,30000
 011-3,38,174,18,13	monster	Sarracenus	1125,7,100000,30000
 011-3,37,176,18,13	monster	Black Scorpion	1074,4,100000,30000
diff --git a/npc/011-3/flood.txt b/npc/011-3/flood.txt
index 9e3ca3749..802b0c9ac 100644
--- a/npc/011-3/flood.txt
+++ b/npc/011-3/flood.txt
@@ -36,11 +36,11 @@ OnSkipFlood:
     .@fd=!(getmapmask("011-3")&MASK_SPECIAL); // .@fd - is flooded?
 
     if (.@fd) {
-        debugmes "[Flood] UF - Unflooding";
+        //debugmes "[Flood] UF - Unflooding";
         // If it is flooded, unflood it to prevent players getting struck for too long
         killmonster("011-3", "#EternalSwampCore::OnSwampMob");
         addmapmask "011-3", MASK_SPECIAL;
-        debugmes "[Flood] UF - Del Cells";
+        //debugmes "[Flood] UF - Del Cells";
         delcells "ESwpBridge1";
         delcells "ESwpBridge2";
         delcells "ESwpBridge3";
@@ -55,20 +55,21 @@ OnSkipFlood:
         if (is_night())
             .@odds+=35;
 
+        /*
         // Bugfix
         if ($@GM_OVERRIDE)
             .@odds=100;
         else
             .@odds=0;
-
         debugmes "[Flood] Analysis with %d odds to flood", .@odds;
+        */
 
         // Maybe we should flood it
         if (rand(0,100) < .@odds) {
             debugmes "[Flood] F - Flooding";
             removemapmask "011-3", MASK_SPECIAL;
 
-            debugmes "[Flood] F - Adding Cells";
+            //debugmes "[Flood] F - Adding Cells";
             setcells "011-3", 37, 22, 39, 24, 1, "ESwpBridge1";
             setcells "011-3", 37, 34, 39, 41, 1, "ESwpBridge2";
             setcells "011-3", 31, 67, 33, 73, 1, "ESwpBridge3";
@@ -77,15 +78,13 @@ OnSkipFlood:
             setcells "011-3", 41, 157, 43, 163, 1, "ESwpBridge6";
             setcells "011-3", 36, 187, 38, 193, 1, "ESwpBridge7";
 
-            debugmes "[Flood] F - Spawn and Announce";
+            //debugmes "[Flood] F - Spawn and Announce";
             areamonster "011-3", 20, 20, 60, 220, "Bluepar", Bluepar, rand(8,26), "#EternalSwampCore::OnSwampMob";
             mapannounce "011-3", "Eternal Swamps: A flood starts!",bc_all|bc_npc;
 
             // TODO: Handle players in bridges
-            debugmes "[Flood] F - Map Timer OK";
+            //debugmes "[Flood] F - Map Timer OK";
             maptimer("011-3", "#EternalSwampCore::OnBridgeDown", 10);
-        } else {
-            debugmes "[Flood] NF Aborted";
         }
 
     }
@@ -94,7 +93,7 @@ OnSkipFlood:
 
 // Fix players struck by setcells
 OnBridgeDown:
-    debugmes "[Flood] [OnBD] Bridge is Down";
+    //debugmes "[Flood] [OnBD] Bridge is Down";
     if (isin(37, 22, 39, 24))
         slide 38, 21;
     else if (isin(37, 34, 39, 41))
@@ -109,7 +108,7 @@ OnBridgeDown:
         slide 42, 155;
     else if (isin(36, 187, 38, 193))
         slide 37, 185;
-    debugmes "[Flood] [OnBD] Finished";
+    //debugmes "[Flood] [OnBD] Finished";
 
     end;
 }