･筵ｹ･ｿ｡ｼ､ﾎ･ﾕ･鬣ｰ､ｬｽﾅﾊ｣､ｷ､ﾆ､､､ｿﾉｬ､ﾎｽ､ﾀｵ.

[hengband/hengband.git] / lib / edit / r_info.txt

diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index cf65029..1bff6b6 100644 (file)
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -245,7 +245,7 @@ D:
 
 #JZ#
 #JZ#(¥³¥á¥ó¥È)Ìõ¤Ï »ç·î´×´Ý¤µ¤ó
-N:4:¥º¥ª¥¢¥ª¥È¥ê
+N:4:¥º¥¢¥ª¥¢¥È¥ê
 E:Chaffinch
 G:B:r
 I:110:1d1:30:1:10
@@ -254,7 +254,7 @@ B:BITE:HURT:1d3
 F:RAND_25 | CAN_FLY | WILD_ONLY | WILD_WOOD | WILD_GRASS
 F:ANIMAL | DROP_SKELETON
 D:$Utterly harmless, except when angry.
-D:Åܤ餻¤Ê¤±¤ì¤ÐÁ´¤¯Ìµ³²¤À¡£
+D:ƬÀIJַܡ£Åܤ餻¤Ê¤±¤ì¤ÐÁ´¤¯Ìµ³²¤À¡£
 
 #JZ#
 N:5:Ì¤µ¤®
@@ -749,7 +749,7 @@ D:
 
 #JZ#
 N:39:¡Ø¥°¥ì¡¼¥¿¡¼¡¦¥Ø¥ë=¥Ó¡¼¥¹¥È¡Ù
-E:Greater hell-beast
+E:Greater Hell-Beast
 G:U:s
 I:115:15d100:10:100:99
 W:1:6:0:250:0:0
@@ -1103,10 +1103,10 @@ B:CLAW:HURT:1d6
 B:CLAW:HURT:1d6
 F:BASH_DOOR | WILD_ALL | DROP_SKELETON | DROP_CORPSE
 F:ANIMAL
-D:$A larger than normal feline, hissing loudly.  Its velvet claws conceal a 
-D:$fistful of needles.
-D:Ä̾ï¤Î¥Í¥³¤è¤êÂΤ¬Â礭¤¯¤ÆÂ礭¤ÊÀ¼¤ÇÌĤ¯¡£¤½¤Î¥Ó¥í¡¼¥É¤ÎÈþ¤·¤¤ÄޤϱԤ¤
-D:¿Ë¤Î¤è¤¦¤À¡£
+D:$A larger than normal feline, hissing loudly.  Its velvet paws conceal a
+D:$ fistful of needles.
+D:Ä̾ï¤Î¥Í¥³¤è¤êÂΤ¬Â礭¤¯¤ÆÂ礭¤ÊÀ¼¤ÇÌĤ¯¡£
+D:¤½¤Î½À¤é¤«¤¯Èþ¤·¤¤Â­¤Ë¤Ï±Ô¤¤ÄÞ¤¬±£¤µ¤ì¤Æ¤¤¤ë¡£
 
 #J0#
 N:63:¡Ø¥¹¥á¥¢¥´¥ë¡Ù
@@ -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:¤½¤ì¤Ï¤­¤ï¤É¤¯±Ô¤¤»õ¤ò»ý¤Ã¤¿Æù¿©¤Îµû¤À¡£
 
@@ -2497,7 +2497,7 @@ B:BITE:EAT_FOOD:1d4
 F:MULTIPLY | IM_POIS | RES_DARK | HURT_LITE | EVIL | DEMON | OPEN_DOOR | 
 F:TAKE_ITEM | CAN_SWIM 
 D:$Don't splash water on them, and don't feed them after midnight!
-D:¿¿ÌëÃæ¤ò²á¤®¤¿¤é¿å¤ò³Ý¤±¤¿¤ê¡¢±Â¤ò¤ä¤Ã¤Æ¤Ï¤¤¤±¤Ê¤¤¡ª
+D:¿å¤ò³Ý¤±¤¿¤ê¡¢¿¿ÌëÃæ¤ò²á¤®¤Æ¤«¤é±Â¤ò¤ä¤Ã¤Æ¤Ï¤¤¤±¤Ê¤¤¡ª
 
 #J0#
 N:154:¥¤¥¨¥Æ¥£
@@ -2576,7 +2576,7 @@ D:
 
 #JZ#
 N:159:¡Ø¼êÉ餤¤Î·§¡Ù
-E:The wounded bear
+E:The Wounded Bear
 G:q:r
 I:110:10d10:10:35:10
 W:9:1:0:25:0:0
@@ -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:ËÜÅö¤Ë´ñ̯¤ÊÇϤȵû¤Î³Ý¤±¹ç¤ï¤»¤À¡£
@@ -3456,12 +3456,14 @@ D:
 N:209:¥Ò¥Ý¥°¥ê¥Õ
 E:Hippogriff
 G:H:U
-I:110:20d9:12:14:10
-W:11:1:0:30:200:279
-B:HIT:HURT:2d6
-B:BITE:HURT:2d6
-F:BASH_DOOR | CAN_FLY | WILD_MOUNTAIN | WILD_GRASS |
-F:ANIMAL | DROP_CORPSE | RIDING
+I:115:40d10:20:60:70
+W:15:1:0:50:0:0
+B:KICK:HURT:4d2
+B:KICK:HURT:4d2
+B:BITE:HURT:4d2
+F:FORCE_MAXHP | DROP_CORPSE | CAN_FLY | ANIMAL | RIDING |
+F:BASH_DOOR |
+F:IM_POIS | IM_COLD | IM_ELEC | RES_CHAO
 D:$A strange hybrid of eagle, lion and horse.  It looks weird.
 D:¥ï¥·¤È¥é¥¤¥ª¥ó¤ÈÇϤκ®·ì¤·¤¿´ñ̯¤ÊÀ¸Êª¤À¡£¤½¤ì¤ÏĶ¼«Á³Åª¤ÊÊ·°Ïµ¤¤ò
 D:»ý¤Ã¤Æ¤¤¤ë¡£
@@ -3555,7 +3557,7 @@ B:HIT:HURT:1d12
 B:HIT:HURT:1d12
 B:HIT:HURT:1d10
 B:HIT:HURT:1d10
-F:UNIQUE | MALE | 
+F:UNIQUE | MALE | QUESTOR |
 F:FORCE_MAXHP | WILD_ALL |
 F:ESCORT | DROP_SKELETON | DROP_CORPSE
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | EAT_POISONOUS
@@ -3572,7 +3574,7 @@ I:110:12d8:20:34:20
 W:12:1:0:40:400:372
 B:HIT:HURT:3d6
 B:HIT:HURT:3d6
-F:MALE | WILD_ALL | HAS_LITE_2 |
+F:MALE | HUMAN | WILD_ALL | HAS_LITE_2 |
 F:DROP_1D2 | DROP_SKELETON | DROP_CORPSE
 F:OPEN_DOOR | BASH_DOOR
 D:$A warrior of considerable skill.
@@ -3641,7 +3643,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 +4110,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:ÀöÎý¤µ¤ì¤¿¡¢¤·¤«¤â¹¥ÀïŪ¤Ê³¤¤Î¥¨¥ë¥Õ¤Î¼ï²¤À¡£
@@ -4500,7 +4502,7 @@ G:Z:o
 I:110:6d6:30:30:0
 W:15:1:0:50:0:0
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | DROP_CORPSE
+F:FORCE_SLEEP |
 F:FRIENDS | SELF_LITE_1 | SELF_LITE_2 |
 F:BASH_DOOR | 
 F:ANIMAL | RES_LITE
@@ -4516,7 +4518,7 @@ G:Z:D
 I:110:6d6:30:30:0
 W:15:1:0:50:0:0
 B:BITE:HURT:1d6
-F:FORCE_SLEEP | DROP_CORPSE
+F:FORCE_SLEEP |
 F:FRIENDS |
 F:BASH_DOOR | HURT_LITE | 
 F:ANIMAL | RES_DARK
@@ -4625,12 +4627,17 @@ D:
 N:279:¥°¥ê¥Õ¥©¥ó
 E:Griffon
 G:H:u
-I:110:30d8:12:15:10
-W:15:1:0:70:0:0
-B:HIT:HURT:3d4
-B:BITE:HURT:2d6
-F:BASH_DOOR | CAN_FLY | WILD_WOOD | WILD_MOUNTAIN | WILD_GRASS |
-F:ANIMAL | DROP_CORPSE | RIDING
+I:115:30d10:20:50:70
+W:15:1:0:50:0:0
+B:SHOOT:HURT:4d5
+B:CLAW:HURT:2d3
+B:CLAW:HURT:2d3
+B:BITE:HURT:2d3
+F:FORCE_MAXHP | DROP_CORPSE | CAN_FLY | RIDING |
+F:BASH_DOOR | 
+F:ANIMAL | IM_COLD | IM_ELEC | IM_ACID
+S:1_IN_10 |
+S:SHOOT
 D:$It is half lion, half eagle.  It flies menacingly towards you.
 D:¤½¤ÎÂΤÏȾʬ¤¬¥é¥¤¥ª¥ó¤Ç¡¢È¾Ê¬¤¬¥ï¥·¤À¡£¤½¤ì¤ÏËÁ¸±¼Ô¤ÎÊý¤Ø°Ò³ÅŪ¤Ë
 D:Èô¤ó¤Ç¤¯¤ë¡£
@@ -4675,7 +4682,7 @@ B:BITE:HURT:1d6
 B:BITE:HURT:1d6
 B:BITE:HURT:1d6
 F:ATTR_CLEAR | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE
+F:FRIENDS |
 F:INVISIBLE | BASH_DOOR | 
 F:ANIMAL
 D:$A completely translucent hound.
@@ -4846,7 +4853,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 +4954,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 +5054,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:ÃÎǽ¤ò»ý¤Ã¤¿´ä¤¬±²´¬¤¤¤¿¤è¤¦¤Ê»Ñ¤ò¤·¤Æ¤¤¤ë¡£
@@ -5079,7 +5086,7 @@ B:BITE:FIRE:2d3
 F:FORCE_SLEEP | SELF_LITE_2 |
 F:FRIENDS | 
 F:BASH_DOOR | HURT_COLD |
-F:ANIMAL | IM_FIRE | DROP_SKELETON | DROP_CORPSE |
+F:ANIMAL | IM_FIRE |
 S:1_IN_10 | 
 S:BR_FIRE
 D:$Flames lick at its feet and its tongue is a blade of fire.  You can feel a 
@@ -5098,7 +5105,7 @@ B:CLAW:HURT:1d8
 B:BITE:COLD:1d6
 F:FORCE_SLEEP | 
 F:FRIENDS | HURT_FIRE |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE |
+F:BASH_DOOR |
 F:ANIMAL | IM_COLD
 S:1_IN_10 | 
 S:BR_COLD
@@ -5117,7 +5124,7 @@ B:BITE:HURT:2d3
 B:BITE:HURT:2d3
 B:BITE:ELEC:2d3
 F:FORCE_SLEEP | SELF_LITE_2 |
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE |
+F:FRIENDS |
 F:BASH_DOOR | 
 F:ANIMAL | IM_ELEC
 S:1_IN_10 | 
@@ -5274,7 +5281,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 +5426,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 +5462,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 +5480,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 +5609,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:°Õ¼±¤ò»ý¤Ã¤¿ÊɤΰìÉô¤À¡£
 
@@ -5617,7 +5625,7 @@ B:BITE:HURT:1d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 F:FORCE_SLEEP | 
-F:FRIENDS | DROP_SKELETON | DROP_CORPSE
+F:FRIENDS |
 F:BASH_DOOR | HURT_ROCK |
 F:ANIMAL | RES_SHAR
 S:1_IN_10 | 
@@ -5640,7 +5648,7 @@ B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 F:FORCE_SLEEP | 
 F:FRIENDS | CAN_FLY |
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE | EAT_POISONOUS |
+F:BASH_DOOR |
 F:ANIMAL | IM_POIS
 S:1_IN_10 | 
 S:BR_POIS
@@ -5678,7 +5686,7 @@ B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
 F:FORCE_SLEEP | 
 F:FRIENDS | 
-F:BASH_DOOR | CAN_SWIM | DROP_SKELETON | DROP_CORPSE | EAT_ACIDIC |
+F:BASH_DOOR | CAN_SWIM |
 F:ANIMAL | IM_ACID
 S:1_IN_10 | 
 S:BR_ACID
@@ -6028,7 +6036,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.
@@ -6039,16 +6047,16 @@ D:
 N:361:¥­¥ã¥ê¥ª¥ó
 E:Carrion
 G:B:W
-I:113:15d12:20:28:20
-W:21:1:0:70:1000:434
-B:CLAW:POISON:2d3
-B:CLAW:POISON:2d3
-B:BITE:EXP_20:1d8
-F:DROP_90 | 
-F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
-F:EVIL | ANIMAL | UNDEAD | CAN_FLY |
-F:IM_COLD | IM_POIS | RES_NETH |
-F:NO_CONF | NO_SLEEP | NO_FEAR | RIDING
+I:115:30d10:20:50:50
+W:15:1:0:50:0:0
+B:CLAW:HURT:4d3
+B:CLAW:HURT:4d3
+B:BITE:HURT:4d3
+F:FORCE_MAXHP | CAN_FLY |
+F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR |
+F:EVIL | ANIMAL | UNDEAD | RIDING |
+F:NO_CONF | NO_SLEEP | NO_FEAR |
+F:IM_ACID | IM_FIRE | IM_POIS | RES_NETH
 D:$A mummified, undead great avian creature, who now serves as 
 D:$a steed for mighty undead creatures.
 D:¥ß¥¤¥é²½¤·¤¿¥¢¥ó¥Ç¥Ã¥É¤ÎÈô¹ÔÀ¸Êª¤Ç¡¢¶¯ÎϤʥ¢¥ó¥Ç¥Ã¥É¥â¥ó¥¹¥¿¡¼¤Ë¾èʪ¤È¤·¤Æ
@@ -6079,7 +6087,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,11 +6418,11 @@ 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.
-D:¤³¤Î¾®¤µ¤Ê°Ç¤Î¥É¥ï¡¼¥Õ¤ÏÈà¤Î·»¥¢¥ë¥Ù¥ê¥åÒ¤ËÉ餱¤Ê¤¤¤¯¤é¤¤¶â¤ËìÅÍߤÀ¡£
+D:¤³¤Î¾®¤µ¤Ê°Ç¤Î¥É¥ï¡¼¥Õ¤ÏÈà¤Î·»¥¢¥ë¥Ù¥ê¥Ò¤ËÉ餱¤Ê¤¤¤¯¤é¤¤¶â¤ËìÅÍߤÀ¡£
 
 #JZ#
 #JZ#¥¢¥ë¥Ù¥ê¥Ò¤Î©»Ò¥Ï¡¼¥²¥ó
@@ -6422,7 +6430,7 @@ D:
 #JZ#¥¢¥ë¥Ù¥ê¥Ò¤Î©»Ò¤Ç¤¢¤ê¡¢¥°¥ó¥¿¡¼²¦¤Î°ÛÉãÄï¤Ë¤¢¤¿¤ê¤Þ¤¹¡£Õ¡·×¤Ë
 #JZ#¤è¤Ã¤Æ¥¸¡¼¥¯¥Õ¥ê¡¼¥É¤ò»¦³²¤·¡¢»Ø´Ä¤òÃ¥¤Ã¤¿ÈȿͤǤ¹¡£ by µ×ᤵ¤ó
 N:383:¥¢¥ë¥Ù¥ê¥Ò¤Î©»Ò¡Ø¥Ï¡¼¥²¥ó¡Ù
-E:Hagen, son of Alberich
+E:Hagen, Son of Alberich
 G:h:o
 I:110:82d10:20:80:10
 W:24:2:0:300:0:0
@@ -6434,7 +6442,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 +6496,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 +6854,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 +7111,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 
@@ -7119,7 +7127,7 @@ I:120:13d13:20:40:20
 W:27:2:0:130:0:0
 B:SLASH:EXP_20:2d13
 B:SLASH:EXP_20:2d13
-F:CHAR_MULTI | EVIL | IM_POIS | IM_COLD | 
+F:CHAR_MULTI | EVIL | IM_POIS | IM_COLD | RES_CHAO |
 F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY |
 F:COLD_BLOOD | BASH_DOOR | NONLIVING |
 F:NO_CONF | NO_SLEEP | NO_FEAR
@@ -7259,7 +7267,7 @@ B:CLAW:HURT:3d3
 F:FORCE_SLEEP | 
 F:FRIENDS | 
 F:BASH_DOOR | 
-F:ANIMAL | RES_SOUN | NO_CONF | NO_SLEEP | DROP_SKELETON | DROP_CORPSE
+F:ANIMAL | RES_SOUN | NO_CONF | NO_SLEEP |
 S:1_IN_5 | 
 S:BR_SOUN
 D:$A blurry canine form which seems to be moving as fast as the eye can 
@@ -7277,7 +7285,7 @@ B:BITE:HURT:2d8
 B:BITE:HURT:2d8
 B:CLAW:HURT:3d3
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | RES_NEXU | DROP_SKELETON | DROP_CORPSE | EAT_NEXUS |
+F:FORCE_SLEEP | RES_NEXU |
 F:FRIENDS | 
 F:BASH_DOOR | 
 F:ANIMAL | NO_CONF | NO_SLEEP
@@ -7558,7 +7566,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 +7653,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 +7709,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:µðÂç¤Ê¥È¥²¤Î¤Ä¤¤¤¿¥í¡¼¥é¡¼¤Î¤è¤¦¤À¡£¤³¤Î¥À¥ó¥¸¥ç¥ó¤ò¤­¤ì¤¤¤ËÊݤĤ褦
@@ -7944,7 +7952,7 @@ D:$It has a form that legends are made of.  Its still-tender scales are a
 D:$deep green in hue.  Foul gas seeps through its scales.
 D:¤½¤ì¤Ï¤Þ¤µ¤Ë¤³¤ì¤«¤éÅÁÀâ¤òºî¤é¤ó¤È¤¹¤ë¤«¤Î¤è¤¦¤Ê³èÎϤËËþ¤Á¤¿»Ñ¤ò¤·¤Æ¤¤¤ë¡£
 D:¤Þ¤À½À¤é¤«¤¤¤½¤Î¤¦¤í¤³¤Ï¿¼¤¤Î理ò¤·¤Æ¤¤¤ë¡£ÉÔ·é¤Ê¥¬¥¹¤¬¤½¤Î¤¦¤í¤³¤«¤é¤·¤ß
-D:½Ð¤Æ¤¤¤ë
+D:½Ð¤Æ¤¤¤ë¡£
 
 #J0#
 N:462:¥ä¥ó¥°¡¦¥Ö¥í¥ó¥º¡¦¥É¥é¥´¥ó
@@ -7977,7 +7985,7 @@ B:CLAW:HURT:1d6
 B:BITE:POISON:1d20
 B:CRUSH:HURT:2d9
 F:TROLL | EVIL | FRIENDS | OPEN_DOOR | BASH_DOOR | DROP_CORPSE
-F:IM_POIS | IM_ACID | REGENERATE | EAT_POISONOUS | REGENERATE |
+F:IM_POIS | IM_ACID | REGENERATE | EAT_POISONOUS
 S:1_IN_7
 S:BR_POIS
 D:$Pale, bald, fat, hairless troll creatures. Ugly beyond description. 
@@ -8048,7 +8056,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:»Ë¾åºÇÂç¤Î¥Û¥ª¥¸¥í¥¶¥á¤Ç¡¢º£¤Ë¤â¤¢¤Ê¤¿¤ò¿©¤Ù¤è¤¦¤È¤·¤Æ¤¤¤ë¡ª
@@ -8480,7 +8488,7 @@ D:
 D:¤¿¤¯¤Ê¤Ã¤Æ¤¤¤ë¡£
 D:¤«¤Ä¤Æ¥É¥ê¡¼¥à¥é¥ó¥É¤Ç°ìÈֹ⤤ʸÌÀ¤ÎÃæ¿´¤Ç¤¢¤Ã¤¿¥µ¥ë¥Ê¥¹¤ò¡¢°ìÈÕ¤ÇÇ˲õ¤·
 D:¤Æ¤·¤Þ¤Ã¤¿¤³¤È¤¬¤¢¤ë¡£
-D:¥Ü¥¯¥ë¥°¤ÎÈ¿±þ¤ÏÈó¾ï¤ËÆߤ¯¡¢à¨ÃîÎà¤é¤·¤¯ÃÙ¤¤¥Ú¡¼¥¹¤Ç¹ÔÆ°¤¹¤ë¡£
+D:¥Ü¥¯¥é¥°¤ÎÈ¿±þ¤ÏÈó¾ï¤ËÆߤ¯¡¢à¨ÃîÎà¤é¤·¤¯ÃÙ¤¤¥Ú¡¼¥¹¤Ç¹ÔÆ°¤¹¤ë¡£
 D:·ã¤·¤¤Åܤê¤ò¡¢Áê¼ê¤¬¤È¤Ã¤¯¤Ë»à¤ó¤Ç¤¤¤ë¤È¤¤¤¦¤Î¤Ë¡¢¤½¤Î»Ò¹¤Ë¸þ¤±¤Æ¤Ö¤Ä¤±
 D:¤ë¤³¤È¤â¤¢¤ë¤È¤¤¤¦¡£
 D:¡Ê¥é¥ô¥¯¥é¥Õ¥È¡Ö¥µ¥ë¥Ê¥¹¤ò¤ß¤Þ¤Ã¤¿ºÒÌñ¡×¾¡Ë
@@ -8629,7 +8637,7 @@ W:33:2:0:450:5000:597
 B:HIT:HURT:2d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
-F:MALE | OPEN_DOOR | BASH_DOOR | TAKE_ITEM | DROP_1D2 | ONLY_ITEM |
+F:MALE | HUMAN | OPEN_DOOR | BASH_DOOR | TAKE_ITEM | DROP_1D2 | ONLY_ITEM |
 F:EVIL | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP | DROP_SKELETON | DROP_CORPSE
 S:1_IN_4
 S:HOLD | SCARE | BLIND | CAUSE_3 | TRAPS | DARKNESS | FORGET | HASTE
@@ -8649,7 +8657,7 @@ B:KICK:HURT:10d2
 F:MALE | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | EVIL | HAS_LITE_1 |
 F:ONLY_ITEM | DROP_1D2 | ATTR_ANY | DROP_SKELETON | DROP_CORPSE
-F:INVISIBLE | OPEN_DOOR | BASH_DOOR | HAS_LITE_1 |
+F:INVISIBLE | OPEN_DOOR | BASH_DOOR |
 F:IM_ACID | IM_POIS | NO_CONF | NO_SLEEP | EAT_CONF | EAT_INSANITY |
 S:1_IN_6 | 
 S:HEAL | 
@@ -8882,7 +8890,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:Èà¤Ï³¤¿å¤Î¤è¤¦¤ÊÆ÷¤¤¤òȯ¤·¤Æ¤¤¤ë¥È¥í¥ë¤À¡£
 
@@ -8964,8 +8972,8 @@ B:BITE:HURT:4d4
 B:BITE:HURT:4d4
 F:FORCE_SLEEP | 
 F:FRIENDS | 
-F:BASH_DOOR | ATTR_MULTI | DROP_SKELETON | DROP_CORPSE
-F:ANIMAL | NO_CONF | NO_SLEEP | SELF_LITE_2 | EAT_POISONOUS | EAT_ACIDIC |
+F:BASH_DOOR | ATTR_MULTI |
+F:ANIMAL | NO_CONF | NO_SLEEP | SELF_LITE_2 |
 F:IM_ELEC | IM_POIS | IM_ACID | IM_FIRE | IM_COLD
 S:1_IN_5
 S:BR_ACID | BR_POIS | BR_COLD | BR_FIRE | BR_ELEC
@@ -9165,7 +9173,7 @@ B:HIT:EXP_20:13d1
 B:HIT:EXP_20:13d1
 F:FORCE_MAXHP | OPEN_DOOR | FRIENDS | DROP_60 | REGENERATE |
 F:ONLY_ITEM | NO_FEAR | NONLIVING |
-F:EVIL | IM_POIS | IM_COLD | IM_FIRE | DEMON 
+F:EVIL | IM_POIS | IM_COLD | IM_FIRE | RES_CHAO | DEMON
 D:$Slender, red-skinned demons twisting in nightmarish shapes. 
 D:$They are armed with hellblades, which will suck the life from 
 D:$your body.
@@ -9199,7 +9207,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
@@ -9496,7 +9504,7 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | FRIENDS | DROP_SKELETON | DROP_CORPSE
+F:FORCE_SLEEP | FRIENDS |
 F:BASH_DOOR | 
 F:ANIMAL | RES_GRAV | NO_CONF | NO_SLEEP | 
 S:1_IN_5 | 
@@ -9540,7 +9548,7 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:CLAW:HURT:3d3
-F:FORCE_SLEEP | FRIENDS | DROP_SKELETON | DROP_CORPSE
+F:FORCE_SLEEP | FRIENDS |
 F:BASH_DOOR | 
 F:ANIMAL | RES_INER | NO_CONF | NO_SLEEP
 S:1_IN_5 | 
@@ -9562,7 +9570,7 @@ B:BITE:HURT:2d12
 B:CLAW:HURT:3d3
 F:FORCE_SLEEP | 
 F:FRIENDS | 
-F:BASH_DOOR | DROP_SKELETON | DROP_CORPSE
+F:BASH_DOOR |
 F:ANIMAL | RES_WALL | NO_CONF | NO_SLEEP
 S:1_IN_8 | 
 S:BR_WALL
@@ -10143,7 +10151,7 @@ D:
 
 #JZ#
 N:572:¡Ø¥°¥ì¡¼¥¿¡¼ÃϹöËâË¡¤ª¤Ð¤±¥­¥Î¥³=¥¯¥¤¥ë¥¹¥ë¥°¿Í´Ö¡Ù
-E:The Greater hell magic mushroom were-quylthulg
+E:The Greater Hell Magic Mushroom Were-Quylthulg
 G:Q:s
 I:120:19d99:50:80:50
 W:36:3:0:2500:0:0
@@ -10191,7 +10199,7 @@ D:$A Lord of Chaos famous for his skill at arms.
 D:º®Æ٤ε®Â²¤Ç¡¢Éð½Ñ¤Îã¿Í¤È¤·¤Æͭ̾¡£Àµ¡¹Æ²¡¹¤ÈÀ臘¤³¤È¤ò¹¥¤à¡£
 
 #JZ#
-N:574:º®ÆÙ¤ÎÍ»Ò
+N:574:º®ÆÙ¤ÎÍî¤Ȥ·»Ò
 E:Chaos spawn
 G:e:u
 I:110:26d26:20:50:20
@@ -10200,7 +10208,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 +10613,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.
@@ -10684,7 +10692,7 @@ B:HIT:HURT:6d6
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:EXP_20
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_NETH | HUMAN |
+F:FORCE_SLEEP | FORCE_MAXHP | SMART | RES_NETH | MALE | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | 
 F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | IM_COLD | HAS_LITE_1 |
@@ -11083,7 +11091,7 @@ B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
 B:HIT:HURT:5d5
-F:UNIQUE | FEMALE | DROP_1D2 | DROP_2D2 | ONLY_ITEM | DROP_GOOD |
+F:UNIQUE | FEMALE | DROP_1D2 | DROP_2D2 | ONLY_ITEM | DROP_GOOD | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | RAND_25 | DROP_CORPSE |
 F:CAN_SPEAK | CAN_SWIM | WILD_OCEAN |
 F:KILL_ITEM | KILL_BODY | BASH_DOOR | POWERFUL |
@@ -11347,19 +11355,16 @@ F:CAN_SWIM | NO_CONF | NO_SLEEP |
 D:$Weird, jelly like creatures. No two look the same.
 D:µ¤Ì£¤Î°­¤¤¥¼¥ê¡¼¾õÀ¸Êª¡£Æ±¤¸¤è¤¦¤Ë¤ß¤¨¤ë¤â¤Î¤ÏÆó¤Ä¤È̵¤¤¡£
 
-#JZ#
-N:627:¡ØFat Man¡Ù
-E:Fat Man
-G:{:D
-I:120:14d14:10:80:12
-W:40:255:0:200:0:0
-B:EXPLODE:SHATTER:200d2
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | REFLECTING |
-F:EMPTY_MIND | COLD_BLOOD | BASH_DOOR |
-F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS |
-F:NO_FEAR | NO_CONF | NO_SLEEP | NONLIVING | RES_TELE
-D:$A shining machine of death and destruction.
-D:µ±¤¯»à¤ÈÇ˲õ¤Îµ¡³£¤À¡£
+N:627:ÃϹö¤ÎÅ´ÄÈ
+E:Hammer of hell
+G:\:v
+I:100:50d10:30:40:0
+W:24:5:0:1000:0:0
+B:CRUSH:SUPERHURT:30d1
+F:COLD_BLOOD | EVIL | NO_SLEEP | NO_CONF | NO_FEAR | NO_STUN | NONLIVING |
+F:IM_ACID | IM_COLD | IM_POIS | RES_NETH | RES_DARK | BASH_DOOR
+D:$A foul iron hammer forged with body and souls of victims on the infernal anvil.
+D:µ¾À·¼Ô¤ÎÁõÈ÷¤Èº²¤ò¸Ç¤á¤Æ¡¢ÃϹö¤ÎÅ´¾²¤ÇÃ䨤ƤǤ­¤¿²Ò¡¹¤·¤¤Å´ÄȤÀ¡£
 
 #JZ#
 N:628:¼ö¤ï¤ì¤·¡Ø¥Þ¥ì¥­¥¹¡Ù
@@ -11388,7 +11393,7 @@ D:
 #JZ#
 #JZ#¥â¥ë¥¬¥ó¥¹¥¿¡¼¥ó¡£ÌÀ¤ÎÌÀÀ±¹æ¡£¥¸¥å¥ê¥¢¥ó¤¬¾è¤Ã¤Æ¤¤¤ëÇÏ¡£ by Æ£²¬¤µ¤ó
 N:629:¥¸¥å¥ê¥¢¥ó¤Î¾èÇÏ¡ØÌÀ¤ÎÌÀÀ±¡Ù
-E:Morgenstern, Julian's steed
+E:Morgenstern, Julian's Steed
 G:q:W
 I:130:30d100:20:100:50
 W:40:3:0:2000:0:0
@@ -11436,7 +11441,7 @@ B:HIT:HURT:4d4
 B:HIT:HURT:5d5
 B:HIT:HURT:6d6
 F:FORCE_MAXHP | 
-F:DROP_90 | REGENERATE | FRIENDS | REGENERATE |
+F:DROP_90 | REGENERATE | FRIENDS |
 F:OPEN_DOOR | BASH_DOOR | DROP_CORPSE
 F:EVIL | TROLL | IM_POIS | NO_CONF | NO_SLEEP | NO_FEAR
 D:$A massive troll, equipped with a scimitar and heavy armour.
@@ -11626,7 +11631,7 @@ D:
 D:¤É¤ó¤ÊÆþ¤êÁȤó¤ÀÄÌÏ©¤Ç¤âÄ̤êÈ´¤±¤Æ¥À¥ó¥¸¥ç¥óÃæ¤Ë¶Á¤­ÅϤ롣
 
 #J0#
-N:641:¥ß¥Î¥¿¥¦¥ë¥¹
+N:641:¥ß¥Î¥¿¥¦¥í¥¹
 E:Minotaur
 G:H:U
 I:130:100d10:13:25:10
@@ -11953,7 +11958,7 @@ D:
 D:³°¸«¤ÏˢΩ¤ÄÉÔÄê·Á¤Î¸Ç¤Þ¤ê¤Ç¡¢²¿É´¤â¤Îµ¶Â­¤¬¤½¤³¤«¤é¿­¤Ó¤Æ¤¤¤ë¡£
 D:¥¦¥Ü¡á¥µ¥¹¥é¤Îµ¶Â­¤ÏÀ䤨´Ö¤Ê¤¯·ÁÀ®¤µ¤ì¤Æ¤Ï¿¶¤ê²ó¤µ¤ì¡¢
 D:¥¨¥µ¤Ë¿¨¤ì¤ë¤È¤½¤ì¤òÄϤó¤Ç¼«Ê¬¤ÎÃæ¤Ë¼è¤ê¹þ¤ó¤Ç¤¤¤ë¡£
-D:¤Þ¤¿¡¢¥¦¥Ü¡á¥µ¥¹¥é¤«¤é¤ÏÀ䤨´Ö¤Ê¤¯¡ÖÍ»Ò¡×¤¬À¸»º¤µ¤ì¤Ä¤Å¤±¤Æ¤ª¤ê¡¢
+D:¤Þ¤¿¡¢¥¦¥Ü¡á¥µ¥¹¥é¤«¤é¤ÏÀ䤨´Ö¤Ê¤¯¡ÖÍî¤Ȥ·»Ò¡×¤¬À¸»º¤µ¤ì¤Ä¤Å¤±¤Æ¤ª¤ê¡¢
 D:¥¦¥Ü¡á¥µ¥¹¥éËÜÂΤϤ½¤ì¤ò¥¨¥µ¤È¤·¤ÆºÆ¤Ó¼«Ê¬¤ÎÃæ¤ËµÛ¼ý¤·¤Æ¤¤¤ë¡£
 D:´õ¤Ë¿Æ¤Îµ¶Â­¤«¤éƨ¤ì¤¿¤â¤Î¤Ï¡¢
 D:º²¤Î̵¤¤¿Æ¤Îµ¤¤Þ¤°¤ì¤ÎÂå¹Ô¼Ô¤È¤Ê¤ë¤¬¡¢Æ¶·¢¤«¤é½Ð¤ë¤³¤È¤Ï¤Ê¤¤¤è¤¦¤À¡£
@@ -12081,7 +12086,7 @@ D:
 
 #JZ#
 N:660:¥Ö¥é¥ó¥É¤Î©»Ò¡Ø¥ê¥Ê¥ë¥É¡Ù
-E:Rinaldo, son of Brand
+E:Rinaldo, Son of Brand
 G:p:w
 I:120:16d100:20:120:40
 W:41:3:0:7000:0:0
@@ -12309,7 +12314,7 @@ F:ANIMAL | NO_CONF | NO_SLEEP | CAN_SWIM | RIDING
 S:1_IN_8
 S:BR_POIS | BR_DARK | BR_NETH
 D:$A large basilisk, whose shape resembles that of a great wyrm.
-D:Âç·¿¤Î¥Ð¥¸¥ê¥¹¥¯¤Ç¡¢¥ï¥¤¥¢¡¼¥à¤Ë»÷¤¿»Ñ¤ò¤·¤Æ¤¤¤ë¡£
+D:Âç·¿¤Î¥Ð¥·¥ê¥¹¥¯¤Ç¡¢¥ï¥¤¥¢¡¼¥à¤Ë»÷¤¿»Ñ¤ò¤·¤Æ¤¤¤ë¡£
 
 #JZ#
 N:669:¡Ø¥«¥ê¥Ö¥Ç¥£¥¹¡Ù
@@ -12578,7 +12583,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 | 
@@ -12919,7 +12924,7 @@ D:$A constructed dragon, the drolem has massive strength.  Powerful spells
 D:$weaved during its creation make it a fearsome adversary.  Its eyes show 
 D:$little intelligence, but it has been instructed to destroy all it meets.
 D:¿Í¹©Åª¤Ëºî¤é¤ì¤¿¥É¥é¥´¥ó¤Ç¤¢¤ë¥É¥í¡¼¥ì¥à¤Ï¶þ¶¯¤ÊÎ϶¯¤µ¤ò»ý¤Ã¤Æ¤¤¤ë¡£
-D:¤½¤ÎÁϤ¤ËºÝ¤·¤Æ¤Ï¶¯ÎϤʼöʸ¤¬ÍѤ¤¤é¤ì¤À¤¬¡¢¤½¤ì¤¬¤³¤Î¥â¥ó¥¹¥¿¡¼¤ò¶²¤ë¤Ù¤­
+D:¤½¤ÎÁϤ¤ËºÝ¤·¤Æ¤Ï¶¯ÎϤʼöʸ¤¬ÍѤ¤¤é¤ì¡¢¤½¤ì¤¬¤³¤Î¥â¥ó¥¹¥¿¡¼¤ò¶²¤ë¤Ù¤­
 D:¶¯Å¨¤Ë»ÅΩ¤Æ¾å¤²¤Æ¤¤¤ë¤Î¤À¡£¤½¤ÎÌܤˤÏÃÎÀ­¤Î¤«¤±¤é¤â¸«¤¤¤À¤¹¤³¤È¤Ï¤Ç¤­¤º¡¢
 D:Í£°ìÃΤäƤ¤¤ë¤³¤È¤Ï¡¢½Ð²ñ¤Ã¤¿¤â¤ÎÁ´¤Æ¤òÅݤ¹¤È¤¤¤¦¤³¤È¤À¤±¤À¡£
 
@@ -13041,7 +13046,7 @@ B:HIT:TERRIFY:10d6
 B:HIT:EXP_80:8d6
 B:HIT:EXP_80:8d6
 F:MALE | 
-F:FORCE_MAXHP | UNIQUE_7 |
+F:FORCE_MAXHP | NAZGUL |
 F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | RES_TELE | RES_DARK |
 F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | MOVE_BODY | RES_NETH | SMART |
 F:EVIL | UNDEAD | IM_COLD | IM_POIS | HURT_LITE | NO_CONF | NO_SLEEP
@@ -13109,7 +13114,7 @@ I:120:77d10:20:144:20
 W:45:2:0:1200:10000:1037
 B:HIT:HURT:3d12
 B:HIT:HURT:3d12
-F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD | GOOD | HAS_LITE_2 |
+F:IM_POIS | IM_FIRE | IM_ELEC | IM_ACID | IM_COLD | GOOD | HUMAN | HAS_LITE_2 |
 F:RES_LITE | RES_DARK | RES_NETH | RES_SHAR | RES_SOUN |
 F:RES_CHAO | RES_NEXU | RES_DISE | RES_TIME | RES_TELE |
 F:DROP_SKELETON | DROP_CORPSE | NO_SLEEP | NO_CONF | NO_FEAR | NO_STUN |
@@ -13220,7 +13225,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 +13343,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 +13448,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 +13585,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 +13664,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
@@ -13712,7 +13717,7 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:CLAW:HURT:3d3
 F:FORCE_SLEEP | SELF_DARK_1 |
-F:FRIENDS | RES_NETH | DROP_SKELETON | DROP_CORPSE
+F:FRIENDS | RES_NETH |
 F:OPEN_DOOR | BASH_DOOR | 
 F:ANIMAL | NO_CONF | NO_SLEEP
 S:1_IN_5 | 
@@ -13734,7 +13739,7 @@ B:BITE:HURT:2d12
 B:CLAW:HURT:3d3
 F:FORCE_SLEEP | 
 F:FRIENDS | 
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
+F:OPEN_DOOR | BASH_DOOR |
 F:ANIMAL | RES_TIME | NO_CONF | NO_SLEEP
 S:1_IN_8 | 
 S:BR_TIME
@@ -13756,7 +13761,7 @@ B:BITE:HURT:2d12
 B:CLAW:HURT:3d3
 F:FORCE_SLEEP |
 F:FRIENDS | RES_PLAS | SELF_LITE_2 |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
+F:OPEN_DOOR | BASH_DOOR |
 F:ANIMAL | IM_ELEC | IM_FIRE | NO_CONF | NO_SLEEP
 S:1_IN_5 | 
 S:BR_PLAS
@@ -13795,7 +13800,7 @@ D:
 #J0# °ìÈÖµ¤¤ËÆþ¤ê¤Þ¤·¤¿¤Î¤Ç¡¢¤½¤¦¤·¤Æ¤¢¤ê¤Þ¤¹¡£
 #J0#
 N:728:¥¹¥È¡¼¥à¡¦¥ï¥¤¥¢¡¼¥à
-E:Great storm wyrm
+E:Great Storm Wyrm
 G:D:b
 I:120:30d100:30:150:80
 W:51:2:0:13000:0:0
@@ -13827,7 +13832,7 @@ W:51:4:0:18000:0:0
 B:HIT:SHATTER:20d12
 B:HIT:SHATTER:20d12
 B:BITE:POISON:6d14
-F:UNIQUE | MALE | CAN_SPEAK | REGENERATE |
+F:UNIQUE | MALE | CAN_SPEAK |
 F:FORCE_SLEEP | FORCE_MAXHP | 
 F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | 
 F:DROP_90 | REGENERATE | KILL_WALL | RES_TELE |
@@ -13875,7 +13880,7 @@ B:HIT:HURT:10d5
 B:HIT:HURT:10d5
 B:HIT:HURT:10d5
 B:HIT:EXP_80
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | IM_FIRE | IM_COLD | IM_POIS | HUMAN |
+F:FORCE_SLEEP | FORCE_MAXHP | SMART | IM_FIRE | IM_COLD | IM_POIS | MALE | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | RES_NETH | RES_NEXU | RES_PLAS |
 F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | EVIL
 S:1_IN_5 |
@@ -14148,12 +14153,12 @@ S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 |
 S:BA_WATE | DARKNESS | BR_DARK | TELE_TO 
 D:$An enormously fearsome and powerful inhabitant of the depths. It 
 D:$resembles a gargantuan octopus and its evil is almost tangible.
-D:¤È¤Æ¤Ä¤â¤Ê¤¯¶¯¤¯¶²¤·¤¤¿¼³¤¤ÎÀ¸¤­Êª¤À¡£µðÂç¤ÊÂý¤Ë»÷¤Æ¤¤¤Æ¡¢
+D:¤È¤Æ¤Ä¤â¤Ê¤¯¶¯¤¯¶²¤í¤·¤¤¿¼³¤¤ÎÀ¸¤­Êª¤À¡£µðÂç¤ÊÂý¤Ë»÷¤Æ¤¤¤Æ¡¢
 D:¸«¤¿¤À¤±¤Ç¤½¤Î¼Ù°­¤µ¤¬ÅÁ¤ï¤Ã¤Æ¤¯¤ë¡£
 
 #J0#
 N:741:¥¢¥¤¥¹¡¦¥ï¥¤¥¢¡¼¥à
-E:Great ice wyrm
+E:Great Ice Wyrm
 G:D:w
 I:120:30d100:30:170:80
 W:54:2:0:15000:0:0
@@ -14228,7 +14233,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 +14378,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:Ƭ³¸¤Î¥É¥ë¥¸
@@ -14397,7 +14402,7 @@ S:S_UNDEAD
 D:$A glowing skull possessed by sorcerous power.  It need not move, but 
 D:$merely blast you with mighty magic.
 D:¤½¤ì¤Ïȯ¸÷¤¹¤ëƬ³¸¹ü¤Ç¡¢¥½¡¼¥µ¥é¡¼¤ÎÎϤˤè¤Ã¤ÆÆ°¤«¤µ¤ì¤Æ¤¤¤ë¡£
-D:¤¢¤Þ¤êÆ°¤«¤Ê¤¤¤¬¡¢¤Þ¤ì¤Ë¶¯ÎϤÊËâË¡¤Ç¹¶·â¤·¤Æ¤¯¤ë¡£
+D:Æ°¤¯É¬Íפ¬¤Ê¤¯¡¢¶¯ÎϤÊËâË¡¤Ç¹¶·â¤·¤Æ¤¯¤ë¤Î¤ß¤Ç¤¢¤ë¡£
 
 #J0#
 N:751:¥«¥ª¥¹¡¦¥Ü¥ë¥Æ¥Ã¥¯¥¹
@@ -14520,7 +14525,7 @@ D:
 
 #J0#
 N:756:¥Ø¥ë¡¦¥ï¥¤¥¢¡¼¥à
-E:Great hell wyrm
+E:Great Hell Wyrm
 G:D:r
 I:120:54d100:40:170:40
 W:55:2:0:18000:0:0
@@ -15109,7 +15114,7 @@ S:BLIND | CONF | SCARE | CAUSE_4 | CAUSE_3 | TELE_TO | TELE_AWAY |
 S:BA_WATE | DARKNESS | BR_DARK | BR_ACID | BR_POIS
 D:$An enormously fearsome and powerful inhabitant of the depths. It 
 D:$resembles a gargantuan octopus and its evil is almost tangible.
-D:¤È¤Æ¤Ä¤â¤Ê¤¯¶¯¤¯¶²¤·¤¤¿¼³¤¤ÎÀ¸¤­Êª¤À¡£µðÂç¤ÊÂý¤Ë»÷¤Æ¤¤¤Æ¡¢
+D:¤È¤Æ¤Ä¤â¤Ê¤¯¶¯¤¯¶²¤í¤·¤¤¿¼³¤¤ÎÀ¸¤­Êª¤À¡£µðÂç¤ÊÂý¤Ë»÷¤Æ¤¤¤Æ¡¢
 D:¸«¤¿¤À¤±¤Ç¤½¤Î¼Ù°­¤µ¤¬ÅÁ¤ï¤Ã¤Æ¤¯¤ë¡£
 
 #JZ#
@@ -15197,7 +15202,7 @@ B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:BITE:HURT:2d12
 B:CLAW:HURT:3d3
-F:ATTR_MULTI | ATTR_ANY | DROP_SKELETON | DROP_CORPSE
+F:ATTR_MULTI | ATTR_ANY |
 F:FORCE_SLEEP | 
 F:FRIENDS | 
 F:BASH_DOOR | 
@@ -15268,8 +15273,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 |
@@ -15624,7 +15629,7 @@ D:$passion nor compassion. He was dressed completely in scaled white armor,
 D:$not silver or metallic-colored, but looking as if it had been enameled."
 D:¥¸¥å¥ê¥¢¥ó¤ÏÌîÀ­¤Î¿¹ÎÓ¤ò²÷Ŭ¤Ë»×¤Ã¤Æ¤¤¤ë¡£Èà¤Î³Ú¤·¤ß¤Ï¼í¤ê¤¬¤¤¤Î¤¢¤ë³Íʪ¡¢
 D:¤¹¤Ê¤ï¤Á¤¢¤Ê¤¿¤ò¤·¤È¤á¤ë¤³¤È¤À¡£
-D:¡Ö¹õ¤¤È±¤òŤ¯¿­¤Ð¤·¡¢ÀĤ¤ÌܤˤÏÇ®¾ð¤âƱ¾è¤âɽ¤ì¤Æ¤¤¤Ê¤¤¡£Çò¤¤¾®»¥³»¤Ë¿È
+D:¡Ö¹õ¤¤È±¤òŤ¯¿­¤Ð¤·¡¢ÀĤ¤ÌܤˤÏÇ®¾ð¤âƱ¾ð¤âɽ¤ì¤Æ¤¤¤Ê¤¤¡£Çò¤¤¾®»¥³»¤Ë¿È
 D:¤òÊñ¤ó¤Ç¤¤¤ë¡£¶ä¤È¤«¤½¤Î¾¤Î¶â°Ū¤Ê¿§¤Ç¤Ï¤Ê¤¯¤Æ¡¢¤Þ¤ë¤Ç¥¨¥Ê¥á¥ë¤òÅɤÃ
 D:¤¿¤è¤¦¤Ë¸«¤¨¤ë¡£¡×
 D:¡Ê¥í¥¸¥ã¡¼¡¦¥¼¥é¥º¥Ë¥¤¡¢²¬Éô¹¨Ç·Ìõ¡Ö¥¢¥ó¥Ð¡¼¤Î¶å²¦»Ò¡×ÁáÀî½ñ˼¡¢p.46¡Ë
@@ -16104,8 +16109,7 @@ B:CLAW:HURT:3d3
 F:ATTR_MULTI | ATTR_ANY |
 F:FORCE_SLEEP | CAN_FLY |
 F:FRIENDS |
-F:BASH_DOOR | AURA_FIRE | AURA_ELEC | AURA_COLD | DROP_CORPSE | 
-F:DROP_SKELETON | SELF_LITE_2 |
+F:BASH_DOOR | AURA_FIRE | AURA_ELEC | AURA_COLD | SELF_LITE_2 |
 F:ANIMAL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
 F:RES_LITE | RES_DARK | RES_SOUN | RES_CHAO | RES_NETH | RES_DISE |
 F:RES_WALL | RES_INER | RES_TIME | RES_GRAV | RES_PLAS | RES_NEXU | RES_SHAR |
@@ -16130,7 +16134,7 @@ I:120:30d100:30:100:20
 W:76:1:0:15000:0:0
 B:HIT:UN_BONUS:14d11
 B:HIT:UN_POWER:14d11
-F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP |
+F:FORCE_SLEEP | FORCE_MAXHP | NO_CONF | NO_SLEEP | INVISIBLE |
 F:DROP_GOOD | DROP_60 | DROP_1D2 | SMART | PASS_WALL |
 F:RES_NEXU | RES_NETH | NONLIVING | CAN_FLY |
 F:EVIL | IM_POIS | IM_ELEC | IM_COLD | IM_FIRE | DEMON
@@ -16289,7 +16293,7 @@ F:FORCE_SLEEP | FORCE_MAXHP | SMART |
 F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | DROP_GOOD |
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | CAN_FLY |
 F:EVIL | RES_NETH | IM_COLD | IM_POIS |
-F:IM_FIRE | NO_CONF | NO_SLEEP | POWERFUL |
+F:IM_FIRE | NO_CONF | NO_SLEEP |
 S:1_IN_3 | 
 S:CAUSE_3 | CAUSE_4 | HAND_DOOM | TELE_TO | HOLD |
 S:S_UNDEAD | S_HI_UNDEAD | S_HI_DRAGON | FORGET | SCARE | BLIND |
@@ -16827,7 +16831,7 @@ F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS |
 F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT | EVIL | AURA_FIRE |
 F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | TAKE_ITEM | CAN_SPEAK |
 F:IM_FIRE | NO_CONF | NO_SLEEP | IM_POIS | HURT_COLD | GIANT |
-F:REGENERATE | POWERFUL |
+F:REGENERATE |
 S:1_IN_3 |
 S:SHRIEK | HASTE | HEAL | DRAIN_MANA | TPORT | TELE_TO | TELE_AWAY |
 S:TELE_LEVEL | FORGET | S_CYBER | S_DEMON | HAND_DOOM | S_HI_UNDEAD |
@@ -16874,7 +16878,7 @@ D:
 D:Ê¿¶Ñ¿ÈĹ¤Ï£±£µ¡Á£²£°¥á¡¼¥È¥ë¤À¤¬¡¢
 D:ÂΤγÆÉô°Ì¤ÎÂ礭¤µ¤ò¼«Í³¤ËÊѤ¨¤ë»ö¤¬½ÐÍè¤ë¡£
 D:¸µ¡¹¤Ï¥ë¥ë¥¤¥¨¤ËÀ¸Â©¤·¤Æ¤¤¤¿¤¬¡¢¤½¤ÎÄÀËפȶ¦¤ËÂçÉôʬ¤ÏÉõ°õ¤µ¤ì¤Æ¤¤¤ë¡£
-D:¤·¤«¤·¡¢°ìÉô¤Î¥¯¥È¥¥¥ë¥Õ¤ÎÍ»Ò¤Ï¡¢¥Ç¥£¡¼¥×¥ï¥ó¤Ë¤è¤Ã¤Æ¡¢
+D:¤·¤«¤·¡¢°ìÉô¤Î¥¯¥È¥¥¥ë¥Õ¤ÎÍî¤Ȥ·»Ò¤Ï¡¢¥Ç¥£¡¼¥×¥ï¥ó¤Ë¤è¤Ã¤Æ¡¢
 D:¿¼¤¤³¤¹Â¤ÎÄì¤ÇÍܤï¤ì¤Æ¤¤¤ë¡£
 D:¡Ö¤¹¤Ù¤Æ¤¬¥ë¥ë¥¤¥¨¤ÎµðÂç¤ÊÀФ¤ê¤Î´Û¤Ë²£¤¿¤ï¤ê¡¢¶¯ÁԤʥ¯¥È¥¥¥ë¡¼
 D:¤Î¼öʸ¤Ë¤Þ¤â¤é¤ì¡¢À±¤¿¤Á¤ÈÃϵ夬¤Õ¤¿¤¿¤ÓÀµ¤·¤¤°ÌÃ֤ˤâ¤É¤ëµ±¤«¤·
@@ -17041,7 +17045,7 @@ D:
 D:²æ¡¹¤ÎÀ¤³¦¤Ë¾¤´­¤µ¤ì¤¿¾ì¹ç¡¢¥¬¥¹¾õ¤Î·ÁÂÖ¤ÇÃϵå¤Î³Ë¤Þ¤Ç¿»Æ©¤·¡¢
 D:¤½¤³¤«¤é²ÐÃì¤È¤Ê¤Ã¤ÆÃϾå¤ËÊ®¤­½Ð¤·¤Æ¤¯¤ë¡£
 D:¡ÖÊ®½Ð¤¹¤ëÉÂŪ¤ÊÎп§¤Î±ë¤ÎÃì... ¿¼±ó¤«¤Ä¿ÍÃΤò±Û¤¨¤¿ÃϤÎÄ줫¤é
-D:²Ð»³¤ÎÍͤˤۤȤФ·¤ê¡¢·òÁ´¤Ê±ë¤¬Í¤Ï¤º¤Î±Æ¤òºî¤é¤º¡¢
+D:²Ð»³¤ÎÍͤˤۤȤФ·¤ê¡¢·òÁ´¤Ê±ë¤¬Íî¤Ȥ¹¤Ï¤º¤Î±Æ¤òºî¤é¤º¡¢
 D:¾ËÀФò¤ª¤¾¤Þ¤·¤¯¤âÆÇ¡¹¤·¤¤ÎÐÀĤÇÊñ¤à¡£¤½¤Î¤è¤¦¤Ê·ã¤·¤¤Ç³¾Æ
 D:¤ËÈ¿¤·¤Æ¤½¤³¤ËÇ®¤Ï¤Ê¤¯¡¢¤¿¤À»à¤ÈÉåÇԤμ¾µ¤¤¬¤¢¤ë¤Î¤ß¤À¡£¡×
 D:¡Ê¥é¥ô¥¯¥é¥Õ¥È¡Ö½Ëº×¡×¡Ë
@@ -18010,7 +18014,7 @@ B:HIT:COLD:3d10
 B:BITE:HURT:1d22
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | REGENERATE |
 F:DROP_3D2 | SMART | TAKE_ITEM | SELF_LITE_1 |
-F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | POWERFUL |  OPEN_DOOR | BASH_DOOR |
+F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | POWERFUL |
 F:IM_ACID | IM_COLD | IM_ELEC | TROLL | EVIL
 S:1_IN_7 | 
 S:BA_COLD | BO_ICEE | BO_WATE | BA_ELEC
@@ -18040,7 +18044,7 @@ W:28:3:0:200:0:0
 B:BITE:POISON:1d10
 B:CLAW:HURT:1d4
 F:DROP_60 | RAND_25 | MOVE_BODY | CAN_FLY | DROP_CORPSE |
-F:BASH_DOOR | MOVE_BODY | FRIENDS | 
+F:BASH_DOOR | FRIENDS |
 F:ANIMAL | IM_POIS | RES_DARK
 S:1_IN_8 | 
 S:SCARE | BR_POIS | BR_DARK
@@ -18238,7 +18242,7 @@ B:BITE:HURT:25d1
 B:CLAW:HURT:3d3
 F:FORCE_SLEEP |
 F:FRIENDS | SELF_LITE_1 |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
+F:OPEN_DOOR | BASH_DOOR |
 F:ANIMAL | NO_CONF | NO_SLEEP
 S:1_IN_8 |
 S:BR_MANA
@@ -18279,7 +18283,7 @@ D:$It was left here to be used against intruders.
 D:¤½¤ì¤Ï¿¯Æþ¼Ô¤ËÂФ·¤Æ»ÈÍѤ¹¤ë¤¿¤á¤ËÃÖ¤«¤ì¤Æ¤¤¤ë¡£
 
 N:890:¥ô¥§¥Î¥à¡¦¥ï¥¤¥¢¡¼¥à
-E:Great venom wyrm
+E:Great Venom Wyrm
 G:D:g
 I:120:54d100:30:170:80
 W:55:2:0:16000:0:0
@@ -18287,7 +18291,7 @@ B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
 B:BITE:POISON:5d14
-F:FORCE_SLEEP | FORCE_MAXHP | ONLY_ITEM | DROP_GOOD |
+F:FORCE_SLEEP | FORCE_MAXHP |
 F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_GOOD |
 F:BASH_DOOR | POWERFUL | MOVE_BODY | DROP_CORPSE | CAN_FLY |
 F:EVIL | DRAGON | IM_POIS | NO_CONF | NO_SLEEP | RIDING |
@@ -18404,7 +18408,7 @@ F:DROP_CORPSE | DROP_SKELETON | CAN_SWIM
 S:1_IN_5 |
 S:ROCKET
 D:$You watch in horror as he aims his massive weapon at you.
-D:Èà¤Ï¤½¤Î¶²¤·¤¤½Å²Ð´ï¤ÎÁÀ¤¤¤ò¤¢¤Ê¤¿¤Ë¸þ¤±¤Æ¤¤¤ë¡£
+D:Èà¤Ï¤½¤Î¶²¤í¤·¤¤½Å²Ð´ï¤ÎÁÀ¤¤¤ò¤¢¤Ê¤¿¤Ë¸þ¤±¤Æ¤¤¤ë¡£
 
 N:897:ÇËÊҥܥë¥Æ¥Ã¥¯¥¹
 E:Shard vortex
@@ -18431,8 +18435,8 @@ W:30:2:0:350:0:0
 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:NO_FEAR | NO_SLEEP | NO_CONF | NO_STUN | EMPTY_MIND | COLD_BLOOD |
+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:¤¤¤ä¡¢¤Á¤ç¤Ã¤ÈÂԤƤ衩¤À¤ó¤À¤óÂ礭¤¯¤Ê¤Ã¤Æ¤¯¤ë¤è¤¦¤Ê¡Ä¡£
@@ -18493,9 +18497,9 @@ I:100:15d25:15:120:10
 W:25:2:0:100:700:898
 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:NEVER_MOVE | MULTIPLY | ONLY_GOLD | DROP_60 | DROP_90 | EMPTY_MIND |
+F:ANIMAL | HURT_ROCK | NO_FEAR | NO_CONF | NO_SLEEP | NO_STUN |
+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 +18510,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,13 +18622,13 @@ 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.
 D:¥Î¡¼¥à¤ÎÅ·ºÍ¤¬ºî¤Ã¤¿È¯ÌÀÉʤÀ¡£¿¼¤¤¿åÃæ¤ÇƯ¤¯¤è¤¦¤ËÀ߷פµ¤ì¤¿¥´¡¼¥ì¥à¤Ç¤¢¤ë¡£
 
-N:911:ÀбѤÎÊÉ
+N:911:ÀбѤιÛÌ®
 E:Quartz vein
 G:%:w
 I:100:15d11:15:30:10
@@ -18633,7 +18637,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 +18660,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 +18766,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 +18782,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 |
@@ -18788,7 +18792,7 @@ D:$of gills.
 D:¿åÃæ¤Ç¤ÎÀ¸³è¤ËŬ±þ¤·¤¿¥Ê¡¼¥¬¤À¡£µû¤Î¤è¤¦¤ÊÈø¥Ò¥ì¤È¥¨¥é¤ò»ý¤Ã¤Æ¤¤¤ë¡£
 
 N:920:¡Ø¥Ç¥â¥´¥ë¥´¥ó¡Ù
-E:The demogorgon
+E:The Demogorgon
 G:U:u
 I:125:65d100:30:140:20
 W:75:2:0:37000:0:0
@@ -18841,7 +18845,7 @@ S:BR_ELEC | BO_ELEC
 D:¤«¤ï¤¤¤é¤·¤¤³°¸«¤ò¤·¤Æ¤¤¤ë¤¬¡¢ÌýÃǤ¹¤ë¤È»×¤ï¤Ì¾×·â¤ò¼õ¤±¤ë¤À¤í¤¦¡£
 
 N:923:Àã½÷
-E:Yukionnna
+E:Yukionna
 G:p:w
 I:110:30d10:20:20:20
 W:27:2:0:300:0:0
@@ -18933,7 +18937,7 @@ D:
 D:Èà¤Ï¾ï¤Ë¥­¥Î¥³²¦¹ñ¤òÀ¬Éþ¤·¤è¤¦¤È¤¿¤¯¤é¤ó¤Ç¤¤¤ë¡£
 
 N:929:µðÂ祵¥¤¥Ð¡¼¥ï¥¤¥¢¡¼¥àÅ·»È°­Ëâ¥ê¥Ã¥Á
-E:Greater cyber wyrm angel daemon lich
+E:Greater Cyber Wyrm Angel Daemon Lich
 G:N:W
 I:150:99d99:50:200:1
 W:99:50:0:30000:0:0
@@ -18980,7 +18984,7 @@ B:HIT:HURT:14d14
 B:HIT:HURT:14d14
 B:HIT:HURT:14d14
 F:DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP |
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | HUMAN |
+F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | MALE | HUMAN |
 F:REFLECTING | SMART | REGENERATE | OPEN_DOOR |
 F:IM_COLD | IM_FIRE | IM_ELEC | NO_CONF | NO_STUN |
 F:NO_SLEEP | RES_TELE | RES_NETH | CAN_FLY | POWERFUL |
@@ -18993,7 +18997,7 @@ D:
 D:¡ÊÀ»Íªµª¡¢Ä¶¿Í¥í¥Ã¥¯¡ÖÀÖ¤¤¥µ¡¼¥Ú¥ó¥È¡×¡Ë
 
 N:931:¶ä²Ï¹ÄÄë¡Ø¥«¥ë¡¦¥À¡¼¥àIIIÀ¤¡Ù
-E:Caldarm the third
+E:Caldarm the Third
 G:p:D
 I:130:60d100:100:200:20
 W:79:5:0:32000:0:0
@@ -19063,7 +19067,7 @@ D:
 D:¡ÊÀ»Íªµª¡¢Ä¶¿Í¥í¥Ã¥¯¡Ö½ñ¤ò¼é¤ë¼Ô¡×¡Ë
 
 N:934:¡Ø¥ë¥Ñ¡¼¥È¾­·³¡Ù
-E:Rupart the general
+E:Rupart the General
 G:p:r
 I:130:35d100:100:170:0
 W:71:255:0:18000:0:0
@@ -19104,7 +19108,7 @@ D:ξ
 D:½÷¿À¥¤¥·¥¿¡¼¤òÉõ°õ¤·¤¿¤ÈÅÁ¤¨¤é¤ì¤ë¡£
 
 N:936:ËÌÅÍ¿À·ý¤Î»È¤¤¼ê¡Ø¥±¥ó¥·¥í¥¦¡Ù
-E:Kenshirou the Fist of The North Star
+E:Kenshirou the Fist of the North Star
 G:p:W
 I:123:60d100:50:170:10
 W:62:2:0:30000:0:0
@@ -19123,7 +19127,7 @@ D:
 D:»þÂå¤Ë¤¢¤Ã¤Æ°¦¤ËÀ¸¤­¡¢°¦¤Î¤¿¤á¤ËÀï¤Ã¤Æ¤¤¤ë¡£
 
 N:937:¥µ¥¤¥Ð¡¼¡Ø¥ì¥à¥¹¡Ù
-E:Lems the cyborg
+E:Lems the Cyborg
 G:g:W
 I:130:50d100:30:160:0
 W:61:3:0:26000:0:0
@@ -19234,7 +19238,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 +19260,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
@@ -19316,19 +19320,19 @@ S:BR_COLD | DISPEL | BR_POIS | BA_COLD | BO_ICEE |
 S:CONF | SCARE | HOLD | S_DEMON
 
 N:947:Åð±¡Ø¥×¥¢¡¼¡Ù
-E:Poor, the thief
+E:Poor, the Thief
 G:p:b
 I:105:80d10:20:50:50
 W:25:3:0:500:0:0
 B:HIT:HURT:5d10
 B:HIT:HURT:5d10
 B:CRUSH:SUPERHURT:30d2
-F:UNIQUE | DROP_CORPSE | FORCE_MAXHP | CAN_SPEAK | HUMAN |
+F:UNIQUE | DROP_CORPSE | FORCE_MAXHP | CAN_SPEAK | HUMAN | MALE |
 F:EVIL | ONLY_ITEM | DROP_1D2 | DROP_60 | DROP_GOOD |
 F:NO_SLEEP | NO_CONF | BASH_DOOR
 
 N:948:Åð±¡Ø¥ê¥Ã¥Á¡Ù
-E:Rich, the thief
+E:Rich, the Thief
 G:p:b
 I:130:50d10:20:80:50
 W:29:3:0:700:0:0
@@ -19336,14 +19340,14 @@ B:HIT:POISON:3d6
 B:HIT:POISON:3d6
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:UNIQUE | DROP_CORPSE | FORCE_MAXHP | CAN_SPEAK | HUMAN |
+F:UNIQUE | DROP_CORPSE | FORCE_MAXHP | CAN_SPEAK | HUMAN | MALE |
 F:EVIL | ONLY_ITEM | DROP_2D2 | DROP_GOOD |
 F:NO_SLEEP | NO_CONF | OPEN_DOOR | MOVE_BODY |
 S:1_IN_2 |
 S:BLINK | TPORT | TRAPS | CONF | BLIND | SLOW | HOLD | FORGET
 
 N:949:ͦ¼Ô¡Ø¥¤¥±¥¿¡Ù
-E:Iketa, the brave
+E:Iketa, the Brave
 G:p:B
 I:130:50d100:50:170:0
 W:70:2:0:30000:0:0
@@ -19403,7 +19407,7 @@ W:44:4:0:500:0:0
 B:EXPLODE:HURT:30d3
 F:FORCE_SLEEP |
 F:FRIENDS |
-F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE |
+F:OPEN_DOOR | BASH_DOOR |
 F:ANIMAL | NO_CONF | NO_SLEEP
 D:º£¤Ë¤âÇúȯ¤·¤½¤¦¤Ê¸¤¤À¡£
 
@@ -19433,6 +19437,12 @@ F:FORCE_SLEEP | DROP_1D2 | SMART | DROP_CORPSE | DROP_SKELETON |
 F:ORC | HURT_LITE | EVIL | RES_DARK
 S:1_IN_2 |
 S:SHOOT
+D:$In a rare display of ingenuity, the Orcs invented an incredibly
+D:$destructive weapon. Most Orcish artillerists are those who dared
+D:$criticize its effectiveness.
+D:¤á¤Ã¤¿¤Ë¸«¤»¤Ê¤¤È¯ÌÀ¤ÎºÍ¤Ë¤è¤Ã¤Æ¡¢¥ª¡¼¥¯¤Ï¿®¤¸¤é¤ì¤Ê¤¤¤Û¤ÉÇ˲õŪ¤Ê
+D:ʼ´ï¤òȯÌÀ¤·¤¿¡£¤³¤Î¥ª¡¼¥¯×¸µÝÂâ¤Îʼ»Î¤ÎÂçȾ¤Ï¡¢¤½¤ÎÍ­¸úÀ­¤Ëµ¿Ìä¤ò
+D:Åꤲ¤«¤±¤¿¼Ô¤¿¤Á¤¬Ì³¤á¤Æ¤¤¤ë¡£
 
 # Description in English by Nick Keulmann
 N:955:¤ä¤»¤³¤±¤¿ÇÏ
@@ -19541,12 +19551,12 @@ F:RES_TELE | CAN_SWIM | WILD_SWAMP
 S:1_IN_10 |
 S:SHRIEK | MIND_BLAST
 D:$It`s a slime colony.
-D:$If you so much as DARE to touch it
+D:$If you so much as DARE to touch it.
 D:²Ä°¦¤é¤·¤¤½ã¿´Ìµ¹¤¤Ê¥¹¥é¥¤¥à¥â¥ë¥É¤À¡£
 D:¿¨¤ì¤Æ»à¤Í¡ª
 
 N:963:¥Ó¥ë¥À¡¼Äë¹ñÄ벦¡Ø¥ÜÄë¥Ó¥ë¡Ù
-E:Boty-Buildeng, the emperor
+E:Botei-Building, the Emperor
 G:P:U
 I:120:12d100:25:130:40
 W:36:2:0:2500:0:0
@@ -19610,7 +19620,7 @@ S:BA_FIRE | HASTE | HOLD | CONF | BLIND
 D:ÃǤ¸¤Æ¥Þ¥ê¥ª¤ÎÎà»÷ÉʤǤϤʤ¤¡ª(ËܿͼçÄ¥)¡£
 
 N:967:¥¬¥­Âç¾­¡Ø¥¸¥ã¥¤¥¢¥ó¡Ù
-E:Jaian, the boss of the kids
+E:Jaian, the Boss of the Kids
 G:p:o
 I:110:100d10:16:100:20
 W:29:3:0:500:0:0
@@ -19729,7 +19739,7 @@ D:$with it's breath of fire.
 D:¥í¡¼¥É¥¹¤Î¸ÅÂåε¤Î°ìɤ¤Ç¡¢¤½¤Î²Ð±ê¤Î¥Ö¥ì¥¹¤ÇÁ´¤Æ¤ò¾Æ¤­¿Ô¤¯¤¹¡£
 
 N:973:°Å¹õ¤ÎÅç¥Þ¡¼¥â¤Î¹ÄÄë¡Ø¥Ù¥ë¥É¡Ù
-E:Beld, ruler of Marmo
+E:Beld, Ruler of Marmo
 G:p:r
 I:125:77d30:10:160:50
 W:48:4:0:18500:0:0
@@ -19793,7 +19803,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 +20081,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.
@@ -20101,7 +20111,7 @@ W:22:6:0:120:0:0
 B:CLAW:HURT:2d6
 B:BITE:HURT:2d6
 B:WAIL:TERRIFY
-F:ESCORTS | FORCE_MAXHP | IM_COLD | IM_ACID | 
+F:ESCORTS | FORCE_MAXHP | IM_COLD | IM_ACID | ANIMAL |
 F:SMART | ESCORT | FEMALE | 
 F:OPEN_DOOR | BASH_DOOR | 
 F:NO_FEAR
@@ -20422,7 +20432,7 @@ F:RES_TELE | RAND_50 | ESCORT | IM_FIRE |
 F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | UNIQUE |
 F:OPEN_DOOR | EVIL | BASH_DOOR | SMART
 S:1_IN_3
-S:BA_FIRE | HASTE | S_KIN
+S:BA_FIRE | HASTE | SPECIAL
 
 #
 # ¥À¥Ö¥ë¥Ë¡¼¤Ê¤ó¤È¤«¢ª¥Ø¥Ã¥É¥×¥ì¥¹¢ª¥µ¥¤¥³¥¯¥é¥Ã¥·¥ã¡¼
@@ -20564,7 +20574,7 @@ S:HEAL | TRAPS
 # ¶¯¤¹¤®¤ë¡©
 #
 N:1022:¥µ¥¤¥ä¿Í¡Ø¥Ê¥Ã¥Ñ¡Ù
-E:Nappa the Saiayan
+E:Nappa the Saiyan
 G:p:U
 I:125:25d100:30:125:15
 W:50:3:0:13500:0:0
@@ -20580,8 +20590,8 @@ S:1_IN_8 |
 S:TELE_TO | BO_MANA
 D:$He looks like brawny human being apparently. 
 D:$However, unlike man, it has the tail of a monkey. 
-D:$This tail proves he is a Saiayan. 
-D:$A Saiayan's fighting power is far superior to human's and will bring many destruction.
+D:$This tail proves he is a Saiyan. 
+D:$A Saiyan's fighting power is far superior to human's and will bring many destruction.
 D:í÷¤·¤¤¿Í´Ö¤Î¤è¤¦¤À¤¬¡¢±î¤Î¿¬Èø¤¬ÉÕ¤¤¤Æ¤¤¤ë¡£¤³¤ì¤³¤½¤¬¥µ¥¤¥ä¿Í¤Î¾Ú¤À¡£
 D:¤½¤ÎÀïÆ®ÎϤϿʹ֤òο²ï¤·¡¢Â¿¤¯¤ÎÇ˲õ¤ò¸Æ¤Óµ¯¤³¤¹¤À¤í¤¦¡£
 
@@ -20741,7 +20751,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.
@@ -20796,7 +20806,7 @@ N:1034:
 E:The Minotaur of the Labyrinth
 G:H:U
 I:120:25d10:13:25:10
-W:40:255:0:600:0:0
+W:40:3:0:600:0:0
 B:BUTT:HURT:4d6
 B:BUTT:HURT:4d6
 B:BUTT:HURT:2d6
@@ -20827,7 +20837,7 @@ G:p:b
 I:125:30d10:20:70:0
 W:28:5:0:240:0:0
 F:NEVER_BLOW |
-F:MALE | DROP_SKELETON | DROP_CORPSE |
+F:MALE | HUMAN | DROP_SKELETON | DROP_CORPSE |
 F:DROP_1D2 | EAT_GIVE_DEX | EAT_LOSE_WIS | OPEN_DOOR | BASH_DOOR | EVIL |
 S:1_IN_2 |
 S:TRAPS | BLINK
@@ -20974,7 +20984,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 +21068,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 +21141,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 +21155,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 |
@@ -21398,7 +21408,7 @@ D:
 D:ËâË¡¤ÎÌÚ¤ÎÍÕ¤òƬ¤ËºÜ¤»¤Æ¿Í¤Ë²½¤±¤ë¤Î¤À¡£
 
 N:1068:º®Æ٤Υµ¥Þ»Õ¡Ø¥Ç¥£¥ª¥Ë¥½¥¹¡Ù
-E:Dionysus, The Munchkin of Chaos
+E:Dionysus, the Munchkin of Chaos
 G:G:g
 I:154:10d100:100:162:40
 W:55:7:0:10000:0:0
@@ -21444,3 +21454,51 @@ S:BR_DISI
 D:Èà¤Ïº£¤ÏÌǤӤ¿°ì²¡¢¥¹¥¯¡¼¥¯¥à²¤ÎºÇ¸å¤ÎÀ¸¤­»Ä¤ê¤À¡£
 D:¡Ö¥¦¥©¡¼¥±¥ó¤Ïʪ¼Á¤Îʬ»Ò¤ò¿¶Æ°¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤ëĶǽÎϼԤʤΤÀ¡ª¡×
 D:¡Ê¹ÓÌÚÈôϤɧ¡Ö¥Ð¥ª¡¼Íèˬ¼Ô¡×¡Ë
+
+N:1070:ÔϹè¥ï¡¼¥à
+E:Trench Wurm
+G:w:D
+I:115:30d10:20:50:100
+W:15:1:0:50:0:0
+B:BITE:HURT:4d2
+B:BITE:HURT:4d2
+B:BITE:HURT:4d2
+F:FORCE_MAXHP | DROP_CORPSE | RIDING |
+F:COLD_BLOOD | BASH_DOOR | KILL_WALL | ANIMAL | EVIL |
+F:IM_ELEC | IM_ACID | IM_FIRE | RES_DARK | RES_NETH 
+D:$Their arrival marks the end of Yawgmoth's subtlety.
+D:ÈàÅù¤ÎÅþÃå¤Ë¤è¤ê¥è¡¼¥°¥â¥¹¤Î»×ÁۤϽªßá¤ò±¿Ì¿¤Å¤±¤é¤ì¤ë¡£
+
+N:1071:ȯ¸÷¥«¥ô¡¼
+E:Radiant Kavu
+G:q:g
+I:115:30d10:20:60:70
+W:15:1:0:50:0:0
+B:CLAW:HURT:4d2
+B:CLAW:HURT:4d2
+B:BITE:HURT:4d2
+F:FORCE_MAXHP | DROP_CORPSE | SELF_LITE_1 | RIDING |
+F:BASH_DOOR | ANIMAL |
+F:IM_FIRE | IM_POIS | IM_COLD | RES_LITE | RES_DARK 
+S:1_IN_10 |
+S:HEAL
+D:$When angered or frightened,
+D:$it protects itself with a burst of blinding light.
+D:Åܤ俤ê¶Ã¤¤¤¿¤ê¤·¤¿¤È¤­¡¢È¯¸÷¥«¥ô¡¼¤ÏâÁ¤·¤¤¸÷¤ÎÇúȯ¤Ç¿È¤ò¼é¤ë¡£
+
+N:1072:¥ª¡¼¥¯¤ÎÂâĹ¡Ø¥Þ¥¦¥Õ¥ë¡Ù
+E:Mauhur, the Orc Captain
+G:o:u
+I:110:24d10:20:60:20
+W:12:3:0:160:0:0
+B:HIT:HURT:1d12
+B:HIT:HURT:1d12
+B:HIT:HURT:1d10
+B:HIT:HURT:1d10
+F:UNIQUE | MALE | 
+F:FORCE_MAXHP | WILD_ALL |
+F:ESCORT | DROP_SKELETON | DROP_CORPSE
+F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | EAT_POISONOUS
+F:OPEN_DOOR | BASH_DOOR | CAN_SPEAK |
+F:EVIL | ORC | IM_POIS | RES_DARK
+