B10002 - enlightenment grammar bug

>       In my final attributes;
>       "You had +1 bonus to hit."
>       Surely "You had a ..." ?

Also moves the hit and damage bonus feedback from the "troubles"
section to the "physical attributes" section and delivers it for
every enlightenment rather than just after the game is over.

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 795fb1dc55b4b50daba00c785e4e6d0a132575f6..a1cacce854381cf830be0c8a2daabb38ee27d26c 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -234,6 +234,7 @@ if you have converted, the quest leader banishes you instead of asking you
        to come back later, and tells you that you won't succeed without Bell
 don't state that "you narrowly avoid losing all chance" message if you try
        to put on a helm of opposite alignment in the quest after converting
+fix enlightenment feedback for bonus or penalty on damage and chance to hit
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/cmd.c b/src/cmd.c
index 411eb90f685dddafd9795f8d8840a3c30c49656e..f7db6f4c4756bba18a71ab9c0f1a5193359357d4 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -833,18 +833,6 @@ int final; /* 0 => still in progress; 1 => over, survived; 2 => dead */
                        if (u.usick_type & SICK_NONVOMITABLE)
                                you_are("sick from illness");
                }
-               /* added by JDS */
-               if (u.uhitinc) {
-                       Sprintf(buf, "%s%i %s to hit", u.uhitinc > 0 ? "+" : "",
-                               u.uhitinc, u.uhitinc > 0 ? "bonus" : "penalty");
-                       you_have(buf);
-                       
-               }
-               if (u.udaminc) {
-                       Sprintf(buf, "%s%i %s to damage", u.udaminc > 0 ? "+" : "",
-                               u.udaminc, u.udaminc > 0 ? "bonus" : "penalty");
-                       you_have(buf);
-               } /* end JDS portion */
        }
        if (Stoned) you_are("turning to stone");
        if (Slimed) you_are("turning into slime");
@@ -939,6 +927,17 @@ int final; /* 0 => still in progress; 1 => over, survived; 2 => dead */
        }
 
        /*** Physical attributes ***/
+       /* added by JDS */
+       if (u.uhitinc) {
+               Sprintf(buf, "a %s%d %s to hit", u.uhitinc > 0 ? "+" : "",
+                       u.uhitinc, u.uhitinc > 0 ? "bonus" : "penalty");
+               you_have(buf);
+       }
+       if (u.udaminc) {
+               Sprintf(buf, "a %s%d damage %s", u.udaminc > 0 ? "+" : "",
+                       u.udaminc, u.udaminc > 0 ? "bonus" : "penalty");
+               you_have(buf);
+       }
        if (Slow_digestion) you_have("slower digestion");
        if (Regeneration) enl_msg("You regenerate", "", "d", "");
        if (u.uspellprot || Protection) you_are("protected");