Regenerate maps. Prepare Nivalis well. (Winterlands, or Icelands, sorry)

9 files changed, 45 insertions, 18 deletions

diff --git a/maps/re/003-1.mcache b/maps/re/003-1.mcache
index 085c2ae28..4189abde3 100644
--- a/maps/re/003-1.mcache
+++ b/maps/re/003-1.mcache
diff --git a/maps/re/004-2.mcache b/maps/re/004-2.mcache
index 4b06251fc..856bea55d 100644
--- a/maps/re/004-2.mcache
+++ b/maps/re/004-2.mcache
diff --git a/maps/re/010-2.mcache b/maps/re/010-2.mcache
index 25ae118b2..8d3ae48da 100644
--- a/maps/re/010-2.mcache
+++ b/maps/re/010-2.mcache
diff --git a/maps/re/015-1.mcache b/maps/re/015-1.mcache
index d91538e13..62a2d7271 100644
--- a/maps/re/015-1.mcache
+++ b/maps/re/015-1.mcache
diff --git a/npc/003-1/_mobs.txt b/npc/003-1/_mobs.txt
index d1ae06010..1529bd571 100644
--- a/npc/003-1/_mobs.txt
+++ b/npc/003-1/_mobs.txt
@@ -12,6 +12,6 @@
 003-1,37,70,3,13	monster	Toppy Blub	1009,2,35000,150000
 003-1,64,58,4,1	monster	Croc	1006,1,35000,150000
 003-1,109,24,9,4	monster	Piou	1002,3,30000,20000
-003-1,81,116,8,11	monster	Duck	1029,3,30000,20000
-003-1,107,43,8,11	monster	Duck	1029,2,30000,20000
+003-1,82,116,9,11	monster	Duck	1029,4,30000,20000
+003-1,108,43,9,11	monster	Duck	1029,3,30000,20000
 003-1,110,42,4,1	monster	Croc	1006,1,35000,150000
diff --git a/npc/004-2/_mobs.txt b/npc/004-2/_mobs.txt
index b0a8ed485..a28f3ed63 100644
--- a/npc/004-2/_mobs.txt
+++ b/npc/004-2/_mobs.txt
@@ -1,11 +1,11 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 004-2: Desert Mountains mobs
-004-2,42,50,4,4	monster	Maggot	1030,7,35000,150000
-004-2,69,74,4,4	monster	Maggot	1030,7,35000,150000
-004-2,100,53,4,4	monster	Maggot	1030,6,35000,150000
+004-2,36,40,15,21	monster	Maggot	1030,8,35000,150000
+004-2,73,77,13,4	monster	Maggot	1030,7,35000,150000
+004-2,100,55,14,14	monster	Maggot	1030,7,35000,150000
 004-2,108,39,17,4	monster	Scorpion	1071,3,35000,150000
-004-2,51,36,10,10	monster	Scorpion	1071,6,35000,150000
+004-2,51,40,10,22	monster	Scorpion	1071,6,35000,150000
 004-2,55,66,4,4	monster	Black Scorpion	1074,1,35000,150000
 004-2,108,97,4,4	monster	Snake	1122,3,35000,150000
-004-2,77,51,4,4	monster	Snake	1122,2,35000,150000
+004-2,77,51,9,4	monster	Snake	1122,2,35000,150000
 004-2,67,63,14,11	monster	Scorpion	1071,8,35000,150000
diff --git a/npc/010-2/_mobs.txt b/npc/010-2/_mobs.txt
index cd00a04a3..7c9f6825c 100644
--- a/npc/010-2/_mobs.txt
+++ b/npc/010-2/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 010-2: Desert Mountains mobs
-010-2,173,32,9,9	monster	Maggot	1030,10,35000,150000
-010-2,159,51,9,9	monster	Maggot	1030,8,35000,150000
+010-2,180,32,49,9	monster	Desert Maggot	1083,12,35000,150000
+010-2,159,61,9,19	monster	Desert Maggot	1083,8,35000,150000
 010-2,122,102,8,2	monster	Snake	1122,2,35000,300000
 010-2,163,77,3,8	monster	Mountain Snake	1123,7,35000,300000
 010-2,98,122,3,2	monster	Desert Bandit	1124,1,35000,300000
diff --git a/npc/015-1/_mobs.txt b/npc/015-1/_mobs.txt
index 358a78c2d..f2b87b5a7 100644
--- a/npc/015-1/_mobs.txt
+++ b/npc/015-1/_mobs.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 015-1: Woodland Mines mobs
-015-1,121,105,119,97	monster	Bif	1058,12,45000,45000
+015-1,121,105,119,97	monster	Bif	1058,14,45000,45000
 015-1,73,111,119,97	monster	Red Slime	1092,75,30000,30000
 015-1,130,81,119,97	monster	Cave Bat	1039,40,60000,60000
 015-1,147,91,119,97	monster	Yellow Slime	1091,50,30000,40000
diff --git a/npc/019-1/well.txt b/npc/019-1/well.txt
index cc15fc0c3..b21a37f24 100644
--- a/npc/019-1/well.txt
+++ b/npc/019-1/well.txt
@@ -17,17 +17,44 @@
 
     // Begin here
     .@q=getq(NivalisQuest_Well);
-    if (.@q == 2)
-        goto L_Well;
-    mes l("Out of Order.");
+    mesn l("The Self-Serving Ice Well!");
+    mesc l("Hello, my name is Mahid, and this well belongs to me!");
+    mesc l("You are allowed to fill your bottles, but BE SURE TO PAY!");
+    mesc l("Otherwise, ##BYOU'LL DIE.##b Have a nice day!");
+    next;
+
+    menu
+        l("Fill Water Bottles"), L_Bottle,
+        rif(.@q == 2, l("Jump inside!")), L_Reckless,
+        rif(.@q == 1, l("Steal bucket!")), L_Bucket,
+        rif(.@q != 1, l("Throw something inside!")), L_Throw,
+        l("Leave."), -;
+    close;
+
+// Fill a water bottle
+L_Bottle:
+    mes "";
+    mesc l("Temporaly out of order."), 1;
+    close;
+
+// Jump to Terranite Cave (requires 55 vitality minimum)
+L_Reckless:
+    closedialog;
+    warp "015-6", 363, 109;
+    percentheal -155+readparam(bVit), 0;
+    dispbottom l("Ouch! That was kinda reckless!");
     close;
 
-L_Well:
+// Easter Egg
+L_Bucket:
+    mes "";
+    percentheal -rand(10,20), 0;
     mesn strcharinfo(0);
-    mes l("Well well well, not felling well?");
-    mesc "-------------------------------------", 1;
-    mesc l("ERROR, missing item id: Frozen Water."), 1;
-    mesc l("Blame Saulc"), 1;
+    mesq l("Ouch, the bucket BITE me!");
+    close;
+
+// Main Quest
+L_Throw:
     close;
 
 OnInit: