From: cohrs <cohrs>
Date: Sat, 17 May 2003 21:12:16 +0000 (+0000)
Subject: U442 - scroll of charging
X-Git-Tag: MOVE2GIT~1986
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=775e4e03453413bcf057966c5b68a5981cf3ff4d;p=nethack

U442 - scroll of charging
<Someone> suggested a scroll to counteract an unknown scroll of charging
that had negative effects.  Scroll of punishment already costs the same,
so that unknown behavior is already covered.  Plus, a cursed scroll of
charging already has negative effects, except in the case where the player
was confused where no negative effect from reading a cursed scroll of
charging occured.  Added such an effect (since the curse should still cause
something bad, even though the reader is confused), to drain the player's
energy.
---

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 3994c9062..7e90b81da 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -26,6 +26,7 @@ dust vortex-induced blindness should kick in immediately when blindfold
 	is removed or glop is wiped off
 prayer/unicorn-horn won't fix blindness while still engulfed in a dust
 	vortex since it will just return immediately
+being confused and reading cursed scroll of charging drains your energy
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/read.c b/src/read.c
index b14ccad82..4d84e6c47 100644
--- a/src/read.c
+++ b/src/read.c
@@ -1060,11 +1060,16 @@ register struct obj	*sobj;
 		return(1);
 	case SCR_CHARGING:
 		if (confused) {
-		    You_feel("charged up!");
-		    if (u.uen < u.uenmax)
-			u.uen = u.uenmax;
-		    else
-			u.uen = (u.uenmax += d(5,4));
+		    if (sobj->cursed) {
+			You_feel("discharged.");
+			u.uen = 0;
+		    } else {
+			You_feel("charged up!");
+			if (u.uen < u.uenmax)
+			    u.uen = u.uenmax;
+			else
+			    u.uen = (u.uenmax += d(5,4));
+		    }
 		    flags.botl = 1;
 		    break;
 		}