モンスターの耐性の調整. 話し合いによる変更点は次の通り.

* HURT_LITEの引継ぎでRES_DARKが与えられていた部分の調整. アンデッドや
  デーモンにRES_DARKがある場合は原則としてまだ残している.
* GHB/LHBにはRES_ALLとRES_TELE以外のRES_*を追加.
* 『秩序のユニコーン』, ビルダー帝国帝王『ボ帝ビル』からRES_SHAR削除.
* アルコン以上の善良な天使 (ユニーク含む) にRES_LITE追加.
* 堕天使にRES_DARK追加.
* 全てにして一つのもの『ヨグ=ソトート』, 『ディオ・ブランドー』, 時を
  統べる者『リチャード・ウォン』タイタン族の王『クロノス』にRES_TIME
  追加.
* サイヤ人『ナッパ』にRES_WALL追加.

diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index 2552229..05d72bf 100644 (file)
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -655,7 +655,7 @@ W:1:1:0:4:5:58
 B:CRAWL:POISON:1d5
 F:RAND_50 | RAND_25 | CAN_SWIM |
 F:STUPID | WEIRD_MIND | MULTIPLY | 
-F:ANIMAL | IM_POIS | RES_DARK | HURT_LITE | NO_FEAR
+F:ANIMAL | IM_POIS | HURT_LITE | NO_FEAR
 D:$It is a large slimy mass of worms.
 D:¤½¤ì¤Ï¥Ù¥È¥Ù¥È¤·¤¿¥¤¥â¥à¥·¤ÎÂç·²¤À¡£
 
@@ -667,7 +667,7 @@ I:110:3d6:2:6:10
 W:1:1:0:3:0:0
 B:GAZE:PARALYZE
 F:NEVER_MOVE | CAN_FLY | DROP_CORPSE
-F:HURT_LITE | RES_DARK | NO_FEAR | EAT_SLEEP
+F:HURT_LITE | NO_FEAR | EAT_SLEEP
 D:$A disembodied eye, floating a few feet above the ground.
 D:ÃÏÌ̤«¤é¿ô½½¥»¥ó¥Á¾å¤ËÉ⤫¤ó¤Ç¤¤¤ëÂΤò»ý¤¿¤Ê¤¤Ì̤ܶÀ¡£
 
@@ -757,7 +757,8 @@ B:GAZE
 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:RES_LITE | RES_DARK | RES_NETH | RES_WATE | RES_PLAS | RES_SHAR | RES_SOUN |
+F:RES_CHAO | RES_NEXU | RES_DISE | RES_WALL | RES_INER | RES_TIME | RES_GRAV |
 F:KILL_WALL | FORCE_MAXHP | CAN_SWIM | DROP_CORPSE |
 S:1_IN_9 |
 S:TPORT | BLINK | TELE_AWAY
@@ -898,7 +899,7 @@ W:2:1:0:12:6:66
 B:TOUCH:DR_MANA:1d3
 F:NEVER_MOVE | CAN_SWIM |
 F:STUPID | EMPTY_MIND | 
-F:IM_POIS | RES_DARK | HURT_LITE | 
+F:IM_POIS | HURT_LITE | 
 F:NO_CONF | NO_SLEEP | NO_FEAR
 D:$Its a large pile of white flesh.
 D:¤½¤ì¤ÏÇò¤¤Æù¤Î¤è¤¦¤Êʪ¼Á¤Î²ô¤À¡£
@@ -1043,7 +1044,7 @@ W:2:1:0:5:8:78
 B:CRAWL:ACID:1d6
 F:RAND_50 | RAND_25 | 
 F:STUPID | WEIRD_MIND | MULTIPLY | 
-F:ANIMAL | IM_ACID | RES_DARK | CAN_SWIM | 
+F:ANIMAL | IM_ACID | CAN_SWIM | 
 F:HURT_LITE | NO_FEAR
 D:$It is a large slimy mass of worms.
 D:¤½¤ì¤Ï¥Ù¥È¥Ù¥È¤·¤¿¥¤¥â¥à¥·¤ÎÂç·²¤À¡£
@@ -1071,7 +1072,7 @@ W:2:1:0:9:30:127
 B:BITE:HURT:1d5
 F:FRIENDS | 
 F:WEIRD_MIND | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
-F:ANIMAL | HURT_LITE | RES_DARK
+F:ANIMAL | HURT_LITE
 D:$It is a black spider that moves in fits and starts.
 D:¤½¤ì¤Ï¹õ¤¤ÃØéá¤ÇȯºîŪ¤ËÆÍÇ¡Æ°¤­½Ð¤¹¡£
 
@@ -1181,7 +1182,7 @@ W:3:1:0:13:20:73
 B:TOUCH:POISON:1d7
 F:NEVER_MOVE | CAN_SWIM |
 F:STUPID | EMPTY_MIND | 
-F:IM_POIS | RES_DARK | HURT_LITE | 
+F:IM_POIS | HURT_LITE | 
 F:NO_CONF | NO_SLEEP | NO_FEAR
 S:1_IN_15 | 
 S:DRAIN_MANA
@@ -1350,7 +1351,7 @@ W:3:2:0:5:10:89
 B:CRAWL:LOSE_DEX:1d5
 F:RAND_50 | RAND_25 | CAN_SWIM |
 F:STUPID | WEIRD_MIND | MULTIPLY | EAT_LOSE_DEX |
-F:ANIMAL | HURT_LITE | RES_DARK | NO_FEAR
+F:ANIMAL | HURT_LITE | NO_FEAR
 D:$It is a large slimy mass of worms.
 D:¤½¤ì¤Ï¥Ù¥È¥Ù¥È¤·¤¿¥¤¥â¥à¥·¤ÎÂç·²¤À¡£
 
@@ -1365,7 +1366,7 @@ F:ATTR_CLEAR | CAN_SWIM |
 F:RAND_50 | RAND_25 | 
 F:STUPID | WEIRD_MIND | INVISIBLE | MULTIPLY | 
 F:ANIMAL | EAT_CONF | EAT_POISONOUS
-F:IM_POIS | RES_DARK | HURT_LITE | NO_FEAR
+F:IM_POIS | HURT_LITE | NO_FEAR
 D:$It is a disgusting mass of poisonous worms.
 D:¤½¤ì¤ÏÆǤò»ý¤Ã¤¿±ø¤é¤ï¤·¤¤¥¤¥â¥à¥·¤ÎÂç·²¤À¡£
 
@@ -1377,7 +1378,7 @@ I:110:3d6:2:6:10
 W:3:1:0:7:0:0
 B:GAZE:LOSE_STR:1d10
 F:NEVER_MOVE | CAN_FLY | DROP_CORPSE | SELF_LITE_1 |
-F:HURT_LITE | RES_DARK | NO_FEAR | EAT_MANA | EAT_LOSE_STR
+F:HURT_LITE | NO_FEAR | EAT_MANA | EAT_LOSE_STR
 S:1_IN_11 | 
 S:DRAIN_MANA
 D:$A disembodied eye, crackling with energy.
@@ -1433,7 +1434,7 @@ W:4:1:0:14:30:101
 B:TOUCH:COLD:2d5
 F:NEVER_MOVE | COLD_BLOOD | 
 F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_COLD | RES_DARK | HURT_LITE | 
+F:IM_COLD | HURT_LITE | 
 F:NO_CONF | NO_SLEEP | NO_FEAR
 D:$It's a large pile of pulsing blue flesh.
 D:¤½¤ì¤ÏÌ®ÂǤÄÀĤ¤Æù¤Î¤è¤¦¤Êʪ¼Á¤Î²ô¤À¡£
@@ -1505,7 +1506,7 @@ W:4:1:0:5:20:105
 B:CRAWL:COLD:1d7
 F:RAND_50 | RAND_25 | 
 F:STUPID | WEIRD_MIND | COLD_BLOOD | MULTIPLY | 
-F:ANIMAL | IM_COLD | RES_DARK | CAN_SWIM |
+F:ANIMAL | IM_COLD | CAN_SWIM |
 F:HURT_LITE | NO_FEAR
 D:$It is a large slimy mass of worms.
 D:¤½¤ì¤Ï¥Ù¥È¥Ù¥È¤·¤¿¥¤¥â¥à¥·¤ÎÂç·²¤À¡£
@@ -1681,7 +1682,7 @@ W:5:1:0:18:40:131
 B:TOUCH:ACID:1d4
 F:NEVER_MOVE | 
 F:STUPID | EMPTY_MIND | CAN_SWIM |
-F:IM_ACID | RES_DARK | HURT_LITE | 
+F:IM_ACID | HURT_LITE | 
 F:NO_CONF | NO_SLEEP | NO_FEAR
 D:$It is a large pile of pulsing green flesh.
 D:¤½¤ì¤ÏÌ®ÂǤÄÎ理ÎÆù¤Î¤è¤¦¤Êʪ¼Á¤Î²ô¤À¡£
@@ -1721,7 +1722,7 @@ W:5:2:0:20:0:0
 B:GAZE:UN_BONUS
 F:ATTR_MULTI | ATTR_ANY | RES_DISE | DROP_CORPSE
 F:NEVER_MOVE | CAN_FLY | EAT_MANA |
-F:HURT_LITE | RES_DARK | NO_FEAR
+F:HURT_LITE | NO_FEAR
 S:1_IN_9 | 
 S:DRAIN_MANA
 D:$A disembodied eye, crackling with magic.
@@ -1736,7 +1737,7 @@ W:5:1:0:6:80:876
 B:CRAWL:FIRE:1d9
 F:RAND_50 | RAND_25 | 
 F:STUPID | EMPTY_MIND | MULTIPLY | BASH_DOOR | 
-F:ANIMAL | IM_FIRE | RES_DARK | CAN_SWIM |
+F:ANIMAL | IM_FIRE | CAN_SWIM |
 F:HURT_LITE | NO_FEAR
 D:$It is a large slimy mass of worms.
 D:¤½¤ì¤Ï¥Ù¥È¥Ù¥È¤·¤¿¥¤¥â¥à¥·¤ÎÂç·²¤À¡£
@@ -2100,7 +2101,7 @@ I:110:5d8:2:6:10
 W:7:3:0:15:0:0
 B:GAZE:BLIND:2d7
 F:NEVER_MOVE | CAN_FLY | DROP_CORPSE
-F:HURT_LITE | RES_DARK | NO_FEAR | EAT_BLIND
+F:HURT_LITE | NO_FEAR | EAT_BLIND
 S:1_IN_7 | 
 S:DRAIN_MANA
 D:$A disembodied eye, bloodshot and nasty.
@@ -2130,7 +2131,7 @@ W:7:1:0:26:150:212
 B:TOUCH:LOSE_STR:1d6
 F:NEVER_MOVE | 
 F:STUPID | EMPTY_MIND | 
-F:HURT_LITE | RES_DARK | CAN_SWIM |
+F:HURT_LITE | CAN_SWIM |
 F:NO_CONF | NO_SLEEP | NO_FEAR
 D:$It is a large pulsating mound of red flesh.
 D:¤½¤ì¤ÏÌ®ÂǤÄÀÖ¤¤Æù¤Î¤è¤¦¤Êʪ¼Á¤Î²ô¤À¡£
@@ -2968,7 +2969,7 @@ B:CRUSH:HURT:1d8
 B:CLAW:DISEASE:1d3
 F:OPEN_DOOR | BASH_DOOR | FRIENDS | HURT_LITE |
 F:NO_CONF | NO_SLEEP | UNDEAD | EVIL | NO_FEAR | IM_POIS
-F:IM_COLD | RES_NETH | RES_DARK | COLD_BLOOD 
+F:IM_COLD | RES_NETH | COLD_BLOOD 
 S:1_IN_12
 S:CAUSE_1 | SCARE
 D:$"...the hand of a corpse -- bloodless and skeletal, and with 
@@ -3503,7 +3504,7 @@ W:12:3:0:60:200:245
 B:TOUCH:EXP_10
 F:NEVER_MOVE | 
 F:STUPID | EMPTY_MIND | SELF_LITE_1 |
-F:IM_POIS | RES_DARK | HURT_LITE | CAN_SWIM |
+F:IM_POIS | HURT_LITE | CAN_SWIM |
 F:NO_CONF | NO_SLEEP | NO_FEAR
 S:1_IN_11 | 
 S:DRAIN_MANA
@@ -3524,7 +3525,7 @@ W:12:4:0:6:0:0
 B:TOUCH:EXP_10
 F:RAND_50 | RAND_25 | CAN_SWIM |
 F:STUPID | WEIRD_MIND | MULTIPLY | BASH_DOOR | 
-F:ANIMAL | HURT_LITE | RES_DARK | NO_FEAR
+F:ANIMAL | HURT_LITE | RES_NETH | NO_FEAR
 D:$It is a disgusting mass of dark worms, eating each other, the floor, 
 D:$the air, you....
 D:¤½¤ì¤Ï´÷¤Þ¤ï¤·¤¤°Å¹õ¤Î¥¤¥â¥à¥·¤ÎÂç·²¤Ç¤¢¤ê¡¢¤ª¸ß¤¤¤Ë¶¦¿©¤¤¤·¤¢¤¤¡¢¾²¤ä¶õµ¤
@@ -3861,7 +3862,7 @@ B:TOUCH:ACID:2d6
 B:TOUCH:ACID:2d6
 F:NEVER_MOVE | 
 F:STUPID | EMPTY_MIND | COLD_BLOOD | 
-F:IM_ACID | IM_POIS | RES_DARK | HURT_LITE | CAN_SWIM |
+F:IM_ACID | IM_POIS | HURT_LITE | CAN_SWIM |
 F:NO_CONF | NO_SLEEP | NO_FEAR
 D:$A jelly thing.
 D:¥¼¥ê¡¼¤Î¤è¤¦¤Ê¤â¤Î¤À¡£
@@ -4934,7 +4935,7 @@ B:BITE:HURT:1d6
 F:MALE | 
 F:FRIENDS | DROP_60 | WILD_WOOD | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | REGENERATE |
-F:EVIL | TROLL | HURT_LITE | RES_DARK
+F:EVIL | TROLL | HURT_LITE
 D:$He is green skinned and ugly.
 D:Èà¤ÎÈ©¤ÏÎп§¤Ç½¹¤¤¡£
 
@@ -6519,7 +6520,8 @@ B:GAZE:TERRIFY:1d4
 B:GAZE:TERRIFY:1d4
 B:CRUSH:SUPERHURT:33d1
 F:EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD |
-F:RES_NETH | RES_WATE | RES_PLAS | RES_DISE | RES_NEXU |
+F:RES_LITE | RES_DARK | RES_NETH | RES_WATE | RES_PLAS | RES_SHAR | RES_SOUN |
+F:RES_CHAO | RES_NEXU | RES_DISE | RES_WALL | RES_INER | RES_TIME | RES_GRAV |
 F:KILL_WALL | FORCE_MAXHP | CAN_SWIM | DROP_CORPSE | EAT_INSANITY |
 S:1_IN_9 |
 S:TPORT | BLINK | TELE_AWAY
@@ -6686,7 +6688,7 @@ B:GAZE:TERRIFY
 B:GAZE:PARALYZE
 B:GAZE:LOSE_STR
 F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | NONLIVING | NEVER_MOVE |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_DARK | EVIL |
+F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | EVIL |
 F:HURT_ROCK | HURT_LITE |
 F:NO_CONF | NO_SLEEP | NO_FEAR | RES_TELE
 S:1_IN_6 | 
@@ -6764,7 +6766,7 @@ B:BITE:HURT:3d4
 F:MALE | 
 F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | REGENERATE |
-F:EVIL | TROLL | HURT_LITE | HURT_ROCK | RES_DARK
+F:EVIL | TROLL | HURT_LITE | HURT_ROCK
 D:$He is a giant troll with scabrous black skin.
 D:¥¶¥é¥¶¥é¤Î¹õ¤¤ÈéÉæ¤ò¤·¤¿µðÂç¤Ê¥È¥í¥ë¤À¡£
 
@@ -6798,7 +6800,7 @@ B:BITE:HURT:3d4
 F:MALE | 
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_90 | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | REGENERATE |
-F:EVIL | TROLL | HURT_LITE | RES_DARK | NO_CONF | NO_SLEEP
+F:EVIL | TROLL | HURT_LITE | NO_CONF | NO_SLEEP
 S:1_IN_5 | 
 S:BLINK | SCARE | CAUSE_1 | MISSILE | DARKNESS
 D:$A troll who is so bright he knows how to read.
@@ -7776,7 +7778,7 @@ B:BITE:COLD:3d6
 F:MALE | 
 F:FRIENDS | DROP_60 | WILD_WASTE | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | REGENERATE |
-F:EVIL | TROLL | IM_COLD | RES_DARK | HURT_LITE
+F:EVIL | TROLL | IM_COLD | HURT_LITE
 D:$He is a white troll with powerfully clawed hands.
 D:Èà¤Ï¶¯ÎϤÊÄÞ¤ÎÉÕ¤¤¤¿¼ê¤ò»ý¤Ã¤¿¡¢Çò¤¤¥È¥í¥ë¤À¡£
 
@@ -8552,7 +8554,7 @@ F:FORCE_MAXHP |
 F:ESCORT | 
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_WOOD | REGENERATE |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
-F:EVIL | TROLL | IM_COLD | IM_POIS | RES_DARK | HURT_LITE | HURT_ROCK
+F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK
 D:$Big, brawny, powerful and with a taste for hobbit.  He has friends called 
 D:$Bill and Tom.
 D:µðÂç¤Ç¡¢¶Ú¹ü¤¿¤¯¤Þ¤·¤¯¤Æ¡¢¶¯ÎϤǡ¢¥Û¥Ó¥Ã¥È¤òÂ繥ʪ¤Ë¤·¤Æ¤¤¤ë¡£
@@ -8572,7 +8574,7 @@ F:FORCE_MAXHP |
 F:ESCORT | 
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_WOOD | REGENERATE |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
-F:EVIL | TROLL | IM_COLD | IM_POIS | RES_DARK | HURT_LITE | HURT_ROCK
+F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK
 D:$Big, brawny, powerful and with a taste for hobbit.  He has friends called 
 D:$Bert and Tom.
 D:µðÂç¤Ç¡¢¶Ú¹ü¤¿¤¯¤Þ¤·¤¯¤Æ¡¢¶¯ÎϤǡ¢¥Û¥Ó¥Ã¥È¤òÂ繥ʪ¤Ë¤·¤Æ¤¤¤ë¡£
@@ -8592,7 +8594,7 @@ F:FORCE_MAXHP |
 F:ESCORT | 
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | WILD_WOOD | REGENERATE |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
-F:EVIL | TROLL | IM_COLD | IM_POIS | RES_DARK | HURT_LITE | HURT_ROCK
+F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE | HURT_ROCK
 D:$Big, brawny, powerful and with a taste for hobbit.  He has friends called 
 D:$Bert and Bill.
 D:µðÂç¤Ç¡¢¶Ú¹ü¤¿¤¯¤Þ¤·¤¯¤Æ¡¢¶¯ÎϤǡ¢¥Û¥Ó¥Ã¥È¤òÂ繥ʪ¤Ë¤·¤Æ¤¤¤ë¡£
@@ -8611,7 +8613,7 @@ B:HIT:HURT:1d8
 F:MALE | 
 F:FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | REGENERATE |
-F:EVIL | TROLL | IM_POIS | RES_DARK | HURT_LITE
+F:EVIL | TROLL | IM_POIS | HURT_LITE
 D:$He is a vicious monster, feared for his ferocity.
 D:Èà¤Ï¶²¤í¤·¤¤»ÄǦ¤µ¤ò»ý¤Ã¤¿¼Ù°­¤Ê¥â¥ó¥¹¥¿¡¼¤À¡£
 
@@ -8878,7 +8880,7 @@ F:MALE | WILD_SHORE | WILD_SWAMP | REGENERATE |
 F:FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
 F:FRIENDS | DROP_60 | 
 F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL | TROLL | IM_COLD | IM_POIS | RES_DARK | HURT_LITE
+F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE
 D:$He is a troll that reeks of brine.
 D:Èà¤Ï³¤¿å¤Î¤è¤¦¤ÊÆ÷¤¤¤òȯ¤·¤Æ¤¤¤ë¥È¥í¥ë¤À¡£
 
@@ -9266,7 +9268,7 @@ G:h:v
 I:120:4d5:8:13:8
 W:35:4:0:85:500:700
 F:MULTIPLY | INVISIBLE | RAND_25 | TAKE_ITEM | COLD_BLOOD |
-F:HURT_LITE | RES_DARK | EVIL | OPEN_DOOR | MALE | HAS_LITE_1 |
+F:HURT_LITE | EVIL | OPEN_DOOR | MALE | HAS_LITE_1 |
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
 S:1_IN_6
@@ -9583,7 +9585,7 @@ F:MALE |
 F:FORCE_MAXHP | AQUATIC |
 F:FRIENDS | DROP_60 | WILD_OCEAN | REGENERATE |
 F:OPEN_DOOR | BASH_DOOR | RES_WATE
-F:EVIL | TROLL | IM_COLD | IM_POIS | RES_DARK | HURT_LITE
+F:EVIL | TROLL | IM_COLD | IM_POIS | HURT_LITE
 D:$He is a troll that reeks of brine, close relative to water trolls.
 D:Èà¤Ï³¤¿å¤Î¤è¤¦¤ÊÆ÷¤¤¤òȯ¤·¤Æ¤¤¤ë¥È¥í¥ë¤Ç¡¢¿å¥È¥í¥ë¤Î¿ÆÀ̤À¡£
 
@@ -11442,7 +11444,7 @@ W:40:3:0:30:0:0
 B:CRAWL:UN_BONUS:1d4
 F:RAND_50 | RES_DISE | ATTR_MULTI | CAN_SWIM |
 F:STUPID | WEIRD_MIND | MULTIPLY | BASH_DOOR | 
-F:ANIMAL | HURT_LITE | RES_DARK | NO_FEAR | SELF_LITE_1
+F:ANIMAL | HURT_LITE | NO_FEAR | SELF_LITE_1
 D:$It is a strange mass of squirming worms.  Magical energy crackles 
 D:$around its disgusting form.
 D:¤½¤ì¤Ï¤Î¤¿¤¯¤ë´ñ̯¤Ê¥¤¥â¥à¥·¤ÎÂç·²¤À¡£¤³¤Î´÷¤Þ¤ï¤·¤¤
@@ -11867,7 +11869,7 @@ B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 F:FORCE_SLEEP | 
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_GOOD | NO_FEAR | EVIL | REFLECTING |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY |
+F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | RES_DARK |
 F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | RES_NETH |
 F:CAN_FLY | SELF_LITE_2 |
 S:1_IN_3 | 
@@ -12103,7 +12105,7 @@ B:HIT:HURT:8d6
 B:HIT:HURT:8d6
 F:FORCE_SLEEP | SELF_LITE_2 |
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_GOOD | NO_FEAR | GOOD | REFLECTING |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
+F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | RES_LITE |
 F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE | CAN_FLY 
 S:1_IN_3 | 
 S:TELE_TO | BLIND | SCARE | CAUSE_2 | CAUSE_4 | BO_MANA | 
@@ -12588,7 +12590,7 @@ W:44:6:0:85:0:0
 B:TOUCH:EXP_40:1d10
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:MULTIPLY | INVISIBLE | RAND_25 | TAKE_ITEM | COLD_BLOOD | SMART | RES_DARK |
+F:MULTIPLY | INVISIBLE | RAND_25 | TAKE_ITEM | COLD_BLOOD | SMART |
 F:HURT_LITE | EVIL | OPEN_DOOR | MALE | UNDEAD | RES_NETH | HAS_LITE_1 |
 S:1_IN_6
 S:BLINK | TPORT | TELE_TO | CAUSE_3 | ANIM_DEAD
@@ -13939,7 +13941,7 @@ F:UNIQUE | CAN_SPEAK | ESCORT | REGENERATE |
 F:FORCE_SLEEP | FORCE_MAXHP | ELDRITCH_HORROR |
 F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
 F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | 
-F:EVIL |IM_ACID | IM_FIRE | IM_COLD | IM_POIS | RES_DARK |
+F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_POIS |
 F:HURT_LITE | NO_CONF | NO_SLEEP | RES_TELE
 S:1_IN_4 | 
 S:S_UNDEAD | S_DEMON | S_MONSTER | BLINK | BA_ACID | FORGET
@@ -14763,7 +14765,7 @@ F:UNIQUE | MALE | CAN_SPEAK | NO_FEAR | GOOD | AURA_FIRE | REFLECTING |
 F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
 F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
 F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE |
+F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_LITE | RES_TELE |
 F:NO_CONF | NO_SLEEP | SELF_LITE_2 |
 S:1_IN_2 | 
 S:TELE_TO | BLIND | 
@@ -14794,7 +14796,7 @@ F:UNIQUE | MALE | CAN_SPEAK | RES_NETH | NO_FEAR | GOOD |
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | REFLECTING | AURA_COLD |
 F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | CAN_FLY |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_TELE
+F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_LITE | RES_TELE
 F:NO_CONF | NO_SLEEP |
 S:1_IN_2 | 
 S:TELE_TO | BLIND | 
@@ -17090,7 +17092,7 @@ W:90:3:0:45000:0:0
 B:TOUCH:HURT:40d5
 B:TOUCH:LOSE_CON:16d2
 B:TOUCH:LOSE_CON:16d2
-F:UNIQUE | CAN_SPEAK | SMART | ELDRITCH_HORROR | RES_TELE
+F:UNIQUE | CAN_SPEAK | SMART | ELDRITCH_HORROR | RES_TIME | RES_TELE |
 F:PASS_WALL | FORCE_SLEEP | FORCE_MAXHP | AURA_ELEC | AURA_FIRE |
 F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | ATTR_MULTI | ATTR_ANY | AURA_COLD |
 F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | NONLIVING | CAN_FLY | POWERFUL |
@@ -17545,7 +17547,7 @@ 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 | RES_NETH | RES_SOUN | RES_LITE | RES_INER |
-F:RES_WATE | RES_PLAS | RES_NEXU | RES_DISE | RES_TIME | RES_SHAR |
+F:RES_WATE | RES_PLAS | RES_NEXU | RES_DISE | RES_TIME |
 F:SMART | KILL_BODY | POWERFUL | SELF_LITE_1 |
 F:REGENERATE | NONLIVING | CAN_FLY |
 F:GOOD | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
@@ -18009,7 +18011,7 @@ W:15:4:0:7:0:0
 B:EXPLODE:FIRE:5d5
 F:RAND_50 | RAND_25 | CAN_SWIM |
 F:STUPID | WEIRD_MIND | MULTIPLY | BASH_DOOR | 
-F:ANIMAL | HURT_LITE | RES_DARK | NO_FEAR
+F:ANIMAL | HURT_LITE | NO_FEAR
 D:$A seething mass of thick, glowing worms.
 D:¸÷¤ë¥¤¥â¥à¥·¤ÎÌ©½¸¤·¤¿Ê¨¤­ÊÖ¤ë²ô¤À¡£
 
@@ -18044,7 +18046,7 @@ F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | CAN_FLY | AURA_COLD |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT |
 F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | REGENERATE | 
 F:EVIL | UNDEAD | IM_COLD | IM_POIS | RES_NETH | RES_DARK | HURT_LITE |
-F:NO_CONF | NO_SLEEP | RES_TELE | REFLECTING |
+F:NO_CONF | NO_SLEEP | RES_TIME | RES_TELE | REFLECTING |
 S:1_IN_4 | 
 S:SCARE | S_KIN | WORLD | TELE_TO
 D:Àв¾Ì̤ÎÎϤÇÉÔ»à¤ÎµÛ·ìµ´¤È¤Ê¤Ã¤¿¥Ç¥£¥ª¤ÏËÁ¸±¼Ô¤ò±Â¤È¤·¤«¸«¤Æ¤¤¤Ê¤¤¡£
@@ -18077,7 +18079,7 @@ F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_4D2 | DROP_GOOD | HUMAN |
 F:REFLECTING | SMART | REGENERATE | PASS_WALL | CAN_FLY |
 F:EVIL | IM_ACID | IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | NO_CONF | 
-F:NO_SLEEP | RES_NEXU | RES_WATE | ESCORT
+F:NO_SLEEP | RES_NEXU | RES_WATE | RES_TIME | ESCORT
 S:1_IN_2 | 
 S:TPORT | SCARE | S_KIN | BLINK | HEAL |
 S:TELE_TO | CONF | BO_MANA | BRAIN_SMASH |
@@ -18428,7 +18430,7 @@ B:HIT:FIRE:1d6
 B:BITE:FIRE:3d4
 F:MALE | FRIENDS | DROP_60 | DROP_SKELETON | DROP_CORPSE | SELF_LITE_1 |
 F:OPEN_DOOR | BASH_DOOR | EVIL | TROLL | HURT_LITE | REGENERATE |
-F:HURT_COLD | IM_FIRE | RES_DARK | WILD_VOLCANO
+F:HURT_COLD | IM_FIRE | WILD_VOLCANO
 D:$Fire trolls are believed to have been created by an
 D:$evil wizard trying to make forest trolls immune to
 D:$fire.
@@ -19212,7 +19214,7 @@ B:HIT:HURT:8d6
 F:FORCE_SLEEP | FORCE_MAXHP | GOOD | SELF_LITE_2 |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_GOOD |
 F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
+F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_LITE |
 F:NO_CONF | NO_SLEEP | CAN_FLY |
 S:1_IN_4 | 
 S:HEAL | HASTE | TELE_AWAY | BO_MANA | BO_PLAS | CAUSE_4 |
@@ -19234,7 +19236,7 @@ B:HIT:HURT:12d8
 F:FORCE_SLEEP | FORCE_MAXHP | GOOD | SELF_LITE_2 |
 F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
 F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS |
+F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_LITE |
 F:NO_CONF | NO_SLEEP | CAN_FLY |
 S:1_IN_3 | 
 S:TELE_TO | BLIND | SCARE | CAUSE_4 | BO_MANA | PSY_SPEAR | INVULNER
@@ -19536,7 +19538,7 @@ B:KICK:HURT:8d8
 F:UNIQUE | MALE | CAN_SPEAK | REFLECTING | HAS_LITE_2 | HUMAN |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE | DROP_SKELETON |
 F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | TAKE_ITEM |
-F:DROP_1D2 | DROP_90 | DROP_GOOD | ONLY_ITEM | CAN_SWIM | RES_SHAR |
+F:DROP_1D2 | DROP_90 | DROP_GOOD | ONLY_ITEM | CAN_SWIM |
 F:REGENERATE | EAT_GIVE_STR | EAT_GIVE_CON | EAT_LOSE_INT | EAT_LOSE_CHR |
 S:1_IN_6 |
 S:BR_SHAR | TELE_TO
@@ -20553,7 +20555,7 @@ F:DROP_SKELETON | DROP_CORPSE
 F:FORCE_SLEEP | FORCE_MAXHP | KILL_WALL | HUMAN |
 F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
 F:EVIL | REGENERATE |
-F:OPEN_DOOR | BASH_DOOR |
+F:OPEN_DOOR | BASH_DOOR | RES_WALL
 S:1_IN_8 |
 S:TELE_TO | BO_MANA
 D:$He looks like brawny human being apparently. 
@@ -21073,8 +21075,8 @@ F:UNIQUE | MALE |
 F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | 
 F:ONLY_ITEM | DROP_4D2 | DROP_3D2 | DROP_GOOD | 
 F:SMART | TAKE_ITEM | BASH_DOOR | HAS_LITE_2 |
-F:EVIL | GIANT | ESCORT | DROP_CORPSE | 
-F:IM_FIRE | IM_COLD | IM_ACID | IM_POIS | IM_ELEC | RES_SHAR | RES_SOUN
+F:EVIL | GIANT | ESCORT | DROP_CORPSE | RES_SHAR | RES_SOUN | RES_TIME |
+F:IM_FIRE | IM_COLD | IM_ACID | IM_POIS | IM_ELEC
 S:1_IN_4 |
 S:BR_FIRE | BR_COLD | BR_SHAR | BR_SOUN |
 S:S_MONSTERS | S_KIN | TELE_TO | HEAL