モンスター番号だけで判別できるのでDROP_CHOSENフラグを廃止。また、DROP_USEFULという全く使われてないフラグもついでに廃止しておいた。

diff --git a/lib/edit/r_info_j.txt b/lib/edit/r_info_j.txt
index e301c08..f46b957 100644 (file)
--- a/lib/edit/r_info_j.txt
+++ b/lib/edit/r_info_j.txt
@@ -757,7 +757,7 @@ B:GAZE
 B:CRUSH
 F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD | UNIQUE |
 F:RES_NETH | RES_WATE | RES_PLAS | RES_DISE | RES_NEXU |
-F:KILL_WALL | FORCE_MAXHP | CAN_SWIM | DROP_CORPSE | DROP_CHOSEN |
+F:KILL_WALL | FORCE_MAXHP | CAN_SWIM | DROP_CORPSE |
 S:1_IN_9 |
 S:TPORT | BLINK | TELE_AWAY
 D:$This unholy abomination will crush you. Flee while you can! 
@@ -6422,7 +6422,7 @@ B:HIT:HURT:3d7
 B:HIT:UN_BONUS
 F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
 F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_CHOSEN |
+F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
 F:OPEN_DOOR | BASH_DOOR | EVIL |
 F:IM_FIRE | IM_COLD | NO_CONF | NO_SLEEP | RES_TELE
 S:1_IN_8 | 
@@ -8767,7 +8767,6 @@ B:SLASH:HURT:30d1
 F:UNIQUE | MALE | CAN_SPEAK |
 F:FORCE_MAXHP | WILD_ALL | DROP_CORPSE
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
-F:DROP_CHOSEN |
 F:OPEN_DOOR | BASH_DOOR | 
 #F:TROLL | IM_COLD | IM_POIS
 F:IM_COLD | IM_POIS
@@ -9136,7 +9135,7 @@ B:HIT:EXP_20:13d1
 B:HIT:EXP_20:13d1
 B:HIT:EXP_20:13d1
 F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_60 | REGENERATE |
-F:ONLY_ITEM | DROP_CHOSEN | NO_FEAR | NONLIVING |
+F:ONLY_ITEM | NO_FEAR | NONLIVING |
 F:EVIL | IM_POIS | IM_COLD | IM_FIRE | DEMON 
 D:$Slender, red-skinned demons twisting in nightmarish shapes. 
 D:$They are armed with hellblades, which will suck the life from 
@@ -12312,7 +12311,7 @@ B:HIT:EAT_ITEM:2d10
 B:HIT:EAT_ITEM:2d10
 F:MALE | FORCE_MAXHP | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
 F:REGENERATE | NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR |
-F:RES_TELE | DROP_CHOSEN |
+F:RES_TELE |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | UNIQUE |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL |
 S:1_IN_3
@@ -13057,7 +13056,7 @@ B:SLASH:EXP_80:80d1
 B:SLASH:EXP_VAMP:8d8
 F:CHAR_MULTI | EVIL | IM_POIS | IM_COLD | IM_FIRE | RES_NETH |
 F:FORCE_SLEEP | UNIQUE | FORCE_MAXHP | CAN_FLY |
-F:COLD_BLOOD | BASH_DOOR | NONLIVING | DROP_CHOSEN |
+F:COLD_BLOOD | BASH_DOOR | NONLIVING |
 F:NO_CONF | NO_SLEEP | NO_FEAR
 D:$The mightiest of hellblades, a black runesword which thirsts for 
 D:$your soul.
@@ -13856,7 +13855,7 @@ B:SPIT:BLIND:10d5
 B:DROOL:DISEASE:8d5
 F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
 F:FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | DROP_CHOSEN |
+F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
 F:IM_POIS | IM_FIRE | NO_CONF | NO_SLEEP | EVIL | RES_TELE
 S:1_IN_6 | 
@@ -14653,7 +14652,7 @@ B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE |
 F:FORCE_SLEEP | FORCE_MAXHP | FRIENDLY |
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | DROP_CHOSEN |
+F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD |
 F:OPEN_DOOR | BASH_DOOR | 
 F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
 S:1_IN_4 | 
@@ -14683,7 +14682,7 @@ B:HIT:CONFUSE:4d8
 B:HIT:TERRIFY:5d6
 B:HIT:PARALYZE:5d6
 B:HIT:BLIND:4d8
-F:UNIQUE | MALE | AMBERITE | DROP_CORPSE | DROP_CHOSEN | HAS_LITE_2 |
+F:UNIQUE | MALE | AMBERITE | DROP_CORPSE | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | SHAPECHANGER | CAN_SPEAK |
 F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | CAN_FLY |
 F:OPEN_DOOR | BASH_DOOR | ATTR_MULTI | RES_DISE | ATTR_ANY | RES_TELE
@@ -14936,7 +14935,6 @@ B:HIT:HURT:5d5
 F:UNIQUE | MALE | ATTR_MULTI | CAN_SPEAK | FRIENDLY | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:DROP_CHOSEN |
 F:SMART | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | IM_FIRE | IM_COLD | 
 F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
@@ -14967,7 +14965,7 @@ F:UNIQUE | MALE | CAN_SPEAK | FRIENDLY | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | REFLECTING | RES_TELE |
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
 F:SMART | OPEN_DOOR | BASH_DOOR | 
-F:GOOD | IM_FIRE | IM_COLD | DROP_CHOSEN |
+F:GOOD | IM_FIRE | IM_COLD |
 F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
 S:1_IN_2 | 
 S:HEAL | HASTE | TPORT | TELE_AWAY | BLIND | CONF | SCARE | 
@@ -14999,7 +14997,6 @@ B:HIT:UN_POWER:5d5
 F:UNIQUE | MALE | ATTR_MULTI | CAN_SPEAK | AMBERITE | ATTR_ANY | RES_TELE
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE | HAS_LITE_2 |
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD |
-F:DROP_CHOSEN |
 F:SMART | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | IM_FIRE | IM_COLD |
 F:IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
@@ -15492,7 +15489,7 @@ B:HIT:POISON:8d15
 B:TOUCH:LOSE_CHR
 B:TOUCH:LOSE_CON
 F:UNIQUE | FEMALE | CAN_SPEAK | AMBERITE | ONLY_ITEM | RES_TELE
-F:DROP_CHOSEN | DROP_CORPSE | DROP_SKELETON | HAS_LITE_2 |
+F:DROP_CORPSE | DROP_SKELETON | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP |
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 |
 F:EVIL | IM_POIS | IM_ELEC | SMART | REGENERATE | OPEN_DOOR | BASH_DOOR |
@@ -15570,7 +15567,7 @@ B:HIT:LOSE_CON:1d30
 F:UNIQUE | MALE | CAN_SPEAK | AMBERITE | RES_TELE | DROP_SKELETON |
 F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP | DROP_CORPSE
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
-F:DROP_CHOSEN | HAS_LITE_2 |
+F:HAS_LITE_2 |
 F:EVIL | IM_POIS | IM_ELEC | IM_COLD | SMART | REGENERATE
 F:OPEN_DOOR | BASH_DOOR |
 S:1_IN_4 |
@@ -16298,7 +16295,6 @@ B:TOUCH:CONFUSE
 F:UNIQUE | MALE | CAN_SPEAK | POWERFUL | RES_TELE | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | DROP_SKELETON 
 F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | DROP_GOOD |
-F:DROP_CHOSEN |
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | IM_FIRE | IM_COLD | 
 F:IM_ELEC | NO_CONF | NO_SLEEP
@@ -16333,7 +16329,7 @@ F:UNIQUE | MALE | CAN_SPEAK | SMART | AMBERITE | RES_TELE | HAS_LITE_2 |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON
 F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP |
 F:DROP_4D2 | DROP_1D2 | DROP_GOOD | DROP_60 | DROP_90 | ONLY_ITEM |
-F:DROP_CHOSEN | POWERFUL |
+F:POWERFUL |
 F:EVIL |IM_COLD | IM_POIS | IM_ACID | IM_ELEC | REGENERATE
 S:1_IN_4 |
 S:SCARE | CONF | TPORT | TELE_TO | S_MONSTER | DRAIN_MANA |
@@ -16854,7 +16850,7 @@ F:UNIQUE | SELF_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS | MALE |
 F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | EVIL | AURA_FIRE | DEMON |
 F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | CAN_SPEAK |
-F:IM_FIRE | NO_CONF | NO_SLEEP | IM_POIS | HURT_COLD | GIANT | DROP_CHOSEN |
+F:IM_FIRE | NO_CONF | NO_SLEEP | IM_POIS | HURT_COLD | GIANT |
 S:1_IN_5 |
 S:BR_FIRE | BR_PLAS | BLIND | TELE_TO | S_KIN | S_HI_UNDEAD |
 S:HAND_DOOM | TELE_AWAY | S_CYBER | S_DEMON
@@ -16902,7 +16898,7 @@ B:CRUSH:SUPERHURT:8d12
 B:TOUCH:UN_POWER
 F:UNIQUE | MALE | SELF_LITE_1 | SELF_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | ESCORTS | CAN_FLY | DROP_CHOSEN |
+F:ESCORT | ESCORTS | CAN_FLY |
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
 F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
 F:EVIL | DEMON | IM_FIRE | 
@@ -17406,7 +17402,7 @@ B:HIT:FIRE:9d12
 B:CRUSH:SUPERHURT:8d12
 B:TOUCH:UN_POWER
 F:UNIQUE | MALE | CAN_SPEAK | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP | DROP_CHOSEN |
+F:FORCE_SLEEP | FORCE_MAXHP |
 F:ESCORT | ESCORTS | KILL_WALL | AURA_FIRE | NONLIVING |
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
 F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
@@ -17481,7 +17477,6 @@ B:TOUCH:UN_POWER
 F:UNIQUE | MALE | CAN_SPEAK | REFLECTING | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP |
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:DROP_CHOSEN |
 F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | 
 F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
 F:NO_CONF | NO_SLEEP | NO_FEAR | RES_TELE | POWERFUL |
@@ -17513,7 +17508,7 @@ B:BITE:TIME:11d11
 F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | 
 F:REFLECTING | AURA_COLD | AURA_ELEC |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | 
-F:DROP_GOOD | DROP_GREAT | DROP_CHOSEN | RES_NETH |
+F:DROP_GOOD | DROP_GREAT | RES_NETH |
 F:RES_WATE | RES_PLAS | RES_NEXU | RES_DISE |
 F:SMART | KILL_BODY | POWERFUL | SELF_LITE_1 |
 F:REGENERATE | NONLIVING | CAN_FLY |
@@ -17560,7 +17555,7 @@ F:UNIQUE | QUESTOR | MALE | CAN_SPEAK | DROP_CORPSE | HAS_LITE_2 |
 F:ATTR_MULTI | AMBERITE | RES_TELE
 F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | 
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:DROP_CHOSEN | REFLECTING | AURA_FIRE | AURA_ELEC
+F:REFLECTING | AURA_FIRE | AURA_ELEC
 F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | 
 F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | POWERFUL |
 F:NO_CONF | NO_SLEEP | NO_FEAR
@@ -17612,7 +17607,7 @@ B:TOUCH:UN_POWER
 F:UNIQUE | MALE | 
 F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | 
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | DROP_CHOSEN |
+F:DROP_GOOD | DROP_GREAT |
 F:SMART | KILL_WALL | MOVE_BODY | AURA_COLD |
 F:REGENERATE | POWERFUL |
 F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
@@ -17662,7 +17657,7 @@ F:UNIQUE | QUESTOR | CAN_SPEAK | ATTR_MULTI | ATTR_ANY |
 F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | SELF_LITE_1 |
 F:REFLECTING | AURA_FIRE | AURA_ELEC | AURA_COLD |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | DROP_CHOSEN | RES_NETH |
+F:DROP_GOOD | DROP_GREAT | RES_NETH |
 F:SMART | KILL_WALL | KILL_BODY | POWERFUL |
 F:REGENERATE | NONLIVING | CAN_FLY | RIDING |
 F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
@@ -17717,7 +17712,7 @@ 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:SMART | EMPTY_MIND | REGENERATE | POWERFUL | AURA_FIRE | DROP_CHOSEN |
+F:SMART | EMPTY_MIND | REGENERATE | POWERFUL | AURA_FIRE |
 F:EVIL | DEMON | NONLIVING | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS |  
 F:RES_TELE | RES_NETH | RES_WATE | RES_PLAS | RES_NEXU | RES_DISE | 
 F:NO_FEAR | NO_CONF | NO_STUN | NO_SLEEP | 
@@ -17891,7 +17886,7 @@ B:CRUSH:UN_BONUS:5d12
 F:UNIQUE |
 F:ATTR_MULTI | 
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | ANIMAL |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_GOOD | DROP_CHOSEN |
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_GOOD |
 F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | CAN_SWIM | RES_WATE |
 F:EVIL | IM_FIRE | IM_COLD | IM_POIS | IM_ELEC | NO_CONF | NO_SLEEP
 S:1_IN_2 | 
@@ -17910,7 +17905,7 @@ B:KICK:HURT:7d10
 B:HIT:UN_POWER:7d8
 F:UNIQUE | MALE | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:ONLY_ITEM | DROP_1D2 | DROP_3D2 | DROP_GOOD | DROP_GREAT | DROP_CHOSEN |
+F:ONLY_ITEM | DROP_1D2 | DROP_3D2 | DROP_GOOD | DROP_GREAT |
 F:OPEN_DOOR | POWERFUL | MOVE_BODY | CAN_SWIM |
 F:GOOD | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | 
 F:RES_TELE | RES_NETH | RES_WATE | RES_PLAS | RES_NEXU | RES_DISE |
@@ -18010,7 +18005,7 @@ B:SPIT:BLIND:10d10
 B:HIT:LOSE_CON:10d10
 F:UNIQUE | MALE | 
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | CAN_FLY | AURA_COLD |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | DROP_CHOSEN |
+F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT |
 F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | 
 F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE |
 F:NO_CONF | NO_SLEEP | RES_TELE | REFLECTING |
@@ -19640,7 +19635,7 @@ B:HIT:HURT:8d15
 B:HIT:HURT:8d15
 B:HIT:SUPERHURT:8d15
 B:HIT:SUPERHURT:8d15
-F:UNIQUE | MALE | FORCE_MAXHP | DROP_60 | DROP_GOOD | DROP_CHOSEN |
+F:UNIQUE | MALE | FORCE_MAXHP | DROP_60 | DROP_GOOD |
 F:DROP_1D2 | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL | IM_FIRE |
 F:TAKE_ITEM | CAN_SPEAK | EVIL | NO_FEAR | NO_CONF | NO_SLEEP | 
 F:CAN_SWIM | DROP_CORPSE | AURA_FIRE | HAS_LITE_2 |
@@ -19759,7 +19754,7 @@ B:HIT:HURT:10d11
 B:HIT:HURT:10d11
 F:UNIQUE | MALE | CAN_SPEAK | FORCE_MAXHP | ESCORT | 
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD | DROP_CORPSE |
-F:OPEN_DOOR | BASH_DOOR | CAN_SWIM | AURA_ELEC | DROP_CHOSEN |
+F:OPEN_DOOR | BASH_DOOR | CAN_SWIM | AURA_ELEC |
 F:EVIL | GIANT | IM_POIS | IM_FIRE | IM_ELEC
 D:ðÇȤιñ¤ÎÂç¹¾»³¤ò¤Í¤°¤é¤È¤·¡¢µþ¤ÎÅÔ¤ò½±¤Ã¤Æ¤ÏºâÊõ¤È̼¤ò
 D:Ã¥¤¦¶§°­¤Êµ´¤É¤â¤Î¼óÎΤÀ¡£
@@ -20153,7 +20148,7 @@ B:HIT:HURT:4d5
 B:HIT:HURT:4d5
 F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE |
 F:FORCE_SLEEP | FORCE_MAXHP | HAS_LITE_1 |
-F:DROP_1D2 | ONLY_ITEM | DROP_GOOD | DROP_CHOSEN |
+F:DROP_1D2 | ONLY_ITEM | DROP_GOOD |
 F:OPEN_DOOR | GOOD | CAN_SWIM |
 F:NO_CONF | NO_SLEEP | FRIENDLY | TAKE_ITEM |
 S:1_IN_5 |
@@ -20266,7 +20261,7 @@ W:50:100:0:1:0:0
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
 F:FORCE_MAXHP | FORCE_SLEEP |
-F:DROP_CHOSEN | CAN_FLY | UNIQUE2 |
+F:CAN_FLY | UNIQUE2 |
 F:TAKE_ITEM | OPEN_DOOR |
 F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | NO_CONF | NO_SLEEP
 S:1_IN_3 | 
@@ -20282,7 +20277,7 @@ I:130:30d10:30:50:255
 W:30:30:0:1:10000:1010
 B:TOUCH:EAT_GOLD
 F:FORCE_MAXHP | FORCE_SLEEP |
-F:DROP_CHOSEN | CAN_FLY | UNIQUE2 |
+F:CAN_FLY | UNIQUE2 |
 F:TAKE_ITEM | OPEN_DOOR |
 F:IM_FIRE | IM_COLD | IM_ELEC | IM_ACID | IM_POIS | NO_CONF | NO_SLEEP
 S:1_IN_3 | 
@@ -21187,7 +21182,7 @@ B:HIT:HURT:25d1
 B:HIT:HURT:30d1
 F:UNIQUE | MALE | WEIRD_MIND | CAN_SPEAK |
 F:FORCE_MAXHP | WILD_ALL | DROP_CORPSE
-#F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_CHOSEN |
+#F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
 F:OPEN_DOOR | BASH_DOOR | 
 F:TROLL | IM_COLD | IM_POIS
 D:$He who laughs at Groo's brains will find there is nothing to laugh 

diff --git a/src/defines.h b/src/defines.h
index b6fdec6..998a7b6 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -3122,8 +3122,8 @@
 #define RF1_DROP_4D2            0x08000000  /* Drop 4d2 items/gold */
 #define RF1_DROP_GOOD           0x10000000  /* Drop good items */
 #define RF1_DROP_GREAT          0x20000000  /* Drop great items */
-#define RF1_DROP_USEFUL         0x40000000  /* Drop "useful" items */
-#define RF1_DROP_CHOSEN         0x80000000  /* Drop "chosen" items */
+#define RF1_XXX1                0x40000000  /* XXX */
+#define RF1_XXX2                0x80000000  /* XXX */
 
 /*
  * New monster race bit flags

diff --git a/src/init1.c b/src/init1.c
index dfe27e3..e962829 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -168,8 +168,8 @@ static cptr r_info_flags1[] =
        "DROP_4D2",
        "DROP_GOOD",
        "DROP_GREAT",
-       "DROP_USEFUL",
-       "DROP_CHOSEN"
+       "XXX1",
+       "XXX2"
 };
 
 /*

diff --git a/src/wizard1.c b/src/wizard1.c
index 678751c..fc7cc16 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -2907,10 +2907,6 @@ sprintf(buf, " %d 
                        {
                                spoil_out(" good object");
                        }
-                       else if (flags1 & (RF1_DROP_USEFUL))
-                       {
-                               spoil_out(" useful object");
-                       }
                        else if (flags1 & (RF1_ONLY_ITEM))
                        {
                                spoil_out(" object");
@@ -2927,11 +2923,6 @@ sprintf(buf, " %d 
                        }
                        if (i > 1) spoil_out("s");
 
-                       if (flags1 & (RF1_DROP_CHOSEN))
-                       {
-                               spoil_out(", in addition to chosen objects");
-                       }
-
                        spoil_out(".  ");
                }
 

diff --git a/src/xtra2.c b/src/xtra2.c
index e7d8d47..d5a93c6 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -985,7 +985,7 @@ msg_print("
                (void)drop_near(q_ptr, -1, y, x);
        }
 
-       else if ((r_ptr->d_char == '|') && !(r_ptr->flags1 & RF1_DROP_CHOSEN) &&
+       else if ((r_ptr->d_char == '|') && !(m_ptr->r_idx == MON_STORMBRINGER) &&
            !(p_ptr->inside_arena || p_ptr->inside_battle))
        {
                /* Get local object */
@@ -1087,7 +1087,7 @@ msg_print("
                (void)drop_near(q_ptr, -1, y, x);
        }
        /* Mega-Hack -- drop "winner" treasures */
-       else if (r_ptr->flags1 & RF1_DROP_CHOSEN)
+       else
        {
                if (m_ptr->r_idx == MON_SERPENT)