Re: CF: slaying and immune

[KAWAMOTO Yosihisa <>]

Hello.

Sorry.  I understand the my old patch is not good.

Eric advised me that slaying should only bypass immune if monster
attacked by slay one.  That's true.  And I received the another
patch for attack.c from CFJP mailing list.

Doesn't this patch work fine?  This code makes immunity bypass if
and only if monster is attacked by slay one.
-- 
iKAWAMOTO Yosihisa!               

*** attack.c		Tue Jan  2 20:58:39 1996
--- attack.c.new	Wed May 29 13:11:00 1996
***************
*** 470,485 ****
     * Nov 95 - modified it so that strstr was used to allow comma delimited
     * list. -b.t. 
     */
!   if (hitter->slaying) {
!     if ((op->race != NULL && strstr(op->race,hitter->slaying))||
  #ifndef MULTIPLE_GODS
        (strstr(hitter->slaying, undead_name) && QUERY_FLAG(op,FLAG_UNDEAD)) ||
  #endif
         (op->arch && op->arch->name!=NULL && strstr(op->arch->name,
! 	hitter->slaying)))
!     {
          dam *= 3; /* Ouch 8) */
-     }
    }
    else if (op->immune&type)
    {
--- 470,484 ----
     * Nov 95 - modified it so that strstr was used to allow comma delimited
     * list. -b.t. 
     */
!   if ((hitter->slaying) &&
!       ((op->race != NULL && strstr(op->race,hitter->slaying))||
  #ifndef MULTIPLE_GODS
        (strstr(hitter->slaying, undead_name) && QUERY_FLAG(op,FLAG_UNDEAD)) ||
  #endif
         (op->arch && op->arch->name!=NULL && strstr(op->arch->name,
! 	hitter->slaying))))
!   {
          dam *= 3; /* Ouch 8) */
    }
    else if (op->immune&type)
    {