Remove item manipulation from Doomsday, except for Mana Potion.

3 files changed, 9 insertions, 28 deletions

diff --git a/npc/099-2/logic.txt b/npc/099-2/logic.txt
index 8c8fe9f8..33525492 100644
--- a/npc/099-2/logic.txt
+++ b/npc/099-2/logic.txt
@@ -742,11 +742,13 @@ L_UseLens:
     mes "";
     mes "##9 Today my Rubber Bat flew away. Probably shouldn't have given life to it. ##0";
     mes "##9 I'll miss it, my dear friend, I hope one day he returns? ##0";
+    mesc l("Actually, I don't mind that anymore."), 1;
     next;
 	mes "Zax De'Kagen's Diary, entry #42";
     mes "";
     mes "##9 What I wouldn't give for some pickled beets right now... ##0";
     mes "##9 Meh, whatever. I'm not going to Dimond's Cove ever again! ##0";
+    mesc l("Actually, I don't mind that anymore."), 1;
 	close;
 }
 
@@ -755,10 +757,11 @@ L_UseLens:
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-    if (rand(60) % 2 == 0)
-        goto L_Shock;
+    //if (rand(60) % 2 == 0)
+    //    goto L_Shock;
     goto L_Potion;
 
+/*
 L_Shock:
 	mes "Some was trying to make Shock Sweets here.";
     mes "However, it doesn't seems to have been finished.";
@@ -766,6 +769,7 @@ L_Shock:
     mes "There are the initials \"To stop F.F.\" nearby.";
     mes "One can only wonder who or what F.F. is.";
 	close;
+*/
 
 L_Potion:
 	mes "Some was trying to make a Mana Potion here.";
diff --git a/npc/099-5/boss.txt b/npc/099-5/boss.txt
index 4442f943..9ee67a09 100644
--- a/npc/099-5/boss.txt
+++ b/npc/099-5/boss.txt
@@ -427,19 +427,6 @@ OnPrologue4:
     areatimer 0, "099-4", 20, 20, 75, 75, 10, "#TMWFinalExam::OnMTMusicOn";
     end;
 
-OnRubberBat:
-    if ($@DD5_STATUS != 3)
-        end;
-    areamonster getmapname(), getx()-5, gety()-5, getx()+5, gety()+5, "", VoidBat, rand(1,2), "#TMWFinalExam::OnKillWeak";
-    addtimer 10, "Zax De'Kagen#0::OnAdjustBat";
-    end;
-
-OnPickledBeets:
-    if ($@DD5_STATUS != 3)
-        end;
-    addtimer 10, "Zax De'Kagen#0::OnAdjustBeets";
-    end;
-
 OnWarmedUp0:
     stopnpctimer;
     $@DD5_STATUS = 4;
@@ -1468,11 +1455,6 @@ OnTimer50000:
 OnEnable:
     initnpctimer;
     end;
-OnAdjustSweet:
-    if ($@DD5_STATUS != 5)
-        end;
-    setnpctimer min(49000, getnpctimer(0)-rand(2500,5000));
-    end;
 OnDisable:
     stopnpctimer;
     end;
@@ -1506,14 +1488,6 @@ OnTimer90000:
     donpcevent "#TMWFinalExam::OnBlissOblivion";
     end;
 
-OnAdjustBat:
-    if (getnpctimer(0) < 18000)
-        setnpctimer max(17000, getnpctimer(0)+rand(1000,2500));
-    end;
-OnAdjustBeets:
-    if (getnpctimer(0) > 18000)
-        setnpctimer min(18000, getnpctimer(0)-rand(3000,5000));
-    end;
 OnAdjustPotion:
     if ($@DD5_STATUS != 7)
         end;
diff --git a/npc/functions/magic.txt b/npc/functions/magic.txt
index e0962a15..b4f9afab 100644
--- a/npc/functions/magic.txt
+++ b/npc/functions/magic.txt
@@ -2,6 +2,9 @@
 
 function	script	MagicGainBasic	{
     MAGIC_FLAGS = MAGIC_FLAGS | MFLAG_DRANK_POTION;
+    // Doomsday Act 5 utils
+    if (getmapname() == "099-5")
+        addtimer 10, "Zax De'Kagen#0::OnAdjustPotion";
     return;
 }