Update 011-3 and allow reborn players to cross the Eternal Swamps via Halin

5 files changed, 36 insertions, 28 deletions

diff --git a/maps/re/011-3.mcache b/maps/re/011-3.mcache
index 91b717763..0db89fc8a 100644
--- a/maps/re/011-3.mcache
+++ b/maps/re/011-3.mcache
diff --git a/npc/009-1/guards.txt b/npc/009-1/guards.txt
index 43bbcbd59..ed6239958 100644
--- a/npc/009-1/guards.txt
+++ b/npc/009-1/guards.txt
@@ -26,7 +26,7 @@
         mes "";
         if (@menu == 2 && $HURNS_LIBDATE) {
             .@palgal$=lg("gal", "pal");
-            if (BaseLevel < 20) {
+            if (BaseLevel < 20 && !REBIRTH) {
                 mesn;
                 mesq l("It might be, but your level isn't. Sorry @@. No going to Hurnscald before level 20.", .@palgal$);
                 close;
@@ -36,7 +36,7 @@
                 mesq l("It might be, but I never heard of you before. Sorry @@, I can't let just anyone go through. It would be a disservice to see you get stuck and die.", .@palgal$);
                 close;
             }
-            warp "011-3", 37, 219;
+            warp "011-3", 37, 259;
             closedialog;
             close;
         } else if (!$HURNS_LIBDATE) {
diff --git a/npc/011-3/_mobs.txt b/npc/011-3/_mobs.txt
index 42dde2357..c2e2c8073 100644
--- a/npc/011-3/_mobs.txt
+++ b/npc/011-3/_mobs.txt
@@ -1,22 +1,26 @@
 // 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,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
-011-3,39,175,18,13	monster	Snake	1122,6,100000,30000
-011-3,40,145,19,11	monster	Snake	1122,3,100000,30000
-011-3,39,144,19,11	monster	Sarracenus	1125,4,100000,30000
-011-3,38,146,19,11	monster	Desert Bandit	1124,5,100000,30000
-011-3,40,101,36,26	monster	Fire Fairy	1183,15,100000,30000
-011-3,39,99,36,26	monster	Bandit	1124,13,100000,30000
-011-3,37,103,36,26	monster	Robin Bandit	1153,7,100000,30000
+011-3,39,245,19,14	monster	Angry Red Scorpion	1130,10,100000,30000
+011-3,40,246,19,14	monster	Fire Goblin	1067,10,100000,30000
+011-3,38,247,19,14	monster	Old Snake	1199,5,100000,30000
+011-3,38,214,18,13	monster	Sarracenus	1125,7,100000,30000
+011-3,37,216,18,13	monster	Black Scorpion	1074,4,100000,30000
+011-3,39,215,18,13	monster	Snake	1122,6,100000,30000
+011-3,40,185,19,11	monster	Snake	1122,3,100000,30000
+011-3,39,184,19,11	monster	Sarracenus	1125,4,100000,30000
+011-3,38,186,19,11	monster	Desert Bandit	1124,5,100000,30000
+011-3,40,141,36,26	monster	Fire Fairy	1183,15,100000,30000
+011-3,39,139,36,26	monster	Bandit	1124,13,100000,30000
+011-3,37,143,36,26	monster	Robin Bandit	1153,7,100000,30000
 011-3,37,56,24,14	monster	Sea Slime	1093,5,100000,30000
 011-3,39,55,24,14	monster	Red Mushroom	1042,5,100000,30000
 011-3,38,54,24,14	monster	Grass Snake	1169,4,100000,30000
 011-3,37,32,19,7	monster	Sea Slime	1093,5,100000,30000
 011-3,39,32,19,7	monster	Tipiou	1016,3,900000,300000
 011-3,38,31,19,7	monster	Vicious Squirrel	1187,5,100000,30000
-011-3,51,113,3,4	monster	Fire Fairy	1183,1,100000,30000
-011-3,30,89,3,4	monster	Fire Fairy	1183,1,100000,30000
+011-3,51,153,3,4	monster	Fire Fairy	1183,1,100000,30000
+011-3,30,129,3,4	monster	Fire Fairy	1183,1,100000,30000
+011-3,40,89,28,16	monster	Angry Scorpion	1131,13,100000,30000
+011-3,39,91,28,16	monster	Big Frog	1438,7,100000,30000
+011-3,39,96,17,6	monster	Vampire Bat	1063,2,400000,60000
+011-3,39,82,17,6	monster	Living Potato	1181,3,300000,60000
diff --git a/npc/011-3/_warps.txt b/npc/011-3/_warps.txt
index 22caef9e6..99d816287 100644
--- a/npc/011-3/_warps.txt
+++ b/npc/011-3/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 011-3: Eternal Swamps - Landbridge warps
 011-3,37,20,0	warp	#011-3_37_20	2,0,014-2,56,102
-011-3,37,221,0	warp	#011-3_37_221	4,0,009-1,71,25
+011-3,37,261,0	warp	#011-3_37_261	4,0,009-1,71,25
diff --git a/npc/011-3/flood.txt b/npc/011-3/flood.txt
index 935332263..0fda21d8a 100644
--- a/npc/011-3/flood.txt
+++ b/npc/011-3/flood.txt
@@ -50,6 +50,7 @@ OnSkipFlood:
         delcells "ESwpBridge5";
         delcells "ESwpBridge6";
         delcells "ESwpBridge7";
+        delcells "ESwpBridge8";
         mapannounce "011-3", "Eternal Swamps: The flood ceases!",bc_all|bc_npc;
     } else {
         // 40% chances to flood, 75% during night
@@ -74,14 +75,15 @@ OnSkipFlood:
             //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";
-            setcells "011-3", 40, 96, 42, 102, 1, "ESwpBridge4";
-            setcells "011-3", 38, 130, 40, 136, 1, "ESwpBridge5";
-            setcells "011-3", 41, 157, 43, 163, 1, "ESwpBridge6";
-            setcells "011-3", 36, 187, 38, 193, 1, "ESwpBridge7";
+            setcells "011-3", 31, 107, 33, 113, 1, "ESwpBridge3";
+            setcells "011-3", 40, 136, 42, 142, 1, "ESwpBridge4";
+            setcells "011-3", 38, 170, 40, 176, 1, "ESwpBridge5";
+            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";
 
             //debugmes "[Flood] F - Spawn and Announce";
-            areamonster "011-3", 20, 20, 60, 220, "Bluepar", Bluepar, rand(8,26), "#EternalSwampCore::OnSwampMob";
+            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;
 
             // TODO: Handle players in bridges
@@ -100,15 +102,17 @@ OnBridgeDown:
         slide 38, 21;
     else if (isin("011-3", 37, 34, 39, 41))
         slide 38, 33;
-    else if (isin("011-3", 31, 67, 33, 73))
+    else if (isin("011-3", 31, 107, 33, 113))
         slide 32, 65;
-    else if (isin("011-3", 40, 96, 42, 102))
+    else if (isin("011-3", 40, 136, 42, 142))
         slide 41, 95;
-    else if (isin("011-3", 38, 130, 40, 136))
+    else if (isin("011-3", 38, 170, 40, 176))
         slide 39, 128;
-    else if (isin("011-3", 41, 157, 43, 163))
+    else if (isin("011-3", 41, 197, 43, 203))
         slide 42, 155;
-    else if (isin("011-3", 36, 187, 38, 193))
+    else if (isin("011-3", 36, 227, 38, 233))
+        slide 37, 185;
+    else if (isin("011-3", 31, 67, 32, 72))
         slide 37, 185;
     //debugmes "[Flood] [OnBD] Finished";