kill KILL_EXP flag. no more need.

diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index 205c60e..121865e 100644 (file)
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -17767,7 +17767,7 @@ B:TOUCH:UN_BONUS:10d10
 B:TOUCH:LOSE_ALL:10d10
 B:TOUCH:EXP_80:10d10
 F:UNIQUE | FORCE_SLEEP | NEVER_MOVE | ONLY_ITEM | DROP_90 | FORCE_MAXHP |
-F:DROP_GOOD | DROP_GREAT | REFLECTING | INVISIBLE | COLD_BLOOD | KILL_EXP |
+F:DROP_GOOD | DROP_GREAT | REFLECTING | INVISIBLE | COLD_BLOOD | 
 F:SMART | EMPTY_MIND | REGENERATE | POWERFUL | AURA_FIRE |
 F:EVIL | DEMON | NONLIVING | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS |
 F:RES_LITE | RES_DARK | RES_NETH | RES_WATE | RES_PLAS | RES_SHAR | RES_SOUN |
@@ -17815,8 +17815,7 @@ B:TOUCH:UN_BONUS:13d13
 B:TOUCH:LOSE_ALL:13d13
 B:TOUCH:DR_MANA:100d100
 F:FORCE_MAXHP | NEVER_MOVE | 
-F:STUPID | KILL_EXP |
-F:CAN_SWIM | CAN_FLY | 
+F:STUPID | CAN_SWIM | CAN_FLY | 
 F:NONLIVING | COLD_BLOOD | EMPTY_MIND | REGENERATE | KILL_BODY | AURA_COLD | 
 F:EVIL | DEMON | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | 
 F:RES_LITE | RES_DARK | RES_NETH | RES_WATE | RES_PLAS | RES_SHAR | RES_SOUN |
@@ -17925,7 +17924,7 @@ F:FORCE_SLEEP
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | 
 F:DROP_GOOD | DROP_GREAT | CAN_SWIM |
 F:SMART | NONLIVING | COLD_BLOOD |
-F:RES_ALL | POWERFUL | KILL_EXP |
+F:RES_ALL | POWERFUL | 
 F:NO_CONF | NO_SLEEP | NO_STUN | EMPTY_MIND | RES_TELE |
 S:1_IN_1 |
 S:BLINK | BO_MANA | BA_CHAO | BA_FIRE | TPORT  | PSY_SPEAR

diff --git a/src/defines.h b/src/defines.h
index 96f581c..14c0e30 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -3791,7 +3791,7 @@
 #define RF7_SELF_LITE_2         0x00000800  /* Monster lights itself */
 #define RF7_GUARDIAN            0x00001000  /* Guardian of a dungeon */
 #define RF7_CHAMELEON           0x00002000  /* Chameleon can change */
-#define RF7_KILL_EXP            0x00004000  /* No exp until you kill it */
+#define RF7_XXXX4XXX            0x00004000  /* Now Empty */
 #define RF7_TANUKI              0x00008000  /* Tanuki disguise */
 #define RF7_HAS_DARK_1          0x00010000  /* Monster carries darkness */
 #define RF7_SELF_DARK_1         0x00020000  /* Monster darkens itself */

diff --git a/src/init1.c b/src/init1.c
index d227e77..33d2edb 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -507,7 +507,7 @@ static cptr r_info_flags7[] =
        "SELF_LITE_2",
        "GUARDIAN",
        "CHAMELEON",
-       "KILL_EXP",
+       "XXXX4XXX",
        "TANUKI",
        "HAS_DARK_1",
        "SELF_DARK_1",

diff --git a/src/xtra2.c b/src/xtra2.c
index a39394d..533eb9d 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -1762,16 +1762,14 @@ bool mon_take_hit(int m_idx, int dam, bool *fear, cptr note)
        int                     dealt_damage;
 
        (void)COPY(&exp_mon, m_ptr, monster_type);
-       if (!(r_ptr->flags7 & RF7_KILL_EXP))
-       {
-               expdam = (m_ptr->hp > dam) ? dam : m_ptr->hp;
-
-               get_exp_from_mon(expdam, &exp_mon);
+       
+       expdam = (m_ptr->hp > dam) ? dam : m_ptr->hp;
 
-               /* Genocided by chaos patron */
-               if (!m_ptr->r_idx) m_idx = 0;
-       }
+       get_exp_from_mon(expdam, &exp_mon);
 
+       /* Genocided by chaos patron */
+       if (!m_ptr->r_idx) m_idx = 0;
+       
        /* Redraw (later) if needed */
        if (p_ptr->health_who == m_idx) p_ptr->redraw |= (PR_HEALTH);
        if (p_ptr->riding == m_idx) p_ptr->redraw |= (PR_UHEALTH);
@@ -2153,19 +2151,7 @@ msg_format("%s
                        delete_monster_idx(m_idx);
                }
 
-               /* Prevent bug of chaos patron's reward */
-               if (r_ptr->flags7 & RF7_KILL_EXP)
-               {
-                       get_exp_from_mon((long)exp_mon.max_maxhp*2, &exp_mon);
-               }
-               else
-               {
-                       u32b destroy_exp = exp_mon.max_maxhp + 1;
-                       /* Add remained exp*/
-                       if(dealt_damage < m_ptr->maxhp)
-                               destroy_exp += m_ptr->maxhp - dealt_damage;
-                       get_exp_from_mon(destroy_exp, &exp_mon);
-               }
+               get_exp_from_mon((long)exp_mon.max_maxhp*2, &exp_mon);
 
                /* Not afraid */
                (*fear) = FALSE;