From 6074329b04c18e95458d52aa0109ff2c35d19de3 Mon Sep 17 00:00:00 2001 From: Hourier Date: Thu, 21 Jan 2021 22:22:29 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#41042=20r=5Finfo=E3=81=AE=E3=83=95?= =?utf8?q?=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E8=AA=BF=E6=95=B4?= =?utf8?q?=E3=80=81=E5=86=85=E5=AE=B9=E3=81=AF=E5=A4=89=E6=9B=B4=E3=81=9B?= =?utf8?q?=E3=81=9A=20/=20Adjusted=20the=20format=20of=20r=5Finfo.txt,=20n?= =?utf8?q?ot=20changed=20any=20parameter?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/edit/r_info.txt | 127 ++++++++++++++++++++++------------------------------ 1 file changed, 54 insertions(+), 73 deletions(-) diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt index 966609b8a..fed99ebbd 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_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_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_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_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). @@ -6622,11 +6616,11 @@ B:GAZE:EXP_40 B:TOUCH:EAT_ITEM 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_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_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_GREAT -F:SMART | OPEN_DOOR | BASH_DOOR | +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_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. @@ -12684,8 +12676,7 @@ F:FORCE_SLEEP | FORCE_MAXHP | 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 @@ -13426,12 +13417,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: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 -F:EVIL -S:1_IN_6 -S:S_DEMON | SHRIEK | CONF | SCARE | MIND_BLAST | BLIND +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,8 +13501,7 @@ 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: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 @@ -13863,10 +13851,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_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 +14888,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: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 | +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 +15597,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_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 +15623,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_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 @@ -24814,14 +24798,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 -- 2.11.0