Rebalance a bit the new chests and spread them!

6 files changed, 32 insertions, 6 deletions

diff --git a/npc/006-5/groata.txt b/npc/006-5/groata.txt
index f57856240..596e16cf7 100644
--- a/npc/006-5/groata.txt
+++ b/npc/006-5/groata.txt
@@ -192,6 +192,7 @@ function	script	GroataGrotto	{
         array_push(.@mb, Junglefowl);
         array_push(.@mb, Tengu);
         array_push(.@mb, Moubi);
+        array_push(.@mb, MalignChest);
     }
     if (.@lv > 130) {
         array_push(.@mb, SuperiorShroom);
@@ -206,6 +207,7 @@ function	script	GroataGrotto	{
         array_push(.@mb, WaterElement);
         array_push(.@mb, EarthElement);
         array_push(.@mb, WindElement);
+        array_push(.@mb, ThornChest);
     }
     if (.@lv > 150) {
         array_push(.@mb, SacredWisp);
@@ -213,8 +215,10 @@ function	script	GroataGrotto	{
         array_push(.@mb, PanthomWisp);
         array_push(.@mb, EpiphanyWisp);
     }
-    if (.@lv > 175)
+    if (.@lv > 175) {
         array_push(.@mb, Tortuga);
+        array_push(.@mb, WildxChest);
+    }
 
     /* Spawn them and make hostile */
     freeloop(true);
diff --git a/npc/018-2-2/main.txt b/npc/018-2-2/main.txt
index 671ec4e6e..6c068be84 100644
--- a/npc/018-2-2/main.txt
+++ b/npc/018-2-2/main.txt
@@ -147,9 +147,9 @@ OnInit:
 
     // Master
     setarray .Master_Mobs, PrismChest,BlueSlime,MurdererScorpion,Tipiou,AlphaMouboo,BanditLord,Tipiu,GreenDragon,GiantMutatedBat,FallenKing1,
-                           FallenKing2, EvilScythe, YetiKing, Tipiu, Yetifly, WildxChest, PsiConscience, Birb, EvilChest;
+                           FallenKing2, EvilScythe, YetiKing, Tipiu, Yetifly, WildxChest, PsiConscience, Birb, EvilChest, MalignChest;
     setarray .Master_Ammo,           2,      140,              20,    20,         20,        20,   20,         19,             19,          9,
-                                     9,         1,         6,     8,       3,          2,             1,    1,         5;
+                                     9,         1,         6,     8,       3,          1,             1,    1,         5,           2;
 
     end;
 
@@ -788,6 +788,12 @@ OnMaster18:
     fix_mobkill(.Master_Mobs[18]);
     }
     areamonster "018-2-5@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[18]), .Master_Mobs[18], 1, "#HH_CONTROLLER01::OnMaster18"; end;
+OnMaster19:
+    if (playerattached()) {
+        if (rand2(0, 2000) <= readparam2(bLuk)+(strmobinfo(3,.Master_Mobs[19])*4)+strmobinfo(7,.Master_Mobs[19])) {getmapxy(.@m$, .@x, .@y, 0); makeitem(HeroCoin, 16, .@m$, .@x, .@y);}
+    fix_mobkill(.Master_Mobs[19]);
+    }
+    areamonster "018-2-5@Ma", 20, 20, 220, 220, strmobinfo(1, .Master_Mobs[19]), .Master_Mobs[19], 1, "#HH_CONTROLLER01::OnMaster19"; end;
 
 }
 
diff --git a/npc/034-4/exit.txt b/npc/034-4/exit.txt
index ef8fcc8ff..f2c6c24ee 100644
--- a/npc/034-4/exit.txt
+++ b/npc/034-4/exit.txt
@@ -73,8 +73,10 @@ OnTouch:
     .@mb[0] = MagicGoblin;
     .@mb[1] = CaveMaggot;
     array_push(.@mb, BronzeChest);
+    array_push(.@mb, MalignChest);
     array_push(.@mb, SmallMagicBif);
     array_push(.@mb, Bif);
+    array_push(.@mb, EvilChest);
     array_push(.@mb, RobinBandit);
     array_push(.@mb, SilverChest);
     array_push(.@mb, DustGatling);
@@ -82,6 +84,7 @@ OnTouch:
     array_push(.@mb, DustRifle);
     array_push(.@mb, DustRevolver);
     array_push(.@mb, GoldenChest);
+    array_push(.@mb, GoldenMimic);
     array_push(.@mb, GreatMoubooSlime);
     array_push(.@mb, Piousse);
     array_push(.@mb, ManaPiou);
diff --git a/npc/functions/maze.txt b/npc/functions/maze.txt
index 40de85c55..59d2cb76b 100644
--- a/npc/functions/maze.txt
+++ b/npc/functions/maze.txt
@@ -157,7 +157,6 @@ function	script	MazeMobs	{
     .@mb[1] = CaveMaggot;
 
     // Artillery & Chests
-    // TODO: Mimics?
     if (getarg(1, true)) {
         if (.@lv > 10)
             array_push(.@mb, BronzeChest);
@@ -181,6 +180,15 @@ function	script	MazeMobs	{
             array_push(.@mb, BigMagicBif);
         if (.@lv > 105)
             array_push(.@mb, PrismChest);
+        // Special Chests
+        if (.@lv >= 120)
+            array_push(.@mb, ThornChest);
+        if (.@lv >= 135)
+            array_push(.@mb, WildxChest);
+        if (.@lv >= 150)
+            array_push(.@mb, ManaChest);
+        if (.@lv >= 175)
+            array_push(.@mb, MalignChest);
     }
     if (.@lv > 40)
         array_push(.@mb, RobinBandit);
diff --git a/npc/functions/mobspecial.txt b/npc/functions/mobspecial.txt
index 60f5b8d26..cfd4d5ef6 100644
--- a/npc/functions/mobspecial.txt
+++ b/npc/functions/mobspecial.txt
@@ -14,12 +14,14 @@ function	script	mobspecial	{
         percentheal 90, 75;
         break;
     case ThornChest:
+        percentheal 0, 10;
         callfunc "SC_Bonus", (200-readparam2(bVit))/20, SC_POISON, 1;
-        //callfunc "SC_Bonus", (200-readparam2(bVit))/20, SC_STUN, 1;
+        callfunc "SC_Bonus", (200-readparam2(bVit))/40, SC_CURSE, 1;
         break;
     case MalignChest:
         percentheal -30, 0;
-        callfunc "SC_Bonus", (200-readparam2(bVit))/20, any(SC_BLOODING, SC_CURSE), 1;
+        callfunc "SC_Bonus", (200-readparam2(bVit))/20, SC_BLOODING, 1;
+        callfunc "SC_Bonus", (200-readparam2(bVit))/20, SC_CURSE, 1;
         break;
     }
     return;
diff --git a/npc/items/shovel.txt b/npc/items/shovel.txt
index 04aaedfff..a9a8583de 100644
--- a/npc/items/shovel.txt
+++ b/npc/items/shovel.txt
@@ -544,6 +544,9 @@ function	script	shovel_randomdungeon	{
         array_push(.@mob, SilverChest);
     if (.@mz & MAZE_SIZE_S)
         array_push(.@mob, BronzeChest);
+    // Only sometimes, you'll find mana chests inside, which replenish you
+    if (any(true, false, (.@mz & MAZE_SIZE_G), (.@mz & MAZE_SIZE_X), (.@mz & MAZE_SIZE_A), (ShovelQuests_DungeonMAP$ == "025-4-1"), (ShovelQuests_DungeonMAP$ == "032-2")))
+        array_push(.@mob, ManaChest);
 
     // Spawn & Configure the boss monster
     .@mx=getmapinfo(MAPINFO_SIZE_X, MAZE_MAP$)-20;