X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=lib%2Fedit%2Fr_info.txt;h=1fc7852bbb81cdbebb4b99f03b920270548f08cf;hb=7e18729b3cc02a11fe4ca50f9d15c49d9650ce8c;hp=0860f8f9ab4c1a467ae03bc8f6dc7f98f512f16a;hpb=a6266899ffb0077de63384e4776370cc9a474368;p=hengband%2Fhengband.git

diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index 0860f8f9a..1fc7852bb 100644
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -307,10 +307,8 @@ B:MOAN
 B:MOAN
 B:HIT:HURT:1d5
 F:UNIQUE | MALE | CAN_SPEAK | DROP_CORPSE | FRIENDLY
-F:FORCE_MAXHP | WILD_TOWN | WILD_ONLY
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | DROP_GREAT
-F:OPEN_DOOR | BASH_DOOR | HAS_LITE_1 |
-F:NO_CONF | NO_SLEEP
+F:FORCE_MAXHP | WILD_TOWN | WILD_ONLY | ONLY_ITEM | DROP_90 | DROP_GREAT
+F:OPEN_DOOR | BASH_DOOR | HAS_LITE_1 | NO_CONF | NO_SLEEP
 D:$Before you appears a broad thick-set hobbit with a round red face. 
 D:$"What's wrong with old Maggot?" asked Pippin.  "He's a good friend to 
 D:$all the Brandybucks.  Of course he's a terror to trespassers, and keeps 
@@ -1116,12 +1114,11 @@ G:h:u
 I:130:20d20:20:12:5
 W:3:2:0:18:0:0
 B:TOUCH:EAT_GOLD
-F:UNIQUE | MALE | CAN_SWIM | DROP_SKELETON | DROP_CORPSE
+F:UNIQUE | MALE | EVIL | CAN_SWIM | DROP_SKELETON | DROP_CORPSE
 F:FORCE_MAXHP | CAN_SPEAK | SMART | 
-F:RAND_50 | RAND_25 | WILD_ALL | EAT_LOSE_STR | EAT_LOSE_INT |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | DROP_GREAT |
+F:RAND_50 | RAND_25 | WILD_ALL | EAT_LOSE_STR | EAT_LOSE_INT
+F:ONLY_ITEM | DROP_90 | DROP_GREAT
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | INVISIBLE
-F:EVIL
 D:$"Down the face of a precipice, sheer and almost smooth it seemed in the pale 
 D:$moonlight, a small black shape was moving with its thin limbs splayed out. 
 D:$Maybe its soft clinging hands and toes were used, but it looked as if it was 
@@ -2231,11 +2228,9 @@ W:8:2:0:150:0:0
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:TOUCH:EAT_GOLD
-F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_2 |
-F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | 
-F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_CORPSE
-F:EVIL | RES_TELE
+F:UNIQUE | MALE | EVIL | CAN_SPEAK | HAS_LITE_2
+F:FORCE_SLEEP | FORCE_MAXHP | HUMAN | ONLY_ITEM | DROP_1D2 | DROP_GREAT
+F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | DROP_CORPSE | RES_TELE
 S:1_IN_5 | 
 S:HEAL | SLOW | TRAPS | BO_COLD | BA_POIS
 D:$He's been spying for Saruman.  He is a snivelling wretch with no morals.
@@ -2261,12 +2256,11 @@ B:SHOOT:HURT:3d6
 B:HIT:HURT:2d6
 B:TOUCH:EAT_GOLD
 B:TOUCH:EAT_ITEM
-F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | HUMAN |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_WOOD |
+F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | HUMAN
+F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | WILD_WOOD
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | EVIL | DROP_SKELETON | DROP_CORPSE
 F:EAT_GIVE_DEX | EAT_LOSE_WIS
-S:1_IN_5
-S:SHOOT | HEAL | TRAPS
+S:1_IN_5 | SHOOT | HEAL | TRAPS
 A:221:1:5
 V:75
 D:$The legendary archer steals from the rich (you qualify).
@@ -6620,13 +6614,13 @@ B:GAZE:BLIND:8d8
 B:TOUCH:TERRIFY
 B:GAZE:EXP_40
 B:TOUCH:EAT_ITEM
-F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GOOD | DROP_GREAT | DROP_CORPSE
+F:ONLY_ITEM | DROP_90 | DROP_1D2 | DROP_GREAT | DROP_CORPSE
 F:CHAR_MULTI | CHAR_CLEAR | ATTR_CLEAR | INVISIBLE | COLD_BLOOD
-F:NO_CONF | UNIQUE | FORCE_MAXHP | NO_SLEEP | CAN_SPEAK | REFLECTING |
+F:NO_CONF | UNIQUE | FORCE_MAXHP | NO_SLEEP | CAN_SPEAK | REFLECTING
 F:IM_FIRE | IM_ELEC | EMPTY_MIND | EVIL | SMART | RES_TELE | CAN_FLY
-F:EAT_GIVE_INT | EAT_GIVE_WIS | EAT_BLIND | EAT_DRAIN_EXP |
+F:EAT_GIVE_INT | EAT_GIVE_WIS | EAT_BLIND | EAT_DRAIN_EXP
 S:1_IN_4
-S:DRAIN_MANA | BLINK | BLIND | SCARE | CONF | S_UNDEAD | S_MONSTER |
+S:DRAIN_MANA | BLINK | BLIND | SCARE | CONF | S_UNDEAD | S_MONSTER
 S:HEAL | TELE_AWAY | DARKNESS | S_HYDRA | TRAPS | FORGET | TELE_TO | SHRIEK
 D:$Nobody has ever seen It.
 D:誰も「それ」を見た者はいない。
@@ -7534,7 +7528,7 @@ B:SHOW:LOSE_INT
 B:SHOW:LOSE_WIS
 B:CHARGE:EAT_GOLD
 B:CHARGE:EAT_GOLD
-F:DROP_1D2 | DROP_90 | DROP_GOOD | DROP_GREAT | ONLY_ITEM |
+F:DROP_1D2 | DROP_90 | DROP_GREAT | ONLY_ITEM
 F:EVIL | MALE | CAN_SPEAK | SMART | RES_TELE | CAN_SWIM | DROP_CORPSE
 F:ANIMAL | IM_POIS | NO_CONF | NO_SLEEP | FORCE_MAXHP | UNIQUE | FORCE_SLEEP
 F:EAT_INSANITY | RES_CHAO
@@ -10150,13 +10144,13 @@ B:GAZE:EXP_VAMP:4d8
 B:GAZE:EXP_VAMP:4d8
 B:CRUSH:ACID:8d8
 B:CRUSH:ACID:8d8
-F:FORCE_MAXHP | FORCE_SLEEP | UNIQUE | NO_STUN | NO_CONF |
-F:NO_SLEEP | EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD |
-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:SMART | NONLIVING | RES_TELE | KILL_WALL | ELDRITCH_HORROR |
-F:BASH_DOOR | DEMON | COLD_BLOOD | ANIMAL | CAN_SWIM |
-F:DROP_GOOD | DROP_GREAT | ONLY_ITEM | DROP_2D2 
+F:FORCE_MAXHP | FORCE_SLEEP | UNIQUE | NO_STUN | NO_CONF
+F:NO_SLEEP | EVIL | IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD
+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:SMART | NONLIVING | RES_TELE | KILL_WALL | ELDRITCH_HORROR
+F:BASH_DOOR | DEMON | COLD_BLOOD | ANIMAL | CAN_SWIM
+F:DROP_GREAT | ONLY_ITEM | DROP_2D2
 S:1_IN_3 | 
 S:BLINK | SLOW | SCARE | DARKNESS | HEAL | ANIM_DEAD
 S:TPORT | TELE_AWAY | HASTE | S_MONSTER | DRAIN_MANA |
@@ -11354,10 +11348,10 @@ I:125:25d100:20:70:10
 W:47:2:0:7500:0:0
 B:HIT:HURT:12d9
 B:HIT:HURT:12d9
-F:MALE | REGENERATE | UNIQUE | CAN_SPEAK |
+F:MALE | REGENERATE | UNIQUE | CAN_SPEAK
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_GOOD | DROP_GREAT
-F:SMART | OPEN_DOOR | BASH_DOOR | 
+F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_GREAT
+F:SMART | OPEN_DOOR | BASH_DOOR
 F:EVIL | HURT_LITE | RES_DARK | NO_CONF | NO_SLEEP | NO_STUN
 S:1_IN_2 | 
 S:HEAL | TELE_TO | BLIND | CONF | CAUSE_3 | DARKNESS | FORGET | HOLD |
@@ -12313,13 +12307,11 @@ B:HIT:HURT:5d10
 B:HIT:HURT:5d10
 B:HIT:EAT_ITEM:2d10
 B:HIT:EAT_ITEM:2d10
-F:MALE | FORCE_MAXHP | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
-F:REGENERATE | NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR |
-F:RES_TELE | HUMAN |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | UNIQUE |
+F:UNIQUE | MALE | FORCE_MAXHP | HUMAN | CAN_SPEAK | DROP_SKELETON | DROP_CORPSE
+F:REGENERATE | NO_CONF | NO_SLEEP | NO_STUN | NO_FEAR | RES_TELE
+F:ONLY_ITEM | DROP_1D2 | DROP_GREAT
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | SMART | POWERFUL |
-S:1_IN_3
-S:BLIND | HEAL | BA_DARK | HASTE | CONF |
+S:1_IN_3 | BLIND | HEAL | BA_DARK | HASTE | CONF |
 A:43:1:15
 D:$Deriving his strength from the shadows, this king of thieves 
 D:$steals only for the challenge.
@@ -12407,7 +12399,7 @@ D:で知られる。
 N:675:古代万色ドラゴン
 E:Ancient multi-hued dragon
 G:D:v
-I:120:50d45:20:95:100
+I:120:40d45:20:95:100
 W:42:1:0:10000:300000:790
 B:CLAW:HURT:4d12
 B:CLAW:HURT:4d12
@@ -12681,11 +12673,10 @@ B:TOUCH:TIME:1d50
 B:TOUCH:TIME:1d50
 F:ESCORT | UNIQUE | IM_COLD | RES_TIME | ELDRITCH_HORROR | RES_NETH |
 F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | KILL_BODY | DROP_GREAT |
+F:ONLY_ITEM | DROP_2D2 | KILL_BODY | DROP_GREAT |
 F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR |
 F:EVIL | UNDEAD | DEMON | REGENERATE |
-S:1_IN_3 | 
-S:BR_TIME | SLOW | HASTE | HEAL 
+S:1_IN_3 | BR_TIME | SLOW | HASTE | HEAL 
 D:$"It was a figure no larger than a young child, but sere and 
 D:$shriveled as some millenial mummy. Its hairless head, its 
 D:$unfeatured face, borne on a neck of skeleton thinness, were 
@@ -12904,16 +12895,13 @@ F:FORCE_SLEEP | FORCE_MAXHP |
 F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_CORPSE
 F:BASH_DOOR | POWERFUL | MOVE_BODY | CAN_FLY |
 F:EVIL | DRAGON | IM_COLD | NO_CONF | NO_SLEEP | RIDING
-S:1_IN_3 | 
-S:CONF | CAUSE_3 | 
-S:BR_COLD
-D:$An ancient and wise Dragon.  Scatha has grown clever over the long years.  
-D:$His scales are covered with frost, and his breath sends a shower of ice 
-D:$into the air.
-D:太古の賢明なるドラゴンであるスカサは、長い年月を通してその知能に磨きをかけて
-D:きた。
-D:彼の鱗は冷気で覆われていて、そのブレスは空気中に氷のシャワーを
-D:まき散らす。
+S:1_IN_3 | CONF | CAUSE_3 | BR_COLD
+D:$An ancient and wise Dragon.  Scatha has grown clever over the long years.
+D:$  His scales are covered with frost, and his breath sends a shower of ice
+D:$ into the air.
+D:太古の賢明なるドラゴンであるスカサは、
+D:長い年月を通してその知能に磨きをかけてきた。
+D:彼の鱗は冷気で覆われていて、そのブレスは空気中に氷のシャワーをまき散らす。
 
 #JZ#
 N:693:暁の戦士
@@ -13036,9 +13024,7 @@ F:FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | SELF_LITE_2 |
 F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | 
 F:BASH_DOOR | POWERFUL | MOVE_BODY | 
 F:EVIL | DRAGON | IM_FIRE | NO_CONF | NO_SLEEP | RIDING
-S:1_IN_3 | 
-S:CONF | CAUSE_3 | 
-S:BR_FIRE
+S:1_IN_3 | CONF | CAUSE_3 | BR_FIRE
 D:$Smaug is one of the Uruloki that still survive, a fire-drake of immense 
 D:$cunning and intelligence.  His speed through air is matched by few other 
 D:$dragons and his dragonfire is what legends are made of.
@@ -13426,12 +13412,10 @@ W:55:3:0:15000:0:0
 B:CRUSH:HURT:23d13
 B:CRUSH:HURT:23d13
 B:CRUSH:HURT:23d13
-F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | ELDRITCH_HORROR |
-F:ONLY_ITEM | DROP_4D2 | DROP_GREAT | KILL_BODY |
-F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | CAN_SWIM |
-F:EVIL
-S:1_IN_6
-S:S_DEMON | SHRIEK | CONF | SCARE | MIND_BLAST | BLIND 
+F:FORCE_SLEEP | FORCE_MAXHP | UNIQUE | EVIL | ELDRITCH_HORROR
+F:ONLY_ITEM | DROP_4D2 | DROP_GREAT | KILL_BODY
+F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | CAN_SWIM
+S:1_IN_6 | S_DEMON | SHRIEK | CONF | SCARE | MIND_BLAST | BLIND 
 D:$"The thing that crouched in the weird green dusk was a living mass 
 D:$of shuddering horror, a ghastly mountain of sensate, quivering 
 D:$flesh, whose tentacles, far-flung in the dim reaches of the 
@@ -13512,9 +13496,8 @@ B:CLAW:HURT:7d13
 B:CLAW:HURT:7d13
 B:BITE:HURT:8d13
 B:BITE:HURT:8d13
-F:UNIQUE | DROP_CORPSE | 
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_GREAT
+F:UNIQUE | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP
+F:ONLY_ITEM | DROP_2D2 | DROP_GREAT
 F:OPEN_DOOR | BASH_DOOR | MOVE_BODY | RES_NETH | RES_DARK |
 F:ANIMAL | EVIL | IM_FIRE | NO_CONF | NO_SLEEP
 S:1_IN_3 | BR_NETH | BR_COLD | BR_DARK | S_HOUND | S_UNDEAD
@@ -13845,8 +13828,7 @@ F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
 F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | 
 F:IM_POIS | IM_FIRE | NO_CONF | NO_SLEEP | EVIL | RES_TELE
-S:1_IN_6 | 
-S:TRAPS | S_KIN
+S:1_IN_6 | TRAPS | S_KIN
 A:139:1:66
 D:$He may not code worth a dime, but he certainly knows how to make money.
 D:彼の書くプログラムは一銭の価値もないかもしれないが、彼は金を儲ける方法を
@@ -13863,10 +13845,9 @@ B:TOUCH:LOSE_ALL:10d1
 B:TOUCH:LOSE_ALL:10d1
 B:CHARGE:EAT_GOLD
 F:UNIQUE | MALE | CAN_SPEAK | REFLECTING | DROP_SKELETON | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | HAS_LITE_1 |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:NO_STUN | NO_SLEEP | NO_CONF | 
-F:IM_ELEC | IM_FIRE | IM_POIS | IM_COLD |
+F:FORCE_SLEEP | FORCE_MAXHP | SMART | HAS_LITE_1
+F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_GREAT
+F:NO_STUN | NO_SLEEP | NO_CONF | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD
 F:COLD_BLOOD | RES_TELE
 S:1_IN_3 |
 S:CAUSE_4 | HOLD | DRAIN_MANA | SCARE | BLIND | 
@@ -14901,11 +14882,11 @@ W:61:2:0:22000:0:0
 B:HIT:EXP_VAMP:6d6
 B:HIT:EXP_VAMP:8d8
 B:HIT:EXP_VAMP:10d10
-F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_2 | HUMAN |
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE |
-F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT
-F:OPEN_DOOR | BASH_DOOR | RES_NEXU | RES_NETH | RES_CHAO | EVIL | 
-F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP | 
+F:UNIQUE | MALE | CAN_SPEAK | HAS_LITE_2 | HUMAN
+F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE
+F:ONLY_ITEM | DROP_1D2 | DROP_4D2 | DROP_GREAT
+F:OPEN_DOOR | BASH_DOOR | RES_NEXU | RES_NETH | RES_CHAO | EVIL
+F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
 S:1_IN_4 | 
 S:BA_FIRE | BA_CHAO | CONF | TPORT | S_DEMON | BR_CHAO | BA_MANA | PSY_SPEAR
 D:$He is one of the greatest warriors of chaos to walk the earth. 
@@ -15610,16 +15591,14 @@ B:CLAW:HURT:8d12
 B:CLAW:HURT:8d12
 B:BITE:HURT:10d14
 F:ATTR_MULTI | 
-F:UNIQUE | FEMALE | CAN_FLY | DROP_CORPSE
-F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ESCORT | RIDING | AURA_FIRE | AURA_COLD | AURA_ELEC |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DRAGON | SELF_LITE_2 |
+F:UNIQUE | FEMALE | CAN_FLY | DROP_CORPSE | FORCE_SLEEP | FORCE_MAXHP
+F:ESCORT | RIDING | AURA_FIRE | AURA_COLD | AURA_ELEC
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT
+F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY
+F:EVIL | DRAGON | SELF_LITE_2
 F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
-S:1_IN_2 | 
-S:BLIND | CONF | SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS | 
+S:1_IN_2 | BLIND | CONF | SCARE
+S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
 S:S_HI_DRAGON
 D:$Usually found guarding the first plane of Hell, Tiamat is a formidable 
 D:$opponent, her five heads breathing death to all who stand against her.
@@ -15638,15 +15617,14 @@ B:CRUSH:FIRE:8d12
 B:CRUSH:ELEC:8d12
 B:CRUSH:POISON:10d14
 F:ATTR_MULTI | ELDRITCH_HORROR | DROP_CORPSE
-F:UNIQUE | CAN_SPEAK | AURA_FIRE | AURA_ELEC | AURA_COLD |
-F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
+F:UNIQUE | CAN_SPEAK | AURA_FIRE | AURA_ELEC | AURA_COLD
+F:FORCE_SLEEP | FORCE_MAXHP | CAN_FLY
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT
+F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY
 F:EVIL | RIDING |
 F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
-S:1_IN_2 | 
-S:BLIND | CONF | SCARE | 
-S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS | 
+S:1_IN_2 | BLIND | CONF | SCARE
+S:BR_ACID | BR_FIRE | BR_COLD | BR_ELEC | BR_POIS
 S:S_HI_DRAGON | S_MONSTERS
 D:$An elephantine horror with five trunks, each capable of breathing 
 D:$destructive blasts of elements. It is said that it is better to 
@@ -16212,8 +16190,7 @@ F:BASH_DOOR | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | IM_ACID |
 F:RES_LITE | RES_DARK | RES_WATE | RES_PLAS | RES_SHAR | RES_SOUN |
 F:RES_CHAO | RES_NEXU | RES_DISE | RES_WALL | RES_INER | RES_TIME | RES_GRAV |
 F:COLD_BLOOD | NONLIVING | RAND_50
-S:1_IN_5 |
-S:BR_CHAO
+S:1_IN_5 | BR_CHAO
 D:$Summoned from the Courts of Chaos, it is a mass of sentient Logrus, 
 D:$spreading uncontrollably and destroying everything in its path.
 D:混沌の宮廷から召喚された、意識を持ったログルスの塊だ。
@@ -16263,7 +16240,7 @@ B:TOUCH:UN_BONUS:50d1
 B:TOUCH:DR_MANA:50d1
 F:UNIQUE | FEMALE | CAN_SPEAK | POWERFUL | RES_TELE |
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | 
-F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | DROP_GOOD |
+F:ONLY_ITEM | DROP_1D2 | DROP_GREAT
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | CAN_FLY |
 F:EVIL | RES_NETH | IM_COLD | IM_POIS |
 F:IM_FIRE | NO_CONF | NO_SLEEP |
@@ -16320,7 +16297,7 @@ B:TOUCH:BLIND
 B:TOUCH:CONFUSE
 F:UNIQUE | MALE | CAN_SPEAK | POWERFUL | RES_TELE | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | DROP_SKELETON 
-F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | DROP_GOOD |
+F:ONLY_ITEM | DROP_1D2 | DROP_GREAT
 F:INVISIBLE | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | IM_FIRE | IM_COLD | 
 F:IM_ELEC | NO_CONF | NO_SLEEP
@@ -16668,7 +16645,7 @@ B:TOUCH:POISON:3d5
 B:TOUCH:POISON:3d5
 F:UNIQUE | MALE | CAN_SPEAK | DROP_SKELETON | RES_TELE
 F:FORCE_SLEEP | FORCE_MAXHP | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT |
 F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | UNDEAD | IM_FIRE | IM_COLD | IM_POIS | RES_NETH |
 F:NO_CONF | NO_SLEEP | NO_FEAR | POWERFUL |
@@ -16697,7 +16674,7 @@ B:TOUCH:FIRE:4d5
 B:TOUCH:UN_POWER:4d5
 F:MALE | UNIQUE | CAN_SPEAK | CAN_FLY |
 F:FORCE_SLEEP | FORCE_MAXHP | OPEN_DOOR | BASH_DOOR | MOVE_BODY |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT |
 F:IM_FIRE | RES_PLAS | RES_NETH | AURA_FIRE |
 F:NO_CONF | NO_SLEEP | NONLIVING | EVIL | DEMON |
 F:IM_COLD | IM_POIS
@@ -16744,11 +16721,10 @@ B:TOUCH:ACID:11d11
 B:TOUCH:DISEASE:11d11
 B:TOUCH:ACID:11d11
 B:TOUCH:POISON:11d11
-F:ONLY_ITEM | DROP_1D2 | CAN_SWIM |
-F:DROP_GOOD | DROP_GREAT |
-F:CAN_SPEAK | EVIL | UNIQUE | NEVER_MOVE | FORCE_MAXHP | FORCE_SLEEP |
-F:IM_ACID | IM_POIS | IM_COLD | IM_ELEC | RES_NETH | RES_WATE | RES_NEXU 
-F:NO_FEAR | NO_CONF | NO_SLEEP | DEMON | SMART | ELDRITCH_HORROR | RES_CHAO |
+F:ONLY_ITEM | DROP_1D2 | CAN_SWIM | DROP_GREAT
+F:CAN_SPEAK | EVIL | UNIQUE | NEVER_MOVE | FORCE_MAXHP | FORCE_SLEEP
+F:IM_ACID | IM_POIS | IM_COLD | IM_ELEC | RES_NETH | RES_WATE | RES_NEXU
+F:NO_FEAR | NO_CONF | NO_SLEEP | DEMON | SMART | ELDRITCH_HORROR | RES_CHAO
 F:COLD_BLOOD | RES_DISE | NO_STUN
 S:1_IN_6 |
 S:S_MONSTERS | S_DEMON | S_HI_DRAGON | S_HI_UNDEAD | HEAL |
@@ -16807,7 +16783,7 @@ B:HIT:UN_POWER:6d11
 B:TOUCH:DR_MANA:6d11
 F:UNIQUE | DROP_CORPSE | MALE |
 F:FORCE_SLEEP | FORCE_MAXHP | RES_TELE | RES_NETH | RES_PLAS |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT | EVIL | AURA_FIRE |
+F:ONLY_ITEM | DROP_4D2 | 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 |
@@ -16985,12 +16961,11 @@ B:CRUSH:HURT:12d12
 B:CRUSH:HURT:12d12
 B:GAZE:LOSE_INT:2d12
 B:GAZE:LOSE_WIS:2d12
-F:ONLY_ITEM | DROP_1D2 | CAN_SWIM |
-F:DROP_GOOD | DROP_GREAT |
-F:CAN_SPEAK | EVIL | UNIQUE | NEVER_MOVE | FORCE_MAXHP | FORCE_SLEEP |
-F:IM_ACID | IM_POIS | IM_COLD | IM_ELEC | RES_NETH | RES_WATE | RES_NEXU |
-F:NO_FEAR | NO_CONF | NO_SLEEP | DEMON | SMART | ELDRITCH_HORROR | RES_CHAO |
-F:COLD_BLOOD | RES_DISE | NO_STUN | POWERFUL |
+F:ONLY_ITEM | DROP_1D2 | CAN_SWIM | DROP_GREAT
+F:CAN_SPEAK | EVIL | UNIQUE | NEVER_MOVE | FORCE_MAXHP | FORCE_SLEEP
+F:IM_ACID | IM_POIS | IM_COLD | IM_ELEC | RES_NETH | RES_WATE | RES_NEXU
+F:NO_FEAR | NO_CONF | NO_SLEEP | DEMON | SMART | ELDRITCH_HORROR | RES_CHAO
+F:COLD_BLOOD | RES_DISE | NO_STUN | POWERFUL
 S:1_IN_2 |
 S:FORGET | HEAL | HAND_DOOM | BA_MANA | TPORT | TELE_AWAY |
 S:TELE_LEVEL | CONF | BLIND | BRAIN_SMASH | DRAIN_MANA |
@@ -17045,7 +17020,7 @@ B:HIT:HURT:2d50
 B:HIT:HURT:2d50
 B:HIT:HURT:2d50
 F:RAND_25 | EVIL | DEMON |
-F:DROP_2D2 | DROP_GOOD | ONLY_ITEM | RES_TELE | DROP_GREAT | UNIQUE |
+F:DROP_2D2 | ONLY_ITEM | RES_TELE | DROP_GREAT | UNIQUE |
 F:IM_POIS | IM_FIRE | FORCE_SLEEP | FORCE_MAXHP | NONLIVING
 S:1_IN_3 |
 S:ROCKET | S_CYBER
@@ -17066,7 +17041,7 @@ B:HIT:DR_MANA:10d10
 F:UNIQUE | MALE | DROP_SKELETON | CAN_SPEAK | RES_TELE
 F:FORCE_SLEEP | FORCE_MAXHP | 
 F:ESCORT | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT | 
 F:SMART | COLD_BLOOD | OPEN_DOOR | BASH_DOOR | 
 F:EVIL | UNDEAD | POWERFUL |
 F:IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_NETH | NO_CONF | NO_SLEEP |
@@ -17229,7 +17204,7 @@ B:HIT:HURT:2d66
 B:HIT:HURT:2d66
 F:UNIQUE | CAN_SPEAK | MALE |
 F:FORCE_SLEEP | FORCE_MAXHP | PASS_WALL |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_90 | DROP_GREAT |
+F:ONLY_ITEM | DROP_4D2 | DROP_90 | DROP_GREAT |
 F:SMART | OPEN_DOOR | BASH_DOOR | REGENERATE | CAN_FLY |
 F:GOOD | IM_ACID | IM_COLD | IM_POIS | IM_FIRE | IM_ELEC | NO_CONF | 
 F:NO_SLEEP | RES_NEXU | RES_NETH | RES_WATE | POWERFUL |
@@ -17290,7 +17265,7 @@ B:GAZE:LOSE_WIS:1d50
 F:UNIQUE | CAN_SPEAK | ELDRITCH_HORROR | RES_TELE | NONLIVING |
 F:FORCE_SLEEP | FORCE_MAXHP | PASS_WALL | DEMON | RES_NEXU | RES_CHAO |
 F:SHAPECHANGER | ATTR_MULTI | ATTR_ANY | MALE | AURA_ELEC |
-F:ONLY_ITEM | DROP_4D2 | DROP_GOOD | DROP_GREAT | DROP_90 |
+F:ONLY_ITEM | DROP_4D2 | DROP_GREAT | DROP_90 |
 F:SMART | OPEN_DOOR | BASH_DOOR | REGENERATE | AURA_COLD |
 F:EVIL | IM_ACID | IM_POIS | IM_FIRE | NO_CONF | NO_SLEEP | POWERFUL |
 S:1_IN_3 |
@@ -17444,13 +17419,11 @@ B:HIT:FIRE:9d12
 B:HIT:FIRE:9d12
 B:CRUSH:SUPERHURT:8d12
 B:TOUCH:UN_POWER
-F:UNIQUE | MALE | CAN_SPEAK | CAN_FLY |
-F:FORCE_SLEEP | FORCE_MAXHP |
-F:ESCORT | ESCORTS | KILL_WALL | AURA_FIRE | NONLIVING |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
-F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
-F:EVIL | DEMON | 
-F:IM_FIRE | IM_ELEC | NO_CONF | NO_SLEEP
+F:UNIQUE | MALE | CAN_SPEAK | CAN_FLY | FORCE_SLEEP | FORCE_MAXHP
+F:ESCORT | ESCORTS | KILL_WALL | AURA_FIRE | NONLIVING
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT
+F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY
+F:EVIL | DEMON | IM_FIRE | IM_ELEC | NO_CONF | NO_SLEEP
 S:1_IN_3 | 
 S:BLIND | CONF | SCARE | 
 S:BR_FIRE | S_KIN |
@@ -17480,8 +17453,8 @@ B:TOUCH:DISEASE:100d1
 F:UNIQUE | CAN_SPEAK | DEMON | ELDRITCH_HORROR | NONLIVING |
 F:FORCE_SLEEP | FORCE_MAXHP | ESCORT | ESCORTS | SMART | RES_PLAS | RES_NEXU |
 F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | REGENERATE | RES_NETH |
-F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_1D2 | DROP_GOOD |
-F:DROP_GREAT | RES_DISE | RES_CHAO | RES_DARK | RES_TELE | CAN_SWIM |
+F:ONLY_ITEM | DROP_2D2 | DROP_4D2 | DROP_1D2 | DROP_GREAT
+F:RES_DISE | RES_CHAO | RES_DARK | RES_TELE | CAN_SWIM |
 F:EVIL | IM_FIRE | IM_POIS | IM_ELEC | IM_ACID | NO_CONF | NO_SLEEP |
 S:1_IN_3
 S:TPORT | SCARE | BLIND | MIND_BLAST | BRAIN_SMASH | DRAIN_MANA |
@@ -17521,7 +17494,7 @@ B:TOUCH:UN_POWER
 B:TOUCH:UN_POWER
 F:UNIQUE | MALE | CAN_SPEAK | REFLECTING | HAS_LITE_2 |
 F:FORCE_SLEEP | FORCE_MAXHP | HUMAN |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT |
 F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | 
 F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_DARK |
 F:NO_CONF | NO_SLEEP | NO_FEAR | RES_TELE | POWERFUL |
@@ -17555,7 +17528,7 @@ B:BITE:TIME:11d11
 F:UNIQUE | FORCE_SLEEP | FORCE_MAXHP | FEMALE
 F:REFLECTING | AURA_COLD | AURA_ELEC |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | 
-F:DROP_GOOD | DROP_GREAT | RES_LITE | RES_NETH | RES_WATE | RES_PLAS |
+F:DROP_GREAT | RES_LITE | RES_NETH | RES_WATE | RES_PLAS |
 F:RES_SOUN | RES_NEXU | RES_DISE | RES_WALL | RES_INER | RES_TIME | RES_GRAV |
 F:SMART | KILL_BODY | POWERFUL | SELF_LITE_1 |
 F:REGENERATE | NONLIVING | CAN_FLY |
@@ -17602,7 +17575,7 @@ B:TOUCH:DR_MANA:10d8
 F:UNIQUE | QUESTOR | MALE | CAN_SPEAK | DROP_CORPSE | HAS_LITE_2 |
 F:ATTR_MULTI | AMBERITE | RES_TELE
 F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | HUMAN |
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT |
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT |
 F:REFLECTING | AURA_FIRE | AURA_ELEC
 F:SMART | OPEN_DOOR | BASH_DOOR | MOVE_BODY | REGENERATE | 
 F:EVIL | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_CHAO | POWERFUL |
@@ -17655,13 +17628,11 @@ B:HIT:SHATTER:20d10
 B:HIT:LOSE_ALL:10d12
 B:TOUCH:UN_POWER
 F:UNIQUE | MALE | 
-F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | SELF_DARK_1 | SELF_DARK_2 |
-F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT |
-F:SMART | KILL_WALL | MOVE_BODY | AURA_COLD |
-F:REGENERATE | POWERFUL |
-F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_DARK |
-F:NO_CONF | NO_SLEEP | NO_FEAR
+F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | SELF_DARK_1 | SELF_DARK_2
+F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 
+F:DROP_GREAT | SMART | KILL_WALL | MOVE_BODY | AURA_COLD
+F:REGENERATE | POWERFUL | NO_CONF | NO_SLEEP | NO_FEAR
+F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | RES_DARK
 S:1_IN_3 | 
 S:BRAIN_SMASH | DISPEL |
 S:BA_MANA | BO_MANA | BA_NETH | ANIM_DEAD 
@@ -17708,7 +17679,7 @@ F:UNIQUE | QUESTOR | CAN_SPEAK | ATTR_MULTI | ATTR_ANY |
 F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH | SELF_LITE_1 |
 F:REFLECTING | AURA_FIRE | AURA_ELEC | AURA_COLD |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | RES_CHAO | RES_NETH |
+F:DROP_GREAT | RES_CHAO | RES_NETH |
 F:SMART | KILL_WALL | KILL_BODY | POWERFUL |
 F:REGENERATE | NONLIVING | CAN_FLY | RIDING |
 F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
@@ -17763,7 +17734,7 @@ B:TOUCH:UN_BONUS:10d10
 B:TOUCH:LOSE_ALL:10d10
 B:TOUCH:EXP_80:10d10
 F:UNIQUE | FORCE_SLEEP | NEVER_MOVE | ONLY_ITEM | DROP_90 | FORCE_MAXHP |
-F:DROP_GOOD | DROP_GREAT | REFLECTING | INVISIBLE | COLD_BLOOD | 
+F:DROP_GREAT | REFLECTING | INVISIBLE | COLD_BLOOD | 
 F:SMART | EMPTY_MIND | REGENERATE | POWERFUL | AURA_FIRE |
 F:EVIL | DEMON | NONLIVING | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS |
 F:RES_LITE | RES_DARK | RES_NETH | RES_WATE | RES_PLAS | RES_SHAR | RES_SOUN |
@@ -17918,7 +17889,7 @@ B:TOUCH:UN_POWER
 B:TOUCH:UN_POWER
 F:FORCE_SLEEP
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | 
-F:DROP_GOOD | DROP_GREAT | CAN_SWIM |
+F:DROP_GREAT | CAN_SWIM |
 F:SMART | NONLIVING | COLD_BLOOD |
 F:RES_ALL | POWERFUL | 
 F:NO_CONF | NO_SLEEP | NO_STUN | EMPTY_MIND | RES_TELE |
@@ -17962,7 +17933,7 @@ B:KICK:HURT:7d10
 B:HIT:UN_POWER:7d8
 F:UNIQUE | MALE | HAS_LITE_2 | HUMAN |
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_CORPSE | CAN_SPEAK |
-F:ONLY_ITEM | DROP_1D2 | DROP_3D2 | DROP_GOOD | DROP_GREAT |
+F:ONLY_ITEM | DROP_1D2 | DROP_3D2 | DROP_GREAT |
 F:OPEN_DOOR | POWERFUL | MOVE_BODY | CAN_SWIM |
 F:GOOD | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | 
 F:RES_LITE | RES_DARK | RES_NETH | RES_WATE | RES_PLAS | RES_SHAR | RES_SOUN |
@@ -17985,7 +17956,7 @@ D:女性の扱いは苦手。
 N:874:グレート・インフェルノ・ドレイク
 E:Great Inferno Drake
 G:D:D
-I:120:30d90:30:110:30
+I:120:30d80:30:110:30
 W:54:2:0:18000:400000:1200
 B:CLAW:HURT:9d9
 B:CLAW:HURT:9d9
@@ -18064,7 +18035,7 @@ B:SPIT:BLIND:10d10
 B:HIT:LOSE_CON:10d10
 F:UNIQUE | MALE |
 F:FORCE_SLEEP | FORCE_MAXHP | SMART | CAN_SPEAK | CAN_FLY | AURA_COLD |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT |
+F:ONLY_ITEM | DROP_1D2 | 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_TIME | RES_TELE | REFLECTING |
@@ -18184,7 +18155,7 @@ F:CAN_SPEAK | UNDEAD | UNIQUE2 |
 F:FORCE_SLEEP | FORCE_MAXHP | FORCE_DEPTH |
 F:REFLECTING | AURA_FIRE | AURA_ELEC | AURA_COLD |
 F:ONLY_ITEM | DROP_1D2 | DROP_2D2 | DROP_3D2 | DROP_4D2 | 
-F:DROP_GOOD | DROP_GREAT | RES_CHAO | RES_NETH |
+F:DROP_GREAT | RES_CHAO | RES_NETH |
 F:SMART | KILL_WALL | KILL_BODY | POWERFUL |
 F:REGENERATE | NONLIVING | CAN_FLY |
 F:EVIL | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
@@ -20018,7 +19989,7 @@ B:BITE:LOSE_ALL:3d8
 F:REFLECTING | DROP_1D2 | DROP_2D2 | RES_DISE | ANIMAL |
 F:REGENERATE | IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | 
 F:NO_CONF | NO_SLEEP | RES_TELE | CAN_SWIM | RIDING
-D:It is a white horse with a horn on its forehead.
+D:$It is a white horse with a horn on its forehead.
 D:額に一本の角を持った白馬で、乙女にのみ心を許すと言われる。
 
 N:986:猫又
@@ -20278,7 +20249,7 @@ F:ATTR_MULTI | CAN_SPEAK | SELF_LITE_2 |
 F:UNIQUE | MALE | CAN_FLY | DROP_CORPSE
 F:FORCE_SLEEP | FORCE_MAXHP | 
 F:ESCORT | 
-F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | 
+F:ONLY_ITEM | DROP_2D2 | DROP_3D2 | DROP_4D2 | DROP_GREAT | 
 F:OPEN_DOOR | BASH_DOOR | POWERFUL | MOVE_BODY | 
 F:GOOD | DRAGON | RIDING |
 F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS | NO_CONF | NO_SLEEP
@@ -20663,7 +20634,7 @@ B:HIT:EAT_GOLD:1d9
 B:TOUCH:EAT_ITEM
 B:TOUCH:EAT_ITEM
 F:UNIQUE | FEMALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | FRIENDLY | HUMAN |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_GRASS |
+F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | WILD_GRASS |
 F:TAKE_ITEM | OPEN_DOOR | CAN_SWIM | DROP_SKELETON | DROP_CORPSE
 S:1_IN_3
 S:HEAL | TRAPS
@@ -21524,7 +21495,7 @@ F:FORCE_MAXHP | CAN_SPEAK | SMART | REGENERATE |
 F:NO_CONF | NO_STUN |
 F:IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD |
 F:RES_LITE | RES_NETH | RES_SHAR | RES_SOUN | RES_CHAO | RES_NEXU | RES_DISE |
-F:ONLY_ITEM | DROP_90 | DROP_GOOD | DROP_GREAT |
+F:ONLY_ITEM | DROP_90 | DROP_GREAT |
 F:TAKE_ITEM | DROP_CORPSE |
 F:INVISIBLE | PASS_WALL | 
 F:UNDEAD | EVIL
@@ -21722,27 +21693,28 @@ B:BUTT:HURT:8d8
 B:BITE:UN_BONUS:7d7
 F:UNIQUE | FEMALE | GOOD | EVIL | NONLIVING | RIDING |
 F:FORCE_MAXHP | OPEN_DOOR | BASH_DOOR | INVISIBLE |
-F:ONLY_ITEM | DROP_GOOD | DROP_GREAT | DROP_2D2 |
+F:ONLY_ITEM | DROP_GREAT | DROP_2D2 |
 F:SMART | REGENERATE |
 F:IM_ACID | IM_ELEC | IM_FIRE | IM_POIS | IM_COLD | NO_CONF | NO_SLEEP |
 F:RES_LITE | RES_DARK | RES_NETH | RES_CHAO | RES_NEXU |
 S:1_IN_3 |
 S:BLINK | HEAL | SHRIEK | SCARE | CONF | BLIND |
 S:DARKNESS | FORGET | MIND_BLAST | BRAIN_SMASH |
-D:$"Invisible Pink Unicorns are beings of great spiritual power. 
-D:$We know this because they are capable of being invisible 
-D:$and pink at the same time. Like all religions, the Faith 
-D:$of the Invisible Pink Unicorns is based upon both logic 
-D:$and faith. We have faith that they are pink; we logically 
-D:$know that they are invisible because we can't see them." 
-D:$(Steve Eley)
-D:「見えざるピンクのユニコーン達は偉大なるスピリチュアルパワ
-D:ーの存在である。我々は彼女らが目に見えないと同時にピンク色
-D:で存在することが出来るがゆえにそれを承知している。すべての
-D:宗教と同様、見えざるピンクのユニコーンの教義は論理と信仰に
-D:基づいている。我々は彼女らがピンクであると信じている。我々
-D:は、我々が彼女らを見ることができないから見えないのだと論理
-D:的に知っている。」
+D:$"Invisible Pink Unicorns are beings of great spiritual power.
+D:$  We know this because they are capable of being invisible
+D:$ and pink at the same time.
+D:$  Like all religions, the Faith of the Invisible Pink Unicorns
+D:$ is based upon both logic and faith.
+D:$  We have faith that they are pink;
+D:$ we logically know that they are invisible because we can't see them."
+D:$  (Steve Eley)
+D:「見えざるピンクのユニコーン達は偉大なるスピリチュアルパワーの存在である。
+D:我々は彼女らが目に見えないと同時にピンク色で存在することが出来るがゆえに
+D:それを承知している。
+D:すべての宗教と同様、見えざるピンクのユニコーンの教義は論理と信仰に
+D:基づいている。我々は彼女らがピンクであると信じている。
+D:我々は、我々が彼女らを見ることができないから見えないのだと
+D:論理的に知っている。」
 D:(スティーヴ・イーリー)
 
 N:1080:『空飛ぶスパゲッティ・モンスター』
@@ -21756,7 +21728,7 @@ F:RAND_25 | SMART | PASS_WALL |
 F:NO_CONF | NO_SLEEP | NO_STUN |
 F:IM_ACID | IM_FIRE | IM_COLD | IM_ELEC | IM_POIS |
 F:RES_NETH | RES_CHAO |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT
+F:ONLY_ITEM | DROP_1D2 | DROP_GREAT
 S:1_IN_4
 S:BLINK | TPORT | SLOW | CONF | HOLD | TELE_TO |
 S:BRAIN_SMASH | BA_WATE | BA_CHAO | BR_NEXU | BR_CONF |
@@ -21787,7 +21759,7 @@ B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 B:HIT:HURT:1d6
 F:UNIQUE | MALE | FORCE_SLEEP | FORCE_MAXHP | CAN_SPEAK | HUMAN |
-F:ONLY_ITEM | DROP_1D2 | DROP_GOOD | DROP_GREAT | WILD_WOOD |
+F:ONLY_ITEM | DROP_1D2 | DROP_GREAT | WILD_WOOD |
 F:TAKE_ITEM | OPEN_DOOR | BASH_DOOR | EVIL | DROP_SKELETON | DROP_CORPSE
 S:1_IN_4
 S:SHOOT | BLINK
@@ -21965,7 +21937,7 @@ G:t:w
 I:109:3d10:10:150:12
 W:0:10:0:200:0:0
 B:EXPLODE:SHATTER:15d8
-F:GOOD | DROP_GOOD | DROP_GREAT | ONLY_ITEM | DROP_90 | FORCE_MAXHP |
+F:GOOD | DROP_GREAT | ONLY_ITEM | DROP_90 | FORCE_MAXHP |
 F:UNIQUE | EMPTY_MIND | WILD_TOWN | CAN_SPEAK |
 F:OPEN_DOOR | BASH_DOOR | NONLIVING | RES_TELE
 D:$He was a West German scientist, but the Jurians turned him into a bomb
@@ -22023,10 +21995,8 @@ G:I:b
 I:120:70d50:50:64:50
 W:48:6:0:5000:0:0
 F:FORCE_SLEEP | CAN_FLY | WEIRD_MIND | BASH_DOOR | RAND_50
-F:RES_CHAO | NO_CONF | ONLY_ITEM | DROP_90 |
-F:DROP_GOOD | DROP_GREAT | NEVER_BLOW
-S:1_IN_2
-S:BO_MANA | BR_MANA
+F:RES_CHAO | NO_CONF | ONLY_ITEM | DROP_90 | | DROP_GREAT | NEVER_BLOW
+S:1_IN_2 | BO_MANA | BR_MANA
 D:この青く輝く巨大な蝶は、鱗を持たぬ白竜シースの手によって生み出された。
 D:$This palely bright and giant butterfly is
 D:$created by Seath the scaleless dragon.
@@ -22487,7 +22457,7 @@ I:120:35d20:30:50:10
 W:25:1:0:410:0:0
 B:HIT:HURT:10d6
 S:1_IN_8 | S_KIN | SHRIEK
-F:DROP_1D2 | DROP_90 | ONLY_ITEM | DROP_GOOD | DROP_GREAT
+F:DROP_1D2 | DROP_90 | ONLY_ITEM | DROP_GREAT
 F:OPEN_DOOR | BASH_DOOR | DROP_SKELETON | DROP_CORPSE
 F:UNIQUE | FORCE_MAXHP
 F:EVIL | IM_POIS | EAT_POISONOUS
@@ -22553,7 +22523,7 @@ B:STING:SUPERHURT:15d2
 F:UNIQUE | FORCE_MAXHP | GOOD | FEMALE | ANGEL
 F:IM_FIRE | RES_LITE | RES_GRAV | CAN_FLY
 F:BASH_DOOR | NO_SLEEP | NO_CONF | NO_FEAR
-F:DROP_GOOD | DROP_GREAT | ONLY_ITEM | DROP_1D2
+F:DROP_GREAT | ONLY_ITEM | DROP_1D2
 S:1_IN_6
 S:ANIM_DEAD | BA_LITE | CAUSE_3 | CONF | HOLD | BLIND | SHRIEK | BLINK
 A:253:1:10
@@ -22738,7 +22708,7 @@ B:SLASH:HURT:10d5
 B:SLASH:HURT:10d5
 B:CRUSH:SUPERHURT:40d1
 F:UNIQUE | FORCE_MAXHP
-F:ONLY_ITEM | DROP_GOOD | DROP_1D2 | DROP_GREAT
+F:ONLY_ITEM | DROP_1D2 | DROP_GREAT
 F:ATTR_MULTI | ESCORT | ESCORTS
 F:IM_FIRE | IM_COLD | IM_ELEC | RES_NETH | RES_LITE | RES_DARK
 F:NO_FEAR | NO_CONF | NO_SLEEP | CAN_SWIM
@@ -22757,7 +22727,7 @@ B:SLASH:LOSE_ALL:5d5
 B:SLASH:LOSE_ALL:5d5
 B:SLASH:LOSE_ALL:6d8
 B:SLASH:LOSE_ALL:6d8
-F:UNIQUE | FORCE_MAXHP | ONLY_ITEM | DROP_GOOD | DROP_GREAT | DROP_2D2
+F:UNIQUE | FORCE_MAXHP | ONLY_ITEM | DROP_GREAT | DROP_2D2
 F:DROP_CORPSE | DROP_SKELETON
 F:REGENERATE | ELDRITCH_HORROR | OPEN_DOOR | BASH_DOOR | MOVE_BODY
 F:HUMAN | MALE | SELF_DARK_2 | SMART | POWERFUL
@@ -22792,7 +22762,7 @@ D:目についた獲物を片っ端から屠っていく。
 
 N:1137:殺人イタチ
 E:Killer weasel
-G:f:W
+G:r:W
 I:110:12d12:20:10:25
 W:15:1:0:55:0:0
 B:BITE:HURT:5d2
@@ -22832,7 +22802,7 @@ B:TOUCH:UN_BONUS:8d7
 B:TOUCH:UN_POWER:8d7
 B:TOUCH:TIME:8d7
 F:QUANTUM | UNIQUE | FEMALE | ATTR_CLEAR | FORCE_MAXHP | RAND_25
-F:ONLY_ITEM | DROP_GOOD | DROP_GREAT | DROP_2D2 | DROP_4D2
+F:ONLY_ITEM | DROP_GREAT | DROP_2D2 | DROP_4D2
 F:DROP_CORPSE | DROP_SKELETON
 F:SMART | REFLECTING | INVISIBLE | WEIRD_MIND | REGENERATE
 F:POWERFUL | ELDRITCH_HORROR | AURA_ELEC | PASS_WALL
@@ -23067,7 +23037,7 @@ F:DROP_90 | DROP_4D2 | ONLY_GOLD
 S:1_IN_8 | MISSILE | ROCKET
 D:$This aircraft protects the home of the Bacterian army
 D:$ with the power reactor exposed.
-D:$  Recently this unit was fired.
+D:$  Recently this unit seemed to be fired.
 D:この機体は動力炉を剥き出しにしたままバクテリアン軍の本拠地を守っていた。
 D:最近暇を出されたようだ。
 
@@ -23075,12 +23045,12 @@ N:1150:蜘蛛地獄『ゴライアス』
 E:Goliath, the king of ant-lion
 G:S:r
 I:110:20d10:30:30:20
-W:10:1:0:50:0:0
+W:10:2:0:180:0:0
 B:BITE:HURT:2d10
 B:STING:HURT:2d10
 F:UNIQUE | FORCE_MAXHP | EVIL | DROP_CORPSE | DROP_SKELETON | ESCORT
 F:DROP_60 | DROP_90 | ONLY_ITEM | DROP_GOOD | NO_SLEEP | ANIMAL
-S:1_IN_8 | S_KIN | BLIND
+S:1_IN_10 | S_KIN | BLIND
 D:$It waits to prey on all living things.
 D:それはあらゆる生き物を餌食にしようと待ち構えている。
 
@@ -23088,7 +23058,7 @@ N:1151:小さな泡
 E:Small aqua illusion
 G:j:B
 I:110:12d12:10:30:10
-W:15:1:0:50:0:0
+W:15:2:0:50:0:0
 B:CRUSH:HURT:6d6
 F:RAND_25 | RAND_50 | FRIENDS | WILD_SWAMP | NONLIVING | EMPTY_MIND
 F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_WATE
@@ -23101,7 +23071,7 @@ N:1152:やや大きな泡
 E:Middle aqua illusion
 G:j:B
 I:110:12d12:10:30:10
-W:18:1:0:100:0:0
+W:18:2:0:100:0:0
 B:CRUSH:HURT:7d7
 F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
 F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_WATE
@@ -23114,7 +23084,7 @@ N:1153:大きな泡
 E:Large aqua illusion
 G:j:B
 I:110:18d18:10:30:10
-W:21:1:0:250:0:0
+W:21:2:0:250:0:0
 B:CRUSH:HURT:8d8
 F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
 F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_WATE
@@ -23127,7 +23097,7 @@ N:1154:特大の泡
 E:Extra large aqua illusion
 G:j:B
 I:110:18d18:10:30:10
-W:24:1:0:500:0:0
+W:24:3:0:500:0:0
 B:CRUSH:HURT:9d9
 F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
 F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_WATE
@@ -23139,11 +23109,11 @@ N:1155:二週目の小さな泡
 E:Small aqua illusion in 2nd lap
 G:j:b
 I:120:20d20:10:50:10
-W:25:1:0:120:0:0
+W:30:2:0:120:0:0
 B:CRUSH:HURT:6d6
 B:CRUSH:HURT:6d6
 F:RAND_25 | RAND_50 | FRIENDS | WILD_SWAMP | NONLIVING | EMPTY_MIND
-F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE | POWERFUL
+F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE
 S:1_IN_5 | MISSILE
 D:$Holy shit! It will shoot you back at this bubble!
 D:なんてこった、こいつ泡のくせに撃ち返してくるぞ！
@@ -23154,11 +23124,11 @@ N:1156:二周目のやや大きな泡
 E:Middle aqua illusion in 2nd lap
 G:j:b
 I:120:20d20:10:50:10
-W:28:1:0:240:0:0
+W:33:2:0:240:0:0
 B:CRUSH:HURT:7d7
 B:CRUSH:HURT:7d7
 F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
-F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE | POWERFUL
+F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE
 S:1_IN_5 | MISSILE
 D:$It is a middle bubble that makes an weird movement and shoots you back.
 D:$  When it is crushed, it becomes a small bubble.
@@ -23169,11 +23139,11 @@ N:1157:二周目の大きな泡
 E:Large aqua illusion in 2nd lap
 G:j:b
 I:120:25d25:10:50:10
-W:31:1:0:600:0:0
+W:36:2:0:600:0:0
 B:CRUSH:HURT:8d8
 B:CRUSH:HURT:8d8
 F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
-F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE | POWERFUL
+F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE
 S:1_IN_5 | MISSILE
 D:$It is a large bubble that makes an weird movement and shoots you back.
 D:$  When it is crushed, it becomes a middle bubble.
@@ -23184,11 +23154,11 @@ N:1158:二週目の特大の泡
 E:Extra large aqua illusion in 2nd lap
 G:j:b
 I:120:25d25:10:50:10
-W:34:1:0:1200:0:0
+W:39:3:0:1200:0:0
 B:CRUSH:HURT:9d9
 B:CRUSH:HURT:9d9
 F:RAND_25 | RAND_50 | WILD_SWAMP | NONLIVING | EMPTY_MIND
-F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE | POWERFUL
+F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR | RES_TELE | RES_WATE
 S:1_IN_5 | MISSILE
 D:$It is a extra large bubble that makes an weird movement and shoots you back!
 D:$  You must decide whether running away or squashing them all!
@@ -23242,10 +23212,10 @@ E:Vaif, the general of Moais
 G:g:D
 I:120:60d50:25:100:20
 W:49:1:0:11000:0:0
-B:CRUSH:SUPERHURT:12d15
+B:CRUSH:HURT:8d12
 F:UNIQUE | FORCE_MAXHP | NEVER_MOVE
 F:HURT_ROCK | IM_ELEC | RES_PLAS | RES_GRAV | RES_TELE
-F:ONLY_ITEM | DROP_2D2 | DROP_GOOD | DROP_GREAT
+F:ONLY_ITEM | DROP_2D2 | DROP_GREAT
 F:NONLIVING | NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR
 S:1_IN_2 | S_KIN | HOLD | CONF | BLIND | HEAL
 D:$It is a mighty thug from the Bacterian army.
@@ -23257,12 +23227,12 @@ D:バクテリアン軍が放った強大な刺客だ。それは大量のプチ
 N:1163:クリスタル・キューブ
 E:Crystal cube
 G:g:B
-I:140:2d2:10:200:30
-W:50:2:0:1500:0:0
+I:135:1d3:10:200:30
+W:50:3:0:2500:0:0
 B:CRUSH:SHATTER:10d6
+B:CRUSH:SHATTER:10d7
 B:CRUSH:SHATTER:10d8
-B:CRUSH:SHATTER:10d10
-B:CRUSH:SHATTER:10d12
+B:CRUSH:SHATTER:10d9
 F:RES_ALL | FRIENDS | NONLIVING | RAND_25 | RAND_50
 F:NO_CONF | NO_STUN | NO_SLEEP | NO_FEAR
 D:$If you can dodge them, you are an expert!
@@ -23325,13 +23295,14 @@ D:三兄弟の次男で、空手が得意だ。
 N:1168:チーターマン『アポロ』
 G:h:y
 E:Apollo, the eldest cheetahmen
-I:110:16d18:25:40:30
+I:120:16d18:25:40:30
 W:15:1:0:320:0:0
 B:SHOOT:HURT:8d8
 B:STING:HURT:5d6
 B:STING:HURT:5d6
 F:UNIQUE | FORCE_MAXHP | MALE | GOOD | ANIMAL
 F:DROP_90 | DROP_1D2 | DROP_GOOD | RES_SOUN | NO_STUN
+S:1_IN_6 | SHOOT
 D:$He is the eldest son of the three brothers,
 D:$ and be aware the shot by his cross bow!
 D:三兄弟の長男で、クロスボウからの一撃に要注意だ！
@@ -23346,7 +23317,7 @@ B:CRUSH:SUPERHURT:12d15
 B:CRUSH:SUPERHURT:12d15
 B:BITE:POISON:12d15
 F:FORCE_SLEEP | FORCE_MAXHP | DROP_SKELETON | DROP_CORPSE
-F:ONLY_ITEM | DROP_4D2 | DROP_3D2 | DROP_GREAT | MOVE_BODY |
+F:ONLY_ITEM | DROP_4D2 | DROP_3D2 | DROP_GREAT | MOVE_BODY
 F:SMART | TAKE_ITEM | OPEN_DOOR | BASH_DOOR | POWERFUL
 F:EVIL | FEMALE | UNIQUE | RES_LITE | RES_TIME | RES_DARK | RES_NETH
 F:IM_COLD | IM_POIS | IM_ACID | IM_ELEC | IM_FIRE | RES_TELE
@@ -23372,7 +23343,7 @@ D:それはカモノハシの類縁で、爬虫類と哺乳類の合成と考え
 D:ギリシアの怪物にちなんで英名を名付けられた。
 
 N:1171:虚界の魔獣『ジェノサイバー』
-E:Genocyber the Vajura Beast
+E:Genocyber, the Vajura Beast
 G:U:w
 I:132:70d100:40:160:10
 W:72:3:0:27500:0:0
@@ -23910,7 +23881,7 @@ N:1198:万色ワイアーム
 E:Wyrm of Many Colours
 G:D:v
 I:120:100d48:40:140:255
-W:60:2:0:28000:0:0
+W:60:2:0:28000:550000:1199
 B:CLAW:HURT:6d11
 B:BITE:HURT:6d11
 B:BUTT:HURT:6d11
@@ -24039,7 +24010,7 @@ D:街の衛兵ごときは軽く焼き尽くす。
 N:1204:幻影の狩人『サーロクニル』
 E:Sahloknir, the hunter of illusion
 G:d:B
-I:110:30d17:20:80:30
+I:115:30d17:20:80:30
 W:21:3:0:850:0:0
 B:CLAW:HURT:8d2
 B:CLAW:HURT:7d2
@@ -24054,10 +24025,10 @@ D:$  It lightly turns the town guard into an ice statue.
 D:冥界から舞い戻ってきたドラゴンの一体だ。
 D:街の衛兵ごときは軽く氷像にしてしまう。
 
-N:1205:始祖への裏切り『オダハヴィーング』
+N:1205:原初への裏切り『オダハヴィーング』
 E:Odahviing, the betrayer of Alduin
 G:d:s
-I:115:30d40:20:95:30
+I:120:30d40:20:95:30
 W:35:3:0:3500:0:0
 B:CLAW:HURT:8d6
 B:CLAW:HURT:7d6
@@ -24099,7 +24070,7 @@ W:55:3:0:25000:0:0
 B:BITE:HURT:10d9
 B:CRUSH:HURT:10d9
 B:CLAW:HURT:10d9
-B:CRUSH:SUPERHURT:60d1
+B:CRUSH:HURT:1d59
 F:UNIQUE | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | GOOD | FRIENDLY
 F:DROP_4D2 | DROP_GOOD | CAN_FLY | IM_COLD | IM_FIRE | IM_ELEC | RES_SOUN
 F:BASH_DOOR | MOVE_BODY | DRAGON | NO_CONF | NO_SLEEP | RIDING
@@ -24115,12 +24086,16 @@ E:Durnehviir, the governor of Soul Cairn
 G:D:v
 I:120:50d60:40:130:5
 W:51:2:0:22000:0:0
+B:BITE:HURT:9d9
+B:CRUSH:HURT:9d9
+B:CLAW:HURT:9d9
+B:CRUSH:HURT:1d49
 F:UNIQUE | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | UNDEAD
-F:ONLY_ITEM DROP_60 | DROP_90 | DROP_1D2 | DROP_GOOD | DROP_GREAT
+F:ONLY_ITEM | DROP_60 | DROP_90 | DROP_1D2 | DROP_GREAT
 F:CAN_FLY | FRIENDLY | GOOD | IM_COLD | IM_FIRE | IM_ELEC | RES_SOUN
 F:BASH_DOOR | MOVE_BODY | DRAGON | NO_CONF | NO_SLEEP | RIDING
 S:1_IN_7 | SCARE | BR_FIRE | BR_SOUN | BR_NETH
-D:$  It is a dragon who has been in Oblivion for so long that
+D:$It is a dragon who has been in Oblivion for so long that
 D:$ it has become difficult to maintain his body in this world.
 D:$  It fully acknowledges your ability.
 D:あまりにも永い間冥界にい続けたため、
@@ -24132,10 +24107,14 @@ E:Alduin, the World Eater
 G:D:v
 I:125:70d100:45:150:10
 W:73:2:0:38000:0:0
+B:BITE:HURT:15d9
+B:CRUSH:HURT:15d9
+B:CLAW:HURT:15d9
+B:CRUSH:HURT:1d89
 F:UNIQUE | FORCE_MAXHP | DROP_CORPSE | DROP_SKELETON | ATTR_MULTI
-F:DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT | CAN_FLY | EVIL
-F:DROP_GOOD | CAN_FLY | IM_COLD | IM_FIRE | IM_ELEC | RES_SOUN
-F:BASH_DOOR | MOVE_BODY | DRAGON | NO_CONF | NO_SLEEP | NO_STUN | RIDING
+F:DROP_3D2 | DROP_4D2 | DROP_GREAT | ONLY_ITEM | CAN_FLY | EVIL
+F:IM_COLD | IM_FIRE | IM_ELEC | RES_SOUN
+F:BASH_DOOR | KILL_BODY | DRAGON | NO_CONF | NO_SLEEP | NO_STUN | RIDING
 S:1_IN_3 | SCARE | BLINK | S_KIN | ANIM_DEAD
 S:BR_ELEC | BR_FIRE | BR_COLD | BR_SOUN | BR_WALL | BR_MANA
 D:$The first dragon created in one of the plural worlds.
@@ -24194,7 +24173,7 @@ B:HIT:SUPERHURT:10d11
 F:UNIQUE | FORCE_MAXHP | HUMAN | MALE | EVIL | DROP_SKELETON
 F:POWERFUL | SMART | IM_FIRE | IM_COLD | IM_ELEC | RES_CHAO
 F:NO_SLEEP | NO_CONF | BASH_DOOR | KILL_BODY | PASS_WALL
-F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GOOD | DROP_GREAT
+F:ONLY_ITEM | DROP_3D2 | DROP_4D2 | DROP_GREAT
 S:1_IN_3 | TELE_TO | TPORT | HEAL | S_KIN | BA_ELEC | BA_FIRE | BA_COLD
 S:BR_SOUN | BR_DISI
 D:$This man can completely absorb the soul of dragons
@@ -24257,9 +24236,9 @@ G:z:W
 I:110:21d21:25:45:20
 W:29:1:0:200:1200:1217
 B:SHOOT:HURT:8d9
-B:HIT:HURT:5d6
-B:SLASH:HURT:5d6
-B:CRUSH:HURT:5d6
+B:HIT:HURT:4d6
+B:SLASH:HURT:4d6
+B:CRUSH:HURT:4d6
 F:UNDEAD | EVIL | DROP_CORPSE
 F:HURT_LITE | IM_COLD | IM_POIS | RES_NETH | DROP_90 | FRIENDS
 S:1_IN_8 | SHOOT | BA_COLD
@@ -24273,9 +24252,9 @@ G:z:B
 I:115:25d25:30:55:15
 W:35:1:0:400:2500:1218
 B:SHOOT:HURT:10d9
-B:HIT:HURT:8d6
-B:SLASH:HURT:8d6
-B:CRUSH:HURT:8d6
+B:HIT:HURT:7d6
+B:SLASH:HURT:7d6
+B:CRUSH:HURT:7d6
 F:UNDEAD | EVIL | DROP_CORPSE | HURT_LITE | IM_COLD | IM_POIS | RES_NETH
 F:DROP_90 | DROP_1D2 | ONLY_ITEM | FRIENDS | BASH_DOOR
 S:1_IN_6 | SHOOT | SCARE | BA_COLD | BR_COLD | BR_SOUN
@@ -24288,10 +24267,10 @@ E:Draugr deathlord
 G:z:D
 I:120:21d50:40:80:10
 W:42:1:0:3200:0:0
-B:SHOOT:SUPERHURT:12d12
-B:HIT:SUPERHURT:8d9
-B:SLASH:SUPERHURT:8d9
-B:CRUSH:SUPERHURT:8d9
+B:SHOOT:HURT:12d12
+B:HIT:SUPERHURT:8d8
+B:SLASH:SUPERHURT:8d8
+B:CRUSH:HURT:8d9
 F:FORCE_MAXHP | UNDEAD | EVIL | ESCORT | DROP_CORPSE
 F:NO_CONF | BASH_DOOR | MOVE_BODY
 F:HURT_LITE | IM_COLD | IM_POIS | RES_NETH | DROP_2D2 | ONLY_ITEM
@@ -24306,10 +24285,10 @@ E:Draugr death overload
 G:z:r
 I:120:100d26:50:90:10
 W:51:3:0:13000:0:0
-B:SHOOT:SUPERHURT:15d15
-B:HIT:SUPERHURT:15:d13
-B:SLASH:SUPERHURT:15d13
-B:CRUSH:SUPERHURT:15d13
+B:SHOOT:SUPERHURT:12d15
+B:HIT:SUPERHURT:12d13
+B:SLASH:SUPERHURT:12d13
+B:CRUSH:HURT:8d13
 F:NAZGUL | FORCE_MAXHP | EVIL | UNDEAD | NO_SLEEP | NO_CONF
 F:ESCORT | ESCORTS | BASH_DOOR | MOVE_BODY
 F:IM_COLD | IM_POIS | RES_NETH | RES_TELE | NO_CONF
@@ -24369,7 +24348,7 @@ D:スノーエルフの堕落した末裔だ。目は見えないがとても耳
 N:1223:ファルメル・スクルカー
 E:Falmer skulker
 G:h:U
-I:110:21d13:5:45:50
+I:110:21d13:2:45:50
 W:21:2:0:350:2100:1228
 B:SHOOT:HURT:8d9
 B:HIT:POISON:11d7
@@ -24384,7 +24363,7 @@ D:目が見えないので光に身をすくめることもない。
 N:1224:ファルメル・グルームルーカー
 E:Falmer gloomlurker
 G:h:u
-I:115:31d31:10:65:50
+I:115:30d29:5:65:50
 W:36:2:0:1400:10000:1229
 B:SHOOT:HURT:13d9
 B:SLASH:POISON:9d9
@@ -24450,7 +24429,7 @@ B:SHOOT:HURT:11d9
 B:SLASH:POISON:14d10
 F:FORCE_MAXHP | EVIL | DROP_CORPSE | DROP_SKELETON | BASH_DOOR
 F:DROP_60 | DROP_90 | DROP_1D2 | ONLY_ITEM | ESCORT
-F:SMART | POWERFUL | IM_POIS | RES_LITE | RES_DARK
+F:SMART | IM_POIS | RES_LITE | RES_DARK
 S:1_IN_8 | SHOOT | BA_ELEC | BA_POIS | BR_POIS | CONF | HOLD | BLIND
 D:$Falmer's nose sniffs any adventurer's nose.
 D:ファルメルの鼻はどんな冒険者の匂いも嗅ぎ分ける。
@@ -24596,7 +24575,7 @@ G:C:R
 W:29:2:0:1200:0:0
 B:BITE:FIRE:12d11
 B:CLAW:FIRE:12d11
-B:CRUSH:SUPERHURT:40d1
+B:CRUSH:SUPERHURT:30d1
 F:UNIQUE | FORCE_MAXHP | EVIL | ANIMAL | UNDEAD | DROP_CORPSE
 F:DROP_2D2 | DROP_GOOD | IM_FIRE | RES_NETH | RES_DARK
 R:1237:13d9
@@ -24611,12 +24590,12 @@ N:1239:惑星生命体『ソラリス』
 E:Solaris, the planet life
 G:j:G
 I:120:50d40:50:90:5
-W:42:1:0:6000:0:0
+W:42:4:0:6000:0:0
 B:CRAWL:HURT:13d11
 B:ENGULF:HURT:13d11
 B:GAZE:HURT:13d11
 B:TOUCH:HURT:13d11
-F:UNIQUE | FORCE_MAXHP | NONLIVING | QUANTUM | DROP_2D2 | DROP_GOOD | DROP_GREAT
+F:UNIQUE | FORCE_MAXHP | NONLIVING | QUANTUM | DROP_2D2 | DROP_GREAT
 F:IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | RES_LITE | RES_DARK
 F:RES_NEXU | RES_CHAO | RES_DISE | RES_SHAR | RES_WATE | RES_TIME | RES_NETH
 F:RES_SOUN | RES_TELE | WEIRD_MIND | PASS_WALL
@@ -24634,7 +24613,7 @@ I:110:25d12:15:40:20
 W:15:1:0:350:0:0
 B:SLASH:HURT:2d11
 B:CRUSH:HURT:1d13
-F:UNIQUE | FORCE_MAXHP | HUMAN | GOOD | NO_FEAR | CAN_SPEAK
+F:UNIQUE | FORCE_MAXHP | HUMAN | MALE | GOOD | NO_FEAR | CAN_SPEAK
 F:ONLY_ITEM | DROP_4D2
 D:$Hey, girlfriend came to me...
 D:$ (inciting words in Monthly Choi Yong Soo; issue number is unknown)
@@ -24744,9 +24723,9 @@ B:GAZE:PARALYZE:5d5
 B:TOUCH:TERRIFY:5d5
 B:SPIT:CONFUSE:5d5
 B:SHOW:BLIND:5d5
-F:SMART | FRIENDS | FORCE_SLEEP
+F:SMART | FRIENDS | FORCE_SLEEP | AURA_ELEC
 F:IM_POIS | RES_SOUN | RES_PLAS | RES_LITE | RES_DARK | RES_NETH
-F:NO_FEAR | NO_STUN | NO_CONF | NO_SLEEP
+F:NO_FEAR | NO_STUN | NO_CONF | CAN_SPEAK
 S:1_IN_5 | BR_SOUN | BR_PLAS
 D:$It is the supreme weapon manufactured by Jobz in response to the plan
 D:$ to conquer the world by Bull Gates' weapon "Internet Exploder".
@@ -24812,14 +24791,11 @@ B:BITE:FIRE:12d6
 B:BUTT:HURT:12d6
 B:BITE:POISON:8d6
 F:UNIQUE
-F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | RIDING |
-F:DROP_3D2 | DROP_4D2
+F:FORCE_SLEEP | FORCE_MAXHP | SMART | DROP_CORPSE | DROP_3D2 | DROP_4D2
 F:OPEN_DOOR | BASH_DOOR | KILL_BODY | POWERFUL | CAN_FLY
 F:ANIMAL | EVIL | IM_FIRE | IM_POIS | IM_COLD | IM_ACID
 F:NO_CONF | NO_SLEEP | RIDING | ESCORT | ATTR_MULTI
-S:1_IN_4
-S:SCARE
-S:BR_FIRE | BR_POIS | BR_CONF | BR_CHAO | BR_NEXU
+S:1_IN_4 | SCARE | BR_FIRE | BR_POIS | BR_CONF | BR_CHAO | BR_NEXU
 S:S_KIN
 R:354:4d7
 R:884:4d7
@@ -25016,7 +24992,7 @@ S:1_IN_3 |
 S:SHRIEK | BA_FIRE | PSY_SPEAR | S_KIN
 F:UNIQUE | MALE | DROP_CORPSE | FORCE_MAXHP | FORCE_SLEEP
 F:NONLIVING | CAN_SPEAK | POWERFUL
-F:ONLY_ITEM | DROP_1D2 | DROP_3D2 | DROP_GOOD | DROP_GREAT
+F:ONLY_ITEM | DROP_1D2 | DROP_3D2 | DROP_GREAT
 F:IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | RES_LITE | RES_DARK
 F:NO_STUN | NO_FEAR | NO_CONF | NO_SLEEP | REGENERATE
 F:COLD_BLOOD | OPEN_DOOR | BASH_DOOR | CAN_FLY | MOVE_BODY
@@ -25061,8 +25037,7 @@ B:SLASH:HURT:45d1
 F:MALE | FORCE_SLEEP | ANIMAL
 F:REGENERATE | OPEN_DOOR | MOVE_BODY | TAKE_ITEM | DROP_CORPSE 
 F:IM_ACID | IM_ELEC | IM_COLD | IM_FIRE | IM_POIS
-S:1_IN_4 |
-S:HASTE | HEAL | CAUSE_2 |
+S:1_IN_4 | HASTE | HEAL | CAUSE_2
 D:$A fairy cat that walks on two legs and understands human language.
 D:$This Cait Sith is like a swordfighter who serves the cat kingdom
 D:$I see you as a prey to give to the king.
@@ -25086,7 +25061,7 @@ N:1264:★シヴァの化身の軟革ブーツ (+5,+5) [4,16] (+4加速) {+速
 E:The Pair of Soft Leather Boots of Shiva's Avatar (+5,+5) [4,+16] (+4 to speed) {SpDx;Nx;FaLv(Dx}
 G:]:U
 I:140:35d24:10:80:10
-W:45:4:0:1000:0:0
+W:45:4:0:3000:0:0
 B:KICK:UN_BONUS:15d15
 B:KICK:LOSE_DEX:15d15
 B:KICK:ACID:15d15
@@ -25122,7 +25097,7 @@ F:UNIQUE | FORCE_MAXHP | INVISIBLE | COLD_BLOOD | ESCORT | SMART
 F:PASS_WALL | MOVE_BODY | CAN_FLY | EVIL | UNDEAD
 F:IM_ELEC | IM_ACID | IM_FIRE | RES_WATE | RES_DARK
 F:HURT_LITE | SELF_DARK_1 | NO_FEAR | NO_CONF | NO_SLEEP
-F:DROP_2D2 | DROP_GOOD | DROP_GREAT | ONLY_ITEM
+F:DROP_2D2 | DROP_GREAT | ONLY_ITEM
 S:1_IN_3 | DISPEL | BA_ELEC | BA_DARK
 S:SHRIEK | SCARE | BLIND | BLINK | DARKNESS | S_KIN
 D:$Boo's boss, which has the ability to confine objects
@@ -25311,7 +25286,7 @@ F:ATTR_MULTI | ATTR_ANY | RAND_25 | RAND_50 | QUANTUM | ELDRITCH_HORROR
 F:IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS
 F:NO_CONF | NO_SLEEP | NO_FEAR | NO_STUN
 F:CAN_SWIM | CAN_FLY | PASS_WALL | MOVE_BODY
-F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_GOOD | DROP_GREAT
+F:ONLY_ITEM | DROP_90 | DROP_2D2 | DROP_GREAT
 S:1_IN_2 | DRAIN_MANA | MIND_BLAST | BRAIN_SMASH | SLOW | HASTE | FORGET
 S:BLINK | TPORT | TELE_AWAY
 D:$That point is an abominable existence that makes people
@@ -25321,17 +25296,16 @@ D:その点は動くだけで世界中の人間を狂わせる忌むべき存在
 N:1277:破壊の怨念『久遠』
 E:Kuwon, the dream exchanger
 G:f:y
-I:120:70d30:80:65:5
+I:120:70d30:60:65:5
 W:45:2:0:6500:0:0
-B:CLAW:HURT:9d12
-B:CLAW:ELEC:15d12
-B:PUNCH:HURT:9d12
-B:PUNCH:ELEC:15d12
-F:UNIQUE | FORCE_MAXHP | FEMALE | EVIL | ANIMAL
-F:DROP_CORPSE | REGENERATE | DROP_GOOD | DROP_4D2
-F:BASH_DOOR | NO_CONF | NO_FEAR | NO_SLEEP
-F:IM_ELEC
-S:1_IN_4 | BA_ELEC | BR_ELEC | BLINK
+B:CLAW:HURT:9d11
+B:CLAW:ELEC:12d12
+B:PUNCH:HURT:9d11
+B:PUNCH:ELEC:12d12
+F:UNIQUE | FORCE_MAXHP | FEMALE | EVIL | ANIMAL | POWERFUL
+F:DROP_CORPSE | DROP_GOOD | DROP_4D2 | ONLY_ITEM | KILL_BODY
+F:BASH_DOOR | NO_CONF | NO_FEAR | NO_SLEEP | IM_ELEC
+S:1_IN_4 | BO_ELEC | BA_ELEC | BR_ELEC | BLINK | HOLD | CAUSE_3
 D:$She is angry and her eyes are full of vengeance.
 D:$  That's because her lover was killed.
 D:$  Since it was the priest who broke the relationship between the two,