Add better support for deadly poison

3 files changed, 39 insertions, 21 deletions

diff --git a/db/pre-re/mob_skill_db.conf b/db/pre-re/mob_skill_db.conf
index 489cd07d..dae0c003 100644
--- a/db/pre-re/mob_skill_db.conf
+++ b/db/pre-re/mob_skill_db.conf
@@ -294,5 +294,21 @@ SKILL_COND2 = {
 		}
 	}
 
+	/**********************************************************************/
+    // Note: Cannot explode if poisoned
+	BallLightning: {
+		NPC_SELFDESTRUCTION: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 3
+			Rate: 10000
+			CastTime: 500
+			Delay: 3000
+			Cancelable: true
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_MYSTATUSOFF"
+			ConditionData: "SC_POISON"
+		}
+	}
+
 }
 )
diff --git a/npc/009-2/doctor.txt b/npc/009-2/doctor.txt
index 9d6093cc..e829a4ae 100644
--- a/npc/009-2/doctor.txt
+++ b/npc/009-2/doctor.txt
@@ -2,10 +2,10 @@
 009-2,148,25,0	script	Doctor	NPC107,{
     @inspector = ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
 
-    if (getequipid(equip_head) == 616) goto L_Axe;
-    if (getequipid(equip_head) == 621) goto L_EyePatch;
+    if (isequipped(AxeHat)) goto L_Axe;
+    if (isequipped(Eyepatch)) goto L_EyePatch;
 
-    mes "[Doctor]";
+    mesn;
     mes "\"Hello, can I help you?\"";
     next;
 
@@ -19,42 +19,43 @@
         "No, I feel fine.", L_Next;
 
 L_Next:
-    mes "[Doctor]";
-    mes "\"Then please stop wasting my precious time.\"";
+    mesn;
+    mesq l("Then please stop wasting my precious time.");
     goto L_close;
 
 L_Cure:
-    mes "[Doctor]";
-    if (sc_check(SC_POISON))
+    mesn;
+    if (sc_check(SC_POISON) || sc_check(SC_DPOISON))
         goto L_CurePoison;
-    mes "The doctor examines you briefly.";
-    mes "\"Nonsense!  You look fine and dandy to me. All you need is a bit more exercise and fresh fruit in your diet!\"";
+    mesc l("The doctor examines you briefly.");
+    mesq l("Nonsense! You look fine and dandy to me. All you need is a bit more exercise and fresh fruit in your diet!");
     goto L_close;
 
 L_CurePoison:
-    mes "\"Well, well, well!  Look at all those green bubbles coming out of your head; that looks like poisoning to me!  Did you eat something rotten?\"";
+    mesq l("Well, well, well! Look at all those green bubbles coming out of your head; that looks like poisoning to me!  Did you eat something rotten?");
     next;
-    mes "[Doctor]";
-    mes "The doctor pulls out a syringe and fills it with a white liquid from a jar on his desk.";
-    mes "\"Now hold still, this won't hurt a bit...\"";
+    mesn;
+    mesc l("The doctor pulls out a syringe and fills it with a white liquid from a jar on his desk.");
+    mesq l("Now hold still, this won't hurt a bit...");
     next;
-    mes "[Doctor]";
+    mesn;
     sc_end(SC_POISON);
+    sc_end(SC_DPOISON);
     sc_end(SC_SLOWPOISON);
     mes "*Ouch!*";
     mes "\"Next time, be more careful!  Make sure to cook any meats before you eat them, and don't eat fish once it starts to smell.\"";
     goto L_close;
 
 L_Axe:
-    mes "[Doctor]";
+    mesn;
     mes "\"Oh my, what happened to you?\"";
     next;
-    mes "[Doctor]";
+    mesn;
     mes "\"Wait. Thats just a fake. Shame on you!\"";
     goto L_close;
 
 L_EyePatch:
-    mes "[Doctor]";
+    mesn;
     mes "\"Would you like a glass eye to replace that eye patch you have? We just got a whole load of them in today. I'll even let you keep the patch as a souvenir.\"";
     next;
     menu
@@ -62,21 +63,21 @@ L_EyePatch:
         "No thank you", L_Next1;
 
 L_Next1:
-    mes "[Doctor]";
+    mesn;
     mes "\"If you change your mind, please come back and see me.\"";
     goto L_close;
 
 L_EyePatch_GlassEye:
-    mes "[Doctor]";
+    mesn;
     mes "\"Now, where did I put that box of eyes...\"";
     mes "He goes off to look for them and comes back empty handed.";
     next;
-    mes "[Doctor]";
+    mesn;
     mes "\"I can't seem to find where I put that box. You should come back later, I may have found them by then.\"";
     goto L_close;
 
 L_NohMask:
-    mes "[Doctor]";
+    mesn;
     mes "\"No, I haven't seen anything.\"";
     goto L_close;
 
diff --git a/npc/magic/final.txt b/npc/magic/final.txt
index 58039248..78c171b6 100644
--- a/npc/magic/final.txt
+++ b/npc/magic/final.txt
@@ -230,6 +230,7 @@ function	script	HUB_PCBonus	{
         .@l=5*getskilllv(SKILL_RESIST_POISON);
         bonus2(bResEff, Eff_Silence, .@l);
         bonus2(bResEff, Eff_Poison,  .@l);
+        bonus2(bResEff, Eff_DPoison, .@l);
         bonus2(bResEff, Eff_Curse,   .@l);
         bonus2(bResEff, Eff_Blind,   .@l);
     }