From 4af8b11bc2a81638632f1a6cc5d3bfd838801cd5 Mon Sep 17 00:00:00 2001
From: nothere <nothere@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Fri, 29 Aug 2003 16:34:34 +0000
Subject: [PATCH] =?utf8?q?=E3=83=A2=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=BC?=
 =?utf8?q?=E3=81=AE=E3=83=95=E3=83=A9=E3=82=B0=E3=81=AE=E8=AA=BF=E6=95=B4.?=
 =?utf8?q?=20*=20=E3=83=94=E3=83=A9=E3=83=8B=E3=82=A2,=20=E3=83=A1?=
 =?utf8?q?=E3=82=AB=E3=82=B8=E3=82=AD,=20=E5=B7=A8=E5=A4=A7=E3=83=92?=
 =?utf8?q?=E3=83=AB,=20=E3=83=90=E3=83=A9=E3=82=AF=E3=83=BC=E3=83=80,=20?=
 =?utf8?q?=E3=82=AB=E3=83=84=E3=82=AA=E3=83=8E=E3=82=A8=E3=83=9C=E3=82=B7,?=
 =?utf8?q?=20=E3=82=B8=E3=83=A3=E3=82=A4=20=20=20=E3=82=A2=E3=83=B3?=
 =?utf8?q?=E3=83=88=E3=83=BB=E3=83=94=E3=83=A9=E3=83=8B=E3=82=A2,=20?=
 =?utf8?q?=E3=83=92=E3=83=83=E3=83=9D=E3=82=AB=E3=83=B3=E3=83=9D=E3=82=B9,?=
 =?utf8?q?=20=E3=82=A4=E3=82=AF=E3=82=B7=E3=83=84=E3=82=B6=E3=83=81?=
 =?utf8?q?=E3=83=88=E3=83=AB,=20=E3=83=8B=E3=82=AF=E3=82=B7=E3=83=BC,=20?=
 =?utf8?q?=E3=82=B7=E3=83=A5=20=20=20=E3=83=A2=E3=82=AF=E3=82=B6=E3=83=A1,?=
 =?utf8?q?=20=E7=99=BD=E9=AE=AB,=20=E3=82=A4=E3=82=AF=E3=82=B7=E3=83=84?=
 =?utf8?q?=E3=82=B6=E3=83=81=E3=83=88=E3=83=AB=E3=83=BB=E3=83=97=E3=83=AA?=
 =?utf8?q?=E3=83=BC=E3=82=B9=E3=83=88,=20=E3=83=95=E3=82=B0,=20=E3=82=B7?=
 =?utf8?q?=E3=83=A3=E3=83=81,=20=E5=A4=A7=E7=99=BD=E9=AE=AB,=20=20=20?=
 =?utf8?q?=E5=90=B8=E8=A1=80=E3=82=A4=E3=82=AF=E3=82=B7=E3=83=84=E3=82=B6?=
 =?utf8?q?=E3=83=81=E3=83=88=E3=83=AB,=20=E3=82=BF=E3=83=84=E3=83=8E?=
 =?utf8?q?=E3=82=AA=E3=83=88=E3=82=B7=E3=82=B4,=20=E6=B0=B4=E3=83=88?=
 =?utf8?q?=E3=83=AD=E3=83=AB,=20=E3=80=8E=E3=82=B8=E3=83=A7=E3=83=BC?=
 =?utf8?q?=E3=82=BA=E3=80=8F,=20=E7=A9=BA=E9=A3=9B=20=20=20=E3=81=B6?=
 =?utf8?q?=E9=AF=A8,=20=E3=83=95=E3=82=A1=E3=82=B9=E3=83=86=E3=82=A3?=
 =?utf8?q?=E3=83=88=E3=82=AB=E3=83=AD=E3=83=B3,=20=E3=83=AA=E3=83=B4?=
 =?utf8?q?=E3=82=A1=E3=82=A4=E3=82=A2=E3=82=B5=E3=83=B3,=20=E3=82=AF?=
 =?utf8?q?=E3=83=A9=E3=83=BC=E3=82=B1=E3=83=B3=E3=81=AE=E5=AD=90,=20?=
 =?utf8?q?=E6=B0=B4=E6=A3=B2=E3=82=B4=E3=83=BC=20=20=20=E3=83=AC=E3=83=A0,?=
 =?utf8?q?=20=E3=82=A2=E3=83=B3=E3=83=87=E3=83=83=E3=83=89=E3=83=BB?=
 =?utf8?q?=E3=83=81=E3=83=A7=E3=82=A6=E3=83=81=E3=83=B3=E3=82=A2=E3=83=B3?=
 =?utf8?q?=E3=82=B3=E3=82=A6,=20=E3=83=81=E3=83=A7=E3=82=A6=E3=83=81?=
 =?utf8?q?=E3=83=B3=E3=82=A2=E3=83=B3=E3=82=B3=E3=82=A6,=20=E6=B0=B4?=
 =?utf8?q?=E6=A3=B2=E3=83=8A=E3=83=BC=20=20=20=E3=82=AC,=20=E7=99=BD?=
 =?utf8?q?=E3=83=AF=E3=83=8B=E3=81=ABRES=5FWATE=E8=BF=BD=E5=8A=A0.=20*=20?=
 =?utf8?q?=E3=82=B7=E3=83=AB=E3=83=90=E3=83=BC=E3=83=BB=E3=82=BC=E3=83=AA?=
 =?utf8?q?=E3=83=BC=E3=81=ABHAS=5FDARK=5F1=E8=BF=BD=E5=8A=A0.=20*=20?=
 =?utf8?q?=E3=80=8E=E6=9F=B3=E3=81=98=E3=81=98=E3=81=84=E3=80=8F,=20?=
 =?utf8?q?=E3=83=95=E3=82=AA=E3=83=AB=E3=83=B3,=20=E3=82=A8=E3=83=B3?=
 =?utf8?q?=E3=83=88,=20=E6=9C=A8=E3=81=AE=E9=AC=9A=E3=80=8E=E3=83=95?=
 =?utf8?q?=E3=82=A1=E3=83=B3=E3=82=B4=E3=83=AB=E3=83=B3=E3=80=8F=E3=81=ABH?=
 =?utf8?q?URT=5FFIRE=E8=BF=BD=20=20=20=E5=8A=A0.=20*=20=E3=83=AA=E3=83=B4?=
 =?utf8?q?=E3=82=A1=E3=82=A4=E3=82=A2=E3=82=B5=E3=83=B3=E3=81=ABEVIL?=
 =?utf8?q?=E8=BF=BD=E5=8A=A0.=20*=20=E9=BB=84=E8=89=B2=E3=81=84=E5=85=89?=
 =?utf8?q?=E3=81=ABRES=5FLITE=E8=BF=BD=E5=8A=A0.=20*=20=E6=B7=B7=E6=B2=8C?=
 =?utf8?q?=E3=81=AE=E8=90=BD=E3=81=97=E5=AD=90=E3=81=ABRES=5FCHAO=E8=BF=BD?=
 =?utf8?q?=E5=8A=A0.=20*=20=E7=9B=AE=E3=81=AE=E3=83=89=E3=83=AB=E3=82=B8?=
 =?utf8?q?=E3=81=AE=E8=AA=AC=E6=98=8E=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?=
 =?utf8?q?=E5=A4=89=E6=9B=B4.=20*=20=E3=83=8A=E3=82=A4=E3=83=88=E3=82=A6?=
 =?utf8?q?=E3=82=A3=E3=83=B3=E3=82=B0,=20=E3=83=8A=E3=82=A4=E3=83=88?=
 =?utf8?q?=E3=82=AF=E3=83=AD=E3=83=BC=E3=83=A9=E3=83=BC=E3=82=92=E9=80=B2?=
 =?utf8?q?=E5=8C=96=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
 =?utf8?q?=E3=81=97=E3=81=9F.=20*=20=E9=87=91=E8=89=B2=E3=81=AE=E6=80=AA?=
 =?utf8?q?=E4=BA=BA=E3=80=8E=E3=83=AF=E3=83=83=E3=83=8F=E3=83=9E=E3=83=B3?=
 =?utf8?q?=E3=80=8F=E3=81=8B=E3=82=89EMPTY=5FMIND=E5=89=8A=E9=99=A4.=20*?=
 =?utf8?q?=20=E3=83=8B=E3=83=BC=E3=83=99=E3=83=AB=E3=83=B3=E3=82=B0?=
 =?utf8?q?=E6=97=8F=E3=81=AE=E3=80=8E=E3=83=9F=E3=83=BC=E3=83=A1=E3=80=8F,?=
 =?utf8?q?=20=E3=83=8B=E3=83=BC=E3=83=99=E3=83=AB=E3=83=B3=E3=82=B0?=
 =?utf8?q?=E6=97=8F=E3=81=AE=E7=8E=8B=E3=80=8E=E3=82=A2=E3=83=AB=E3=83=99?=
 =?utf8?q?=E3=83=AA=E3=83=92=E3=80=8F,=20=E3=83=80=E3=83=BC=20=20=20?=
 =?utf8?q?=E3=82=AF=E3=82=A8=E3=83=AB=E3=83=95=E3=81=AE=E9=8D=9B=E5=86=B6?=
 =?utf8?q?=E5=B8=AB=E3=80=8E=E3=82=A8=E3=82=AA=E3=83=AB=E3=80=8F=E3=81=ABR?=
 =?utf8?q?ES=5FDARK=E8=BF=BD=E5=8A=A0.=20*=20=E3=82=A2=E3=83=AB=E3=83=99?=
 =?utf8?q?=E3=83=AA=E3=83=92=E3=81=AE=E6=81=AF=E5=AD=90=E3=80=8E=E3=83=8F?=
 =?utf8?q?=E3=83=BC=E3=82=B2=E3=83=B3=E3=80=8F=E3=81=ABRES=5FDARK,=20RES?=
 =?utf8?q?=5FDISE=E8=BF=BD=E5=8A=A0.=20*=20=E3=83=97=E3=83=A9=E3=83=8D?=
 =?utf8?q?=E3=82=BF=E3=83=BC,=20=E3=82=BD=E3=83=BC=E3=83=A9=E3=83=BC?=
 =?utf8?q?=E3=81=ABNO=5FFEAR=E8=BF=BD=E5=8A=A0.=20*=20=E8=A6=8B=E7=BF=92?=
 =?utf8?q?=E8=B6=85=E8=83=BD=E5=8A=9B=E8=80=85=20(=E5=8D=98=E4=BD=93,=20?=
 =?utf8?q?=E9=9B=86=E5=9B=A3=E4=B8=A1=E6=96=B9)=20=E3=81=ABMALE=E8=BF=BD?=
 =?utf8?q?=E5=8A=A0.=20*=20=E5=87=8D=E3=81=A3=E3=81=9F=E7=90=83=E4=BD=93?=
 =?utf8?q?=E3=81=ABCOLD=5FBLOOD=E8=BF=BD=E5=8A=A0.=20*=20=E5=9C=B0?=
 =?utf8?q?=E3=81=AE=E3=82=B9=E3=83=94=E3=83=AA=E3=83=83=E3=83=88,=20?=
 =?utf8?q?=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=A6=E3=82=A9=E3=83=BC=E3=83=AB,?=
 =?utf8?q?=20=E5=8B=95=E3=81=8F=E5=B2=A9,=20=E3=83=AC=E3=83=83=E3=82=B5?=
 =?utf8?q?=E3=83=BC=E3=83=BB=E3=82=A6=E3=82=A9=E3=83=BC=E3=83=AB=E3=83=A2?=
 =?utf8?q?=E3=83=B3=E3=82=B9=20=20=20=E3=82=BF=E3=83=BC,=20=E3=80=8E?=
 =?utf8?q?=E7=A9=B6=E6=A5=B5=E3=83=80=E3=83=B3=E3=82=B8=E3=83=A7=E3=83=B3?=
 =?utf8?q?=3D=E3=82=AF=E3=83=AA=E3=83=BC=E3=83=8A=E3=83=BC=E3=80=8F,=20?=
 =?utf8?q?=E5=9C=B0=E3=81=AE=E3=82=A8=E3=83=AC=E3=83=A1=E3=83=B3=E3=82=BF?=
 =?utf8?q?=E3=83=AB,=20=E5=A4=A7=E5=9C=B0=E3=81=AE=E4=B8=BB=20=20=20?=
 =?utf8?q?=E3=80=8E=E3=82=AF=E3=82=A7=E3=82=A4=E3=82=AB=E3=83=BC=E3=80=8F,?=
 =?utf8?q?=20=E9=95=B7=E8=80=81=E5=B2=A9,=20=E8=8A=B1=E5=B4=97=E5=B2=A9?=
 =?utf8?q?=E3=81=AE=E5=A3=81,=20=E6=BA=B6=E5=B2=A9=E3=81=AE=E5=A3=81,=20?=
 =?utf8?q?=E7=9F=B3=E8=8B=B1=E3=81=AE=E5=A3=81,=20=E3=83=80=E3=82=AA,=20?=
 =?utf8?q?=E9=8B=BC=E9=89=84=20=20=20=E3=83=89=E3=83=A9=E3=82=B4=E3=83=B3?=
 =?utf8?q?=E3=81=ABRES=5FSHAR=E8=BF=BD=E5=8A=A0.=20*=20"=E3=83=9F=E3=83=8E?=
 =?utf8?q?=E3=82=BF=E3=82=A6=E3=83=AB=E3=82=B9"=20->=20"=E3=83=9F=E3=83=8E?=
 =?utf8?q?=E3=82=BF=E3=82=A6=E3=83=AD=E3=82=B9".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/edit/r_info.txt | 127 ++++++++++++++++++++++++++--------------------------
 1 file changed, 64 insertions(+), 63 deletions(-)

diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index b539a6173..6e9425934 100644
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -1236,7 +1236,7 @@ G:l:B
 I:120:2d6:20:8:5
 W:3:1:0:9:40:187
 B:BITE:HURT:13d1
-F:FRIENDS | AQUATIC | ANIMAL | WILD_ALL
+F:FRIENDS | AQUATIC | ANIMAL | WILD_ALL | RES_WATE
 D:$Bloodthirsty fish who can smell your blood from a great distance.
 D:¤³¤Î·ì¤Ëµ²¤¨¤¿µû¤Ï¤¢¤Ê¤¿¤Î·ì¤ÎÆ÷¤¤¤ò±ó¤¯¤«¤é¤«¤®Ê¬¤±¤ë¡£
 
@@ -1276,7 +1276,7 @@ I:120:10d8:2:1:99
 W:3:2:0:14:25:84
 B:TOUCH:EAT_LITE:1d6
 B:TOUCH:EAT_LITE:1d6
-F:NEVER_MOVE | CAN_SWIM |
+F:NEVER_MOVE | CAN_SWIM | HAS_DARK_1 |
 F:STUPID | EMPTY_MIND |
 F:IM_POIS |
 F:NO_CONF | NO_SLEEP | NO_FEAR
@@ -1392,7 +1392,7 @@ G:*:y
 I:120:2d6:8:12:30
 W:4:1:0:5:0:0
 B:EXPLODE:BLIND
-F:EMPTY_MIND | CAN_FLY | NONLIVING | SELF_LITE_1 | SELF_LITE_2
+F:RES_LITE | EMPTY_MIND | CAN_FLY | NONLIVING | SELF_LITE_1 | SELF_LITE_2
 D:$A fast-moving bright light.
 D:¤½¤ì¤ÏÁÇÁ᤯ư¤¯¡¢µ±¤¯¸÷ÂΤÀ¡£
 
@@ -1493,7 +1493,7 @@ I:120:5d12:14:10:20
 W:4:2:0:15:0:0
 B:STING:HURT:7d1
 B:STING:HURT:7d1
-F:ANIMAL | AQUATIC | WILD_ALL |
+F:ANIMAL | AQUATIC | WILD_ALL | RES_WATE
 D:$An animal with a swordlike "beak".
 D:¤½¤ì¤Ï·õ¤Î¤è¤¦¤Ê"îìÉ¡"¤ò»ý¤Ã¤¿µû¤À¡£
 
@@ -1596,7 +1596,7 @@ I:120:6d8:10:20:50
 W:5:1:0:20:0:0
 B:BITE:HURT:4d1
 B:BITE:HURT:4d1
-F:ANIMAL | AQUATIC | WEIRD_MIND | RAND_25
+F:ANIMAL | AQUATIC | WEIRD_MIND | RAND_25 | RES_WATE
 D:$Yech! The disgusting thing only wants your blood!
 D:¤²¤§¡ª¤½¤ì¤Ï¤¢¤Ê¤¿¤Î·ì¤òÍߤ·¤Æ¤¤¤ë¤À¤±¤Î·ù¤ÊÅÛ¤À¡ª
 
@@ -1609,7 +1609,7 @@ I:120:6d12:20:45:20
 W:5:2:0:30:0:0
 B:BITE:HURT:13d1
 B:BITE:HURT:2d7
-F:AQUATIC | ANIMAL | WILD_ALL |
+F:AQUATIC | ANIMAL | WILD_ALL | RES_WATE
 D:$A predatory fish with razor-sharp teeth.
 D:¤½¤ì¤Ï¤­¤ï¤É¤¯±Ô¤¤»õ¤ò»ý¤Ã¤¿Æù¿©¤Îµû¤À¡£
 
@@ -2596,7 +2596,7 @@ I:110:10d10:20:30:75
 W:9:2:0:25:0:0
 B:TOUCH:PARALYZE:1d7
 B:TOUCH:PARALYZE:1d7
-F:ANIMAL | AQUATIC | IM_POIS | WILD_ALL |
+F:ANIMAL | AQUATIC | IM_POIS | RES_WATE | WILD_ALL |
 D:$A strange water creature, whose touch can be deadly.
 D:´ñ̯¤Ê¿åÀ³À¸Êª¤Ç¡¢¤½¤Î¿¨¼ê¤ÏÃ×̿Ū¤ÊÆǤò»ý¤Ä¡£
 
@@ -3093,7 +3093,7 @@ I:120:6d9:30:30:10
 W:10:2:0:40:0:0
 B:BITE:HURT:9d1
 B:BITE:HURT:9d1
-F:NO_SLEEP | WILD_ALL | 
+F:NO_SLEEP | WILD_ALL | RES_WATE |
 F:FRIENDS | AQUATIC | ANIMAL
 D:$A very large and bloodthirsty fish.
 D:Èó¾ï¤ËÂç·¿¤Ç·ì¤Ëµ²¤¨¤¿µû¤À¡£
@@ -3407,7 +3407,7 @@ S:1_IN_6
 S:TELE_TO
 F:ANIMAL | NEVER_MOVE | COLD_BLOOD | WILD_ONLY | WILD_WOOD |
 F:EMPTY_MIND | UNIQUE | DROP_CORPSE | FORCE_MAXHP | FORCE_SLEEP |
-F:RES_WATE | IM_POIS | IM_ACID
+F:RES_WATE | IM_POIS | IM_ACID | HURT_FIRE |
 F:DROP_90 | DROP_GOOD | ONLY_ITEM
 D:$"...a huge willow-tree, old and hoary. Enormous it looked, its 
 D:$sprawling branches going up like racing arms with may long-
@@ -3431,7 +3431,7 @@ I:110:20d9:12:14:10
 W:11:1:0:30:0:0
 B:BITE:HURT:2d5
 B:BITE:HURT:2d5
-F:AQUATIC | WILD_ALL | DROP_CORPSE
+F:AQUATIC | WILD_ALL | DROP_CORPSE | RES_WATE |
 F:ANIMAL | RIDING
 D:$A truly strange hybrid of a horse and a fish.
 D:ËÜÅö¤Ë´ñ̯¤ÊÇϤȵû¤Î³Ý¤±¹ç¤ï¤»¤À¡£
@@ -3641,7 +3641,7 @@ I:110:12d8:20:30:20
 W:12:1:0:40:600:406
 B:STING:POISON:2d5
 B:STING:POISON:2d5
-F:ANIMAL | EVIL | AQUATIC | IM_POIS | WILD_ALL |
+F:ANIMAL | EVIL | AQUATIC | IM_POIS | RES_WATE | WILD_ALL
 D:$A devil ray of the depths.
 D:¿¼³¤¤ËÀ³¤à°­Ëâ¤Î¥¨¥¤¤À¡£
 
@@ -4108,7 +4108,7 @@ I:110:16d10:20:45:50
 W:14:1:0:60:0:0
 B:HIT:HURT:6d3
 B:HIT:HURT:6d3
-F:AQUATIC | WILD_ALL |
+F:AQUATIC | WILD_ALL | RES_WATE |
 F:MALE
 D:$A race of fair yet belligrent sea elves.
 D:ÀöÎý¤µ¤ì¤¿¡¢¤·¤«¤â¹¥ÀïŪ¤Ê³¤¤Î¥¨¥ë¥Õ¤Î¼ï²¤À¡£
@@ -4846,7 +4846,7 @@ W:16:3:0:40:300:317
 B:BITE:HURT:4d4
 B:BUTT:HURT:4d4
 B:BITE:HURT:4d4
-F:ANIMAL | AQUATIC | WILD_ALL |
+F:ANIMAL | AQUATIC | WILD_ALL | RES_WATE
 D:$A hungry shark with a strange head.
 D:´ñ̯¤ÊƬ¤ò¤·¤¿µ²¤¨¤¿»­¤À¡£
 
@@ -4947,7 +4947,7 @@ G:*:w
 I:120:6d6:100:30:0
 W:17:1:0:50:0:0
 B:EXPLODE:COLD:8d8
-F:FORCE_SLEEP | CAN_FLY |
+F:FORCE_SLEEP | CAN_FLY | COLD_BLOOD |
 F:EMPTY_MIND | AURA_COLD | HURT_FIRE |
 F:IM_COLD | NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING
 D:$The embodiment of cold.
@@ -5047,7 +5047,7 @@ B:HIT:HURT:1d8
 F:RAND_25 | 
 F:EMPTY_MIND | COLD_BLOOD | 
 F:PASS_WALL | CAN_FLY | NONLIVING |
-F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HURT_ROCK | 
+F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_SHAR | HURT_ROCK | 
 F:NO_CONF | NO_SLEEP | NO_FEAR
 D:$A whirling form of sentient rock.
 D:ÃÎǽ¤ò»ý¤Ã¤¿´ä¤¬±²´¬¤¤¤¿¤è¤¦¤Ê»Ñ¤ò¤·¤Æ¤¤¤ë¡£
@@ -5274,7 +5274,7 @@ I:120:10d10:20:50:10
 W:18:1:0:68:400:386
 B:BITE:HURT:3d5
 B:BITE:HURT:3d5
-F:ANIMAL | AQUATIC | WILD_ALL |
+F:ANIMAL | AQUATIC | WILD_ALL | RES_WATE
 D:$Fast moving hunter of the depths, when this creature moves, 
 D:$everybody in water is in danger!
 D:ÁÇÁ᤯ư¤¯¿¼³¤¤Î¥Ï¥ó¥¿¡¼¤À¡£
@@ -5419,7 +5419,7 @@ I:110:4d8:45:25:0
 W:18:5:0:50:0:0
 B:TOUCH:PARALYZE:10d1
 B:TOUCH:PARALYZE:10d1
-F:NEVER_MOVE | IM_COLD | COLD_BLOOD | IM_ACID | IM_ELEC | NO_FEAR |
+F:NEVER_MOVE | IM_COLD | COLD_BLOOD | IM_ACID | IM_ELEC | RES_SHAR | NO_FEAR |
 F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | CHAR_MULTI 
 F:EMPTY_MIND | HURT_ROCK
 D:$A sentient section of wall.
@@ -5455,7 +5455,7 @@ I:110:10d10:20:40:20
 W:19:1:0:80:0:0
 B:STING:POISON:2d7
 B:STING:POISON:2d7
-F:ANIMAL | EVIL | AQUATIC | IM_POIS | WILD_ALL |
+F:ANIMAL | EVIL | AQUATIC | IM_POIS | RES_WATE | WILD_ALL |
 S:1_IN_6
 S:TELE_TO | HEAL | SCARE | CAUSE_2 | BLIND | S_MONSTER
 D:$A devil ray of the depths, with priestly magic.
@@ -5473,7 +5473,7 @@ B:CRUSH:HURT:3d6
 B:CRUSH:HURT:3d6
 F:DROP_CORPSE |
 F:DROP_60 | NO_SLEEP | NO_CONF | ANIMAL | WEIRD_MIND | EVIL
-F:RES_WATE | IM_COLD | NEVER_MOVE | WILD_ONLY | WILD_WOOD |
+F:RES_WATE | IM_COLD | HURT_FIRE | NEVER_MOVE | WILD_ONLY | WILD_WOOD |
 S:1_IN_9
 S:BLINK | TELE_TO
 D:$A very strong near-sentient tree, which has become hostile 
@@ -5602,7 +5602,8 @@ W:20:4:0:30:700:448
 B:HIT:HURT:2d5
 B:HIT:HURT:2d5
 F:MULTIPLY | NEVER_MOVE | IM_COLD | COLD_BLOOD | IM_ACID | IM_ELEC | NO_FEAR |
-F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | FRIENDS | CHAR_MULTI | HURT_ROCK
+F:IM_FIRE | IM_POIS | NO_CONF | NO_SLEEP | FRIENDS | CHAR_MULTI | HURT_ROCK |
+F:RES_SHAR
 D:$A sentient section of wall.
 D:°Õ¼±¤ò»ý¤Ã¤¿ÊɤΰìÉô¤À¡£
 
@@ -6028,7 +6029,7 @@ W:21:1:0:200:0:0
 B:BITE:POISON:5d5
 B:BITE:POISON:5d5
 F:EMPTY_MIND | BASH_DOOR | AQUATIC | 
-F:IM_POIS | NO_STUN | WILD_ALL | FORCE_MAXHP
+F:IM_POIS | RES_WATE | NO_STUN | WILD_ALL | FORCE_MAXHP
 S:1_IN_7 | 
 S:BR_POIS
 D:$This cute fish is among the most poisonous creatures there are.
@@ -6079,7 +6080,7 @@ I:115:30d10:12:55:30
 W:22:1:0:85:0:0
 B:BITE:HURT:8d3
 B:BITE:HURT:8d3
-F:AQUATIC | WILD_OCEAN
+F:AQUATIC | WILD_OCEAN | RES_WATE |
 F:ANIMAL
 D:$An almost beautiful, deadly beast.
 D:¤½¤ì¤Ï¤È¤Æ¤âÈþ¤·¤¤¤ÈƱ»þ¤Ë´í¸±¤Ê½Ã¤À¡£
@@ -6410,7 +6411,7 @@ F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
 F:FORCE_SLEEP | FORCE_MAXHP | 
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | 
 F:OPEN_DOOR | BASH_DOOR | EVIL |
-F:IM_FIRE | IM_COLD | NO_CONF | NO_SLEEP | RES_DISE | RES_TELE
+F:IM_FIRE | IM_COLD | NO_CONF | NO_SLEEP | RES_DARK | RES_DISE | RES_TELE
 S:1_IN_8 | 
 S:HEAL | HASTE | BO_FIRE
 D:$This tiny night dwarf is as greedy for gold as his brother, Alberich.
@@ -6434,7 +6435,7 @@ F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
 F:FORCE_SLEEP | FORCE_MAXHP | 
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD |
 F:OPEN_DOOR | BASH_DOOR | EVIL |
-F:IM_FIRE | IM_COLD | NO_CONF | NO_SLEEP | RES_TELE
+F:IM_FIRE | IM_COLD | RES_DARK | RES_DISE | NO_CONF | NO_SLEEP | RES_TELE
 S:1_IN_8 | 
 S:HEAL | HASTE | BO_FIRE
 D:$Alberich's son, born of a mortal woman won with gold.
@@ -6488,7 +6489,7 @@ W:24:2:0:250:0:0
 B:BITE:HURT:3d6
 B:BITE:HURT:3d6
 B:BITE:HURT:3d6
-F:FORCE_SLEEP | AQUATIC | 
+F:FORCE_SLEEP | AQUATIC | RES_WATE |
 F:ANIMAL
 D:$A very large carnivorous fish.
 D:¤½¤ì¤Ï¤È¤Æ¤âÂ礭¤ÊÆù¿©¤Îµû¤À¡£
@@ -6846,7 +6847,7 @@ I:110:22d22:20:50:20
 W:26:1:0:120:0:0
 B:STING:POISON:2d8
 B:STING:EXP_VAMP:2d8
-F:ANIMAL | EVIL | AQUATIC | RES_NETH | IM_POIS | WILD_ALL
+F:ANIMAL | EVIL | AQUATIC | RES_NETH | IM_POIS | RES_WATE | WILD_ALL
 S:1_IN_6
 S:HEAL | SCARE | CAUSE_3 | BLIND | FORGET | HASTE
 D:$A devil ray of the depths, with vampiric powers.
@@ -7103,7 +7104,7 @@ F:FORCE_MAXHP | FORCE_SLEEP | DROP_SKELETON | DROP_CORPSE
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | 
 F:OPEN_DOOR | BASH_DOOR | INVISIBLE |
 F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
-F:NO_CONF | NO_SLEEP | RES_DISE | RES_TELE
+F:NO_CONF | NO_SLEEP | RES_DARK | RES_DISE | RES_TELE
 S:1_IN_6 | 
 S:HEAL | SCARE | BO_ACID | BA_ACID | TPORT | S_MONSTER 
 D:$Made invisible with his magic cap, the greedy dwarf plots for 
@@ -7558,7 +7559,7 @@ B:BITE:PARALYZE:4d5
 B:BITE:LOSE_DEX:4d5
 B:BITE:LOSE_CON:4d5
 F:FORCE_SLEEP | AQUATIC | GOOD | ANIMAL |
-F:IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | WILD_OCEAN 
+F:IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | RES_WATE | WILD_OCEAN 
 S:1_IN_5 | 
 S:BO_WATE | BO_COLD | BO_ICEE | BO_MANA
 D:$Your mind is filled with admiration as you view this wondrous, 
@@ -7645,7 +7646,7 @@ B:HIT:HURT:2d6
 B:HIT:HURT:2d6
 F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | KILL_WALL | RAND_50 | MULTIPLY |
 F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING |
-F:HURT_ROCK | NO_CONF | NO_SLEEP | CHAR_MULTI
+F:HURT_ROCK | NO_CONF | NO_SLEEP | CHAR_MULTI | RES_SHAR
 D:$A sentient, moving section of wall.
 D:°Õ¼±¤ò»ý¤Ã¤¿¡¢Æ°¤­²ó¤ëÊɤΰìÉô¤À¡£
 
@@ -7701,7 +7702,7 @@ B:CRUSH:HURT:2d10
 B:CRUSH:SUPERHURT:2d10
 F:FORCE_SLEEP | FORCE_MAXHP | KILL_BODY | KILL_ITEM | UNIQUE | REFLECTING |
 F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE
+F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_SHAR | RES_TELE
 D:$It looks like a huge spiked roller. It was designed to keep this dungeon 
 D:$clean, and you are the biggest spot of dirt in sight.
 D:µðÂç¤Ê¥È¥²¤Î¤Ä¤¤¤¿¥í¡¼¥é¡¼¤Î¤è¤¦¤À¡£¤³¤Î¥À¥ó¥¸¥ç¥ó¤ò¤­¤ì¤¤¤ËÊݤĤ褦
@@ -8048,7 +8049,7 @@ B:BITE:HURT:11d2
 B:BITE:HURT:22d1
 F:FORCE_MAXHP | TAKE_ITEM | UNIQUE | DROP_CORPSE | MOVE_BODY | 
 F:WILD_OCEAN |
-F:BASH_DOOR | IM_COLD | IM_ELEC | IM_POIS | ANIMAL | AQUATIC |
+F:BASH_DOOR | IM_COLD | IM_ELEC | IM_POIS | RES_WATE | ANIMAL | AQUATIC |
 F:NO_CONF | NO_SLEEP | DROP_1D2
 D:$The biggest white shark who has ever lived, it is hunting for you now! 
 D:»Ë¾åºÇÂç¤Î¥Û¥ª¥¸¥í¥¶¥á¤Ç¡¢º£¤Ë¤â¤¢¤Ê¤¿¤ò¿©¤Ù¤è¤¦¤È¤·¤Æ¤¤¤ë¡ª
@@ -8882,7 +8883,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 | HURT_LITE
+F:EVIL | TROLL | IM_COLD | IM_POIS | RES_WATE | HURT_LITE
 D:$He is a troll that reeks of brine.
 D:Èà¤Ï³¤¿å¤Î¤è¤¦¤ÊÆ÷¤¤¤òȯ¤·¤Æ¤¤¤ë¥È¥í¥ë¤À¡£
 
@@ -9199,7 +9200,7 @@ B:HIT:HURT:4d6
 F:FORCE_SLEEP | 
 F:EMPTY_MIND | COLD_BLOOD | NONLIVING |
 F:KILL_ITEM | KILL_BODY | PASS_WALL |
-F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | HURT_ROCK | 
+F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_SHAR | HURT_ROCK | 
 F:NO_CONF | NO_SLEEP | NO_FEAR
 S:1_IN_8 | 
 S:BO_ACID
@@ -10200,7 +10201,7 @@ B:GAZE:HURT:10d10
 B:GAZE:UN_BONUS:5d2
 B:GAZE:EXP_VAMP:5d2
 B:GAZE:PARALYZE:5d2
-F:FORCE_MAXHP | BASH_DOOR | EVIL | CAN_FLY 
+F:FORCE_MAXHP | BASH_DOOR | EVIL | CAN_FLY | RES_CHAO
 D:$It has two eyestalks and a large central eye. Its gaze can kill.
 D:°ì¤Ä¤ÎÂ礭¤Ê´ãµå¤ÈÆó¤Ä¤Î¾®¤µ¤Ê´ãÊÁ¤ò»ý¤Ã¤Æ¤¤¤Æ¡¢
 D:¤½¤Î´ã¤Çâˤ߻¦¤¹¤³¤È¤¬¤Ç¤­¤ë¡£
@@ -10605,7 +10606,7 @@ B:CRUSH:HURT:20d2
 F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
 F:DROP_60 | DROP_90 | DROP_2D2 | DROP_CORPSE
 F:BASH_DOOR | SMART | GOOD | 
-F:NO_CONF | NO_SLEEP | RES_NEXU | RES_TELE | RES_DISE | RIDING
+F:NO_CONF | NO_SLEEP | RES_WATE | RES_NEXU | RES_TELE | RES_DISE | RIDING
 S:1_IN_9 | 
 S:BRAIN_SMASH | CONF | SCARE | FORGET | TELE_TO | TELE_AWAY | SHRIEK
 D:$A vastly intelligent whale from the stars.
@@ -11626,7 +11627,7 @@ D:
 D:¤É¤ó¤ÊÆþ¤êÁȤó¤ÀÄÌÏ©¤Ç¤âÄ̤êÈ´¤±¤Æ¥À¥ó¥¸¥ç¥óÃæ¤Ë¶Á¤­ÅϤ롣
 
 #J0#
-N:641:¥ß¥Î¥¿¥¦¥ë¥¹
+N:641:¥ß¥Î¥¿¥¦¥í¥¹
 E:Minotaur
 G:H:U
 I:130:100d10:13:25:10
@@ -12578,7 +12579,7 @@ F:UNIQUE | MALE | CAN_SPEAK |
 F:FORCE_SLEEP | FORCE_MAXHP |
 F:EMPTY_MIND | COLD_BLOOD | KILL_WALL | 
 F:KILL_ITEM | KILL_BODY | PASS_WALL | POWERFUL | 
-F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
+F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_SHAR |
 F:HURT_ROCK | NONLIVING |
 F:NO_CONF | NO_SLEEP | NO_FEAR
 S:1_IN_6 | 
@@ -13220,7 +13221,7 @@ B:BITE:HURT:5d8
 B:CRUSH:POISON:3d10
 B:CRUSH:POISON:3d10
 F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | AQUATIC | WILD_OCEAN |
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS |
+F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS | RES_WATE |
 F:DRAGON | NO_CONF | NO_SLEEP | NO_FEAR | RIDING
 S:1_IN_6 | 
 S:BR_FIRE | BR_ACID
@@ -13338,7 +13339,7 @@ B:CRUSH:HURT:10d11
 B:CRUSH:HURT:10d11
 B:CRUSH:HURT:10d11
 B:CRUSH:HURT:10d11
-F:DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP | FRIENDLY |
+F:DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP | FRIENDLY | HURT_FIRE |
 F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
 F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
 F:GOOD | GIANT | MALE | RIDING
@@ -13443,7 +13444,7 @@ B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
 B:CRUSH:HURT:12d13
-F:UNIQUE | DROP_CORPSE | CAN_SPEAK |
+F:UNIQUE | DROP_CORPSE | CAN_SPEAK | HURT_FIRE |
 F:FORCE_SLEEP | FORCE_MAXHP | 
 F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | MOVE_BODY |
 F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
@@ -13580,7 +13581,7 @@ B:HIT:HURT:3d6
 B:HIT:HURT:3d6
 F:FORCE_SLEEP | COLD_BLOOD | EMPTY_MIND | PASS_WALL | RAND_50 | MULTIPLY |
 F:BASH_DOOR | IM_COLD | IM_ACID | IM_FIRE | IM_ELEC | IM_POIS | NONLIVING |
-F:HURT_ROCK | NO_CONF | NO_SLEEP | CHAR_MULTI | CAN_FLY 
+F:HURT_ROCK | NO_CONF | NO_SLEEP | CHAR_MULTI | CAN_FLY | RES_SHAR
 D:$A sentient, moving section of wall.
 D:°Õ¼±¤ò»ý¤Ã¤¿¡¢Æ°¤­²ó¤ëÊɤΰìÉô¤À¡£
 
@@ -13659,7 +13660,7 @@ N:722:
 E:Nightwing
 G:W:D
 I:120:60d30:20:120:10
-W:50:4:0:6000:30000:744
+W:50:4:0:6000:0:0
 B:TOUCH:POISON:3d5
 B:TOUCH:POISON:3d5
 B:HIT:UN_BONUS:6d8
@@ -14228,7 +14229,7 @@ N:744:
 E:Nightcrawler
 G:W:D
 I:120:80d60:20:160:10
-W:54:4:0:8100:70000:768
+W:54:4:0:8100:0:0
 B:STING:LOSE_CON:8d8
 B:STING:LOSE_CON:8d8
 B:BITE:ACID:10d10
@@ -14373,7 +14374,7 @@ S:BO_MANA | BO_NETH | BA_NETH |
 S:S_UNDEAD
 D:$A bloodshot eyeball floating in the air, you'd be forgiven for assuming it 
 D:$harmless.
-D:¤½¤ì¤ÏÃè¤ËÉ⤫¤Ö·ìÁö¤Ã¤¿Ì̤ܶÀ¡£Ìµ³²¤À¤È»×¤Ã¤Æ¤â¤«¤Þ¤ï¤Ê¤¤¡£
+D:¤½¤ì¤ÏÃè¤ËÉ⤫¤Ö·ìÁö¤Ã¤¿Ì̤ܶÀ¡£Ìµ³²¤À¤È»×¤Ã¤¿¤Î¤â̵Íý¤Ï¤Ê¤¤¤¬¡Ä¡£
 
 #J0#
 N:750:Ƭ³¸¤Î¥É¥ë¥¸
@@ -15268,8 +15269,8 @@ B:BITE:FIRE:5d12
 B:BITE:FIRE:5d12
 B:CRUSH:HURT:6d15
 B:CRUSH:HURT:6d15
-F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_OCEAN |
-F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS | RES_DARK |
+F:FORCE_SLEEP | FORCE_MAXHP | AQUATIC | WILD_OCEAN | EVIL |
+F:IM_FIRE | IM_ACID | IM_COLD | IM_POIS | RES_WATE | RES_DARK |
 F:DRAGON | NO_CONF | NO_SLEEP | NO_FEAR | DROP_CORPSE | RIDING
 S:1_IN_9
 S:BR_FIRE | BR_ACID | BR_DARK |
@@ -18432,7 +18433,7 @@ B:TOUCH:ACID:8d8
 B:TOUCH:PARALYZE:3d3
 F:NEVER_MOVE | MULTIPLY | ONLY_GOLD | DROP_90 | ANIMAL | HURT_ROCK |
 F:NO_FEAR | NO_SLEEP | NO_CONF | NO_STUN | EMPTY_MIND
-F:IM_COLD | IM_FIRE | IM_ELEC | IM_POIS
+F:IM_COLD | IM_FIRE | IM_ELEC | IM_POIS | RES_SHAR
 D:$Just a normal wall, boring gray rock. But wait! It seems to be growing...
 D:¤¿¤À¤ÎÉáÄ̤ÎÊɤÀ¡£¸«¤Ê¤ì¤¿³¥¿§¤Î´ä¤Ç¤Ç¤­¤Æ¤¤¤ë¡£
 D:¤¤¤ä¡¢¤Á¤ç¤Ã¤ÈÂԤƤ衩¤À¤ó¤À¤óÂ礭¤¯¤Ê¤Ã¤Æ¤¯¤ë¤è¤¦¤Ê¡Ä¡£
@@ -18495,7 +18496,7 @@ B:TOUCH:FIRE:5d5
 B:TOUCH:PARALYZE:3d3
 F:NEVER_MOVE | MULTIPLY | ONLY_GOLD | DROP_60 | DROP_90 | EMPTY_MIND
 F:ANIMAL | HURT_ROCK | COLD_BLOOD | NO_FEAR | NO_CONF | NO_SLEEP | NO_STUN |
-F:IM_ACID | IM_ELEC | IM_POIS | IM_FIRE
+F:IM_ACID | IM_ELEC | IM_POIS | IM_FIRE | RES_SHAR
 D:$It's just a block of dark rock. But wait! It seems to be growing...
 D:ÉáÄ̤ιõ¤¤´ä¤ÎÊɤÀ¡£¤·¤«¤·¤Á¤ç¤Ã¤ÈÂԤƤ衩¤À¤ó¤À¤óÂ礭¤¯¤Ê¤Ã¤Æ¤¯¤ë¤è¤¦¤Ê¡Ä
 
@@ -18506,7 +18507,7 @@ I:110:20d10:60:50:80
 W:25:1:0:500:70000:740
 B:ENGULF:HURT:5d6
 B:ENGULF:POISON:5d6
-F:AQUATIC | SMART | WEIRD_MIND | IM_POIS | ANIMAL | NO_CONF
+F:AQUATIC | SMART | WEIRD_MIND | IM_POIS | RES_WATE | ANIMAL | NO_CONF
 F:NO_SLEEP | NO_FEAR | DROP_CORPSE
 S:1_IN_4 |
 S:DARKNESS | BO_ACID | HOLD
@@ -18618,7 +18619,7 @@ W:19:1:0:100:0:0
 B:HIT:HURT:3d10
 B:HIT:HURT:3d10
 F:COLD_BLOOD | EMPTY_MIND | AQUATIC | NONLIVING
-F:IM_FIRE | IM_COLD | IM_POIS
+F:IM_FIRE | IM_COLD | IM_POIS | RES_WATE |
 F:NO_CONF | NO_SLEEP | NO_FEAR
 D:$An ingenious gnomish invention -- a golem designed for underwater
 D:$usage.
@@ -18633,7 +18634,7 @@ B:TOUCH:ELEC:3d3
 B:TOUCH:PARALYZE:3d3
 F:NEVER_MOVE | ONLY_GOLD | DROP_1D2 | DROP_90 | MULTIPLY | EMPTY_MIND
 F:ANIMAL | COLD_BLOOD | NO_FEAR | NO_SLEEP | NO_CONF | NO_STUN
-F:HURT_ROCK | IM_FIRE | IM_ACID | IM_POIS | IM_COLD
+F:HURT_ROCK | IM_FIRE | IM_ACID | IM_POIS | IM_COLD | RES_SHAR
 D:$Look! A nice vein of rock to dig in for gold! Wait a minute...
 D:¤ª¤ª¡ª¤³¤Î´ä¤Ï¤Ê¤«¤Ê¤«¤¤¤¤¶â¹ÛÀФò´Þ¤ó¤Ç¤¤¤ë¡ª¤ª¤ä¡¢¤Á¤ç¤Ã¤ÈÂԤƤ衩¡Ä
 
@@ -18656,7 +18657,7 @@ G:l:v
 I:105:15d5:10:20:5
 W:15:4:0:75:0:0
 F:NEVER_BLOW | ATTR_MULTI | AQUATIC | INVISIBLE | NO_CONF | UNDEAD |
-F:DROP_CORPSE | RES_NETH | RES_TIME |
+F:DROP_CORPSE | RES_WATE | RES_NETH | RES_TIME |
 F:EVIL
 S:1_IN_8 |
 S:BR_NETH | BR_DISE | BR_TIME | BR_NEXU | BR_POIS
@@ -18762,7 +18763,7 @@ G:l:v
 I:105:11d5:10:16:5
 W:12:4:0:60:0:0
 F:NEVER_BLOW | ATTR_MULTI | AQUATIC | NO_CONF | DROP_CORPSE |
-F:RES_CHAO | RES_DARK | RES_LITE | RES_SOUN | RES_TIME
+F:RES_WATE | RES_CHAO | RES_DARK | RES_LITE | RES_SOUN | RES_TIME
 S:1_IN_9 |
 S:BR_CHAO | BR_DARK | BR_LITE | BR_SOUN | BR_DISE | BR_TIME
 D:$A disgusting fish, it has a large gaping mouth and a small lantern dangling
@@ -18778,7 +18779,7 @@ B:CRUSH:HURT:2d8
 B:CRUSH:HURT:2d8
 B:BITE:POISON:2d8
 B:BITE:HURT:1d8
-F:FEMALE | AQUATIC
+F:FEMALE | AQUATIC | RES_WATE |
 F:ONLY_ITEM | DROP_90 | DROP_2D2 |
 F:EVIL | NO_CONF | NO_SLEEP | SMART
 S:1_IN_7 |
@@ -19234,7 +19235,7 @@ 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 | RES_LITE |
-F:NO_CONF | NO_SLEEP | CAN_FLY |
+F:NO_CONF | NO_SLEEP | NO_FEAR | CAN_FLY |
 S:1_IN_4 | 
 S:HEAL | HASTE | TELE_AWAY | BO_MANA | BO_PLAS | CAUSE_4 |
 S:S_MONSTERS | S_ANGEL | INVULNER | PSY_SPEAR | S_DRAGON | DISPEL
@@ -19256,7 +19257,7 @@ 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 | RES_LITE |
-F:NO_CONF | NO_SLEEP | CAN_FLY |
+F:NO_CONF | NO_SLEEP | NO_FEAR | CAN_FLY |
 S:1_IN_3 | 
 S:TELE_TO | BLIND | SCARE | CAUSE_4 | BO_MANA | PSY_SPEAR | INVULNER
 S:S_ANGEL | S_DRAGON | BA_LITE | HEAL | DISPEL
@@ -19793,7 +19794,7 @@ F:UNIQUE | MALE | CAN_SPEAK |
 F:FORCE_SLEEP | FORCE_MAXHP | MOVE_BODY | DROP_CORPSE
 F:ONLY_ITEM | DROP_3D2 | DROP_GOOD |
 F:SMART | OPEN_DOOR | BASH_DOOR |
-F:EVIL | IM_ACID | IM_FIRE | IM_POIS | IM_COLD
+F:EVIL | IM_ACID | IM_FIRE | IM_POIS | IM_COLD | RES_DARK
 S:1_IN_3 |
 S:HOLD | SCARE | DARKNESS | BLIND
 D:$A grim-faced dark elf, garbed in layer upon layer of gleaming black
@@ -20071,7 +20072,7 @@ W:40:6:0:900:0:0
 B:HIT:ACID:8d4
 B:HIT:ACID:8d4
 F:DROP_60 | OPEN_DOOR | BASH_DOOR | TAKE_ITEM |
-F:EVIL | IM_ACID | RES_DISE | NO_FEAR | NO_CONF | NO_SLEEP |
+F:EVIL | IM_ACID | RES_SHAR | RES_DISE | NO_FEAR | NO_CONF | NO_SLEEP |
 S:1_IN_6 |
 S:BO_ACID | BO_PLAS | BA_ACID
 D:$A Dao is a genie from the elemental plane of Earth.
@@ -20741,7 +20742,7 @@ F:MOVE_BODY | KILL_WALL | IM_FIRE | IM_ELEC | IM_POIS | IM_ACID | IM_COLD |
 F:RES_NETH | RES_WATE | RES_PLAS | RES_NEXU |
 F:RES_DISE | RES_WALL | RES_INER | RES_TIME | RES_GRAV | NO_STUN | REGENERATE |
 F:NO_CONF | NO_SLEEP | CAN_FLY |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR | POWERFUL | RAND_25 |
+F:COLD_BLOOD | BASH_DOOR | POWERFUL | RAND_25 |
 F:GOOD | DROP_CORPSE | SELF_LITE_2
 D:$He was the braver of Atlantis. His body was converted by a Shinto priest, 
 D:$in order to fight against "Papa". His body is now made by Orihalcon.
@@ -20974,7 +20975,7 @@ B:BITE:HURT:3d4
 F:FORCE_MAXHP | 
 F:ONLY_ITEM | DROP_1D2 | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:ANIMAL | IM_POIS
+F:ANIMAL | IM_POIS | RES_WATE
 D:$This crocodile grew huge in the sewer. 
 D:$For him, an adventurer is only game.
 #D:¸¶¹Æ¤¬ÃÙ¤ì¤ë¤È¤ä¤Ã¤Æ¤¯¤ë¥ï¥Ë¡£
@@ -21058,7 +21059,7 @@ B:CRUSH:SUPERHURT:7d17
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
 F:DROP_3D2 | DROP_4D2 | CAN_FLY | RIDING |
 F:SMART | BASH_DOOR | POWERFUL | MOVE_BODY |
-F:IM_FIRE | IM_ELEC | IM_POIS |
+F:IM_FIRE | IM_ELEC | IM_POIS | RES_SHAR |
 F:EVIL | DRAGON | NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP
 D:$A huge dragon all made of steel. It looks very solid...
 D:Á´¿È¤¬¹ÝÅ´¤Ç¤Ç¤­¤¿µðÂç¤Ê¥É¥é¥´¥ó¤À¡£Èó¾ï¤Ë¹Å¤½¤¦¤Ë¸«¤¨¤ë...
@@ -21131,7 +21132,7 @@ G:p:y
 I:110:6d8:20:10:5
 W:4:1:0:18:600:1055
 B:HIT:HURT:1d9
-F:DROP_60 | WILD_ALL | HUMAN |
+F:DROP_60 | WILD_ALL | HUMAN | MALE |
 F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
 F:HAS_LITE_1 | NO_CONF | NO_SLEEP
 S:1_IN_12 |
@@ -21145,7 +21146,7 @@ G:p:y
 I:110:6d8:20:10:5
 W:8:1:0:18:600:1055
 B:HIT:HURT:1d6
-F:DROP_60 | WILD_ALL | FRIENDS | HUMAN |
+F:DROP_60 | WILD_ALL | FRIENDS | HUMAN | MALE |
 F:OPEN_DOOR | DROP_SKELETON | DROP_CORPSE | 
 F:HAS_LITE_1 | NO_CONF | NO_SLEEP
 S:1_IN_12 |
-- 
2.11.0